From 9cb3d49678587443ff853927a53c4c02ba3b67cc Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sat, 19 Jan 2019 15:58:05 +0100 Subject: [PATCH] Update hosts --- etherpad.yml | 2 +- group_vars/all/vars.yml | 27 --------------------------- hosts | 5 ++--- nginx-reverse-proxy.yml | 26 ++++++++++++++++++++++++++ roles/baseconfig | 2 +- 5 files changed, 30 insertions(+), 32 deletions(-) diff --git a/etherpad.yml b/etherpad.yml index 3512b46..8dda1c9 100644 --- a/etherpad.yml +++ b/etherpad.yml @@ -1,6 +1,6 @@ --- # Install EtherPad on EtherPad containers -- hosts: pad-ovh +- hosts: pad.adm.auro.re roles: - etherpad diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml index 5476b01..dd7e5d6 100644 --- a/group_vars/all/vars.yml +++ b/group_vars/all/vars.yml @@ -21,30 +21,3 @@ ssh_pub_keys: "{{ vault_ssh_pub_keys }}" # Monitoring monitoring_mail: 'monitoring.aurore@lists.crans.org' -# Nginx Proxy -reversed_proxy_subdomains: - - name: re2o - from: re2o.auro.re - to: 10.128.0.10 - - name: intranet - from: intranet.auro.re - to: 10.128.0.10 - - name: pad - from: pad.auro.re - to: 10.128.0.54:9001 - - name: phabricator - from: phabricator.auro.re - to: 10.128.0.50 - - name: wiki - from: wiki.auro.re - to: 10.128.0.51 - - name: www - from: www.auro.re - to: 10.128.0.52 - - name: main - from: auro.re - to: 10.128.0.52 - - name: re2o-test - from: re2o-test.auro.re - to: 10.128.0.100 - diff --git a/hosts b/hosts index f00527a..5648e0e 100644 --- a/hosts +++ b/hosts @@ -4,12 +4,12 @@ horus ansible_host=10.128.0.1 [ovh-container] +ansible-awx ansible_host=10.128.0.53 services-bdd.adm.auro.re phabricator.adm.auro.re horus-wiki ansible_host=10.128.0.51 www.adm.auro.re -horus-wikitest ansible_host=10.128.0.53 -pad-ovh ansible_host=10.128.0.54 +pad.adm.auro.re proxy.adm.auro.re [ovh-vm] @@ -17,7 +17,6 @@ re2o-server.adm.auro.re re2o-ldap.adm.auro.re re2o-db.adm.auro.re serge.adm.auro.re -vpn-ovh.adm.auro.re [fleming-pve] freya.adm.auro.re diff --git a/nginx-reverse-proxy.yml b/nginx-reverse-proxy.yml index 6e36685..2a2e6b6 100644 --- a/nginx-reverse-proxy.yml +++ b/nginx-reverse-proxy.yml @@ -1,6 +1,32 @@ --- # Install NGINX with reverse proxy conf - hosts: proxy.adm.auro.re + vars: + reversed_proxy_subdomains: + - name: re2o + from: re2o.auro.re + to: 10.128.0.10 + - name: intranet + from: intranet.auro.re + to: 10.128.0.10 + - name: pad + from: pad.auro.re + to: 10.128.0.54:9001 + - name: phabricator + from: phabricator.auro.re + to: 10.128.0.50 + - name: wiki + from: wiki.auro.re + to: 10.128.0.51 + - name: www + from: www.auro.re + to: 10.128.0.52 + - name: main + from: auro.re + to: 10.128.0.52 + - name: re2o-test + from: re2o-test.auro.re + to: 10.128.0.100 roles: - nginx-reverse-proxy diff --git a/roles/baseconfig b/roles/baseconfig index b20ec4f..18a1a5f 160000 --- a/roles/baseconfig +++ b/roles/baseconfig @@ -1 +1 @@ -Subproject commit b20ec4fbf8e915f5410ce678bf54d4f8e5430bf0 +Subproject commit 18a1a5fd4527934ffc546b4d9bca9414f3763eac