diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-10-20 15:21:53 +0100 |
|---|---|---|
| committer | Ben Brown <ben.brown@codethink.co.uk> | 2017-10-23 11:11:11 +0000 |
| commit | 1d5f8ad18a9821a245536938c632d6ea2c8bda4d (patch) | |
| tree | 84d676ff048a3daabec781a9d7d5c3e8d724b637 | |
| parent | bc5a99a4ee180a9ff4446055bf0311af64c2bf9d (diff) | |
| download | infrastructure-1d5f8ad18a9821a245536938c632d6ea2c8bda4d.tar.gz | |
Update hosts and haproxy to point to the new webserver
| -rw-r--r-- | baserock_frontend/haproxy.cfg | 7 | ||||
| -rw-r--r-- | baserock_hosts | 10 |
2 files changed, 3 insertions, 14 deletions
diff --git a/baserock_frontend/haproxy.cfg b/baserock_frontend/haproxy.cfg index 46b101ba..128b3724 100644 --- a/baserock_frontend/haproxy.cfg +++ b/baserock_frontend/haproxy.cfg @@ -53,7 +53,7 @@ frontend https-in # for more documentation than you ever dreamed of. acl host_irclogs hdr(host) -m beg -i irclogs - use_backend baserock_irclogs_http if host_irclogs + use_backend baserock_webserver_http if host_irclogs acl host_spec hdr(host) -m beg -i spec acl host_spec hdr(host) -m beg -i docs @@ -85,9 +85,6 @@ backend baserock_spec_http # Otherwise Gitlab will just show a 404 page server baserock_spec baserock.gitlab.io:80 -backend baserock_irclogs_http - server baserock_irclogs 192.168.222.74:80 - backend baserock_ostree_http server baserock_ostree 10.3.0.12:80 @@ -98,4 +95,4 @@ backend baserock_ostree_ssh timeout client 12h backend baserock_webserver_http - server baserock_webserver 192.168.222.127:80 + server baserock_webserver 10.3.0.13:80 diff --git a/baserock_hosts b/baserock_hosts index 57d41e18..f656bf44 100644 --- a/baserock_hosts +++ b/baserock_hosts @@ -8,22 +8,14 @@ [baserock] git ansible_ssh_host=192.168.222.58 -irclogs ansible_ssh_host=192.168.222.74 [fedora] frontend-haproxy ansible_ssh_host=37.153.173.19 ostree ansible_ssh_host=10.3.0.12 -webserver ansible_ssh_host=192.168.222.127 - -[ubuntu] -paste ansible_ssh_host=192.168.222.6 - +webserver ansible_ssh_host=10.3.0.13 [baserock:vars] ansible_ssh_user=root -[ubuntu:vars] -ansible_ssh_user=ubuntu - [fedora:vars] ansible_ssh_user=fedora |