diff --git a/playbooks/local_dns.yml b/playbooks/local_dns.yml index cb3ef01..40a8c1a 100755 --- a/playbooks/local_dns.yml +++ b/playbooks/local_dns.yml @@ -94,8 +94,6 @@ value: vm-general-1.ashburn.mgmt.desu.ltd - record: git.desu.ltd value: vm-general-1.ashburn.mgmt.desu.ltd - - record: jenkins.desu.ltd - value: vm-general-1.ashburn.mgmt.desu.ltd - record: matrix.desu.ltd value: vm-general-1.ashburn.mgmt.desu.ltd - record: movie.desu.ltd diff --git a/playbooks/prod_web.yml b/playbooks/prod_web.yml index c8fc98c..9e32f0f 100755 --- a/playbooks/prod_web.yml +++ b/playbooks/prod_web.yml @@ -23,7 +23,6 @@ - web/desultd.yml - web/element-web.yml - web/gitea.yml - - web/jenkins.yml - web/netbox.yml - web/nextcloud.yml - web/srv.yml @@ -223,26 +222,6 @@ return 200 '{"m.homeserver":{"base_url":"https://matrix.desu.ltd"}}'; - name: git.desu.ltd proxy_pass: http://gitea:3000 - - name: jenkins.desu.ltd - locations: - - location: "/" - contents: | - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Proto https; - proxy_set_header X-Forwarded-Port 443; - proxy_pass http://jenkins:8080; - - location: | - ~ "^/static/[0-9a-fA-F]{8}\/(.*)$" - contents: | - rewrite "^/static/[0-9a-fA-F]{8}\/(.*)" /$1 last; - - location: "/userContent" - contents: | - root /data/jenkins/home/; - if (!-f $request_filename) { - rewrite (.*) /$1 last; - break; - } - name: matrix.desu.ltd proxies: - location: "~* ^(\/_matrix|\/_synapse|\/client|\/health)" diff --git a/playbooks/tasks/web/jenkins.yml b/playbooks/tasks/web/jenkins.yml deleted file mode 100644 index eae1621..0000000 --- a/playbooks/tasks/web/jenkins.yml +++ /dev/null @@ -1,19 +0,0 @@ -# vim:ft=ansible: -- name: docker deploy jenkins - docker_container: - name: jenkins - image: jenkins/jenkins:jdk11 -# Uncomment me for inbound agent connections -# Otherwise, use 8080 for the web UI -# ports: -# - 50000:50000 - env: - JAVA_OPTS: "-Dhudson.footerURL=https://jenkins.desu.ltd" - networks: - - name: web - aliases: [ "jenkins" ] - volumes: - - /data/jenkins/home:/var/jenkins_home - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - tags: [ docker, jenkins ]