diff --git a/host_vars/sputnik.adm.crans.org.yml b/host_vars/sputnik.adm.crans.org.yml index c0aa02b8..17503bf2 100644 --- a/host_vars/sputnik.adm.crans.org.yml +++ b/host_vars/sputnik.adm.crans.org.yml @@ -43,7 +43,7 @@ loc_certbot: dns_rfc2136_secret: "{{ vault.certbot_dns_secret }}" mail: root@crans.org certname: crans.org - domains: "git2.crans.org, status.crans.org, wiki.crans.org" + domains: "*.crans.org" loc_nginx: service_name: wiki @@ -87,3 +87,13 @@ loc_nginx: params: - "uwsgi_pass unix:///var/run/uwsgi/app/moinmoin/socket" - "include uwsgi_params" + +loc_reverseproxy: + reverseproxy_sites: + - {from: status.crans.org, to: "127.0.0.1:8080"} + - {from: git2.crans.org, to: "127.0.0.1:3000"} + - {from: git2.adm.crans.org, to: "127.0.0.1:3000", ssl: adm.crans.org} + + redirect_sites: [] + + static_sites: [] diff --git a/hosts b/hosts index 59945c46..abd29eb7 100644 --- a/hosts +++ b/hosts @@ -122,6 +122,7 @@ radius [reverseproxy] hodaur.adm.crans.org +sputnik.adm.crans.org [roundcube] roundcube.adm.crans.org diff --git a/roles/statping/handlers/main.yml b/roles/statping/handlers/main.yml index c395b355..4868a5ce 100644 --- a/roles/statping/handlers/main.yml +++ b/roles/statping/handlers/main.yml @@ -1,9 +1,4 @@ --- -- name: Restart nginx - service: - name: nginx - state: restarted - - name: Restart statping service: name: statping diff --git a/roles/statping/tasks/main.yml b/roles/statping/tasks/main.yml index bc7487ad..03578d70 100644 --- a/roles/statping/tasks/main.yml +++ b/roles/statping/tasks/main.yml @@ -29,19 +29,6 @@ enabled: true state: started -- name: Configure statping nginx site - template: - src: nginx/sites-available/status.j2 - dest: /etc/nginx/sites-available/status - notify: Restart nginx - -- name: Activate statping nginx site - file: - src: /etc/nginx/sites-available/status - dest: /etc/nginx/sites-enabled/status - state: link - notify: Restart nginx - - name: Indicate role in motd template: src: update-motd.d/05-service.j2