diff --git a/ansible/k8/delta/ingress-proxy/configMaps/ingress-proxy-sites-enabled-config b/ansible/k8/delta/ingress-proxy/configMaps/ingress-proxy-sites-enabled-config index 2b6f5cd2..fa267d88 100644 --- a/ansible/k8/delta/ingress-proxy/configMaps/ingress-proxy-sites-enabled-config +++ b/ansible/k8/delta/ingress-proxy/configMaps/ingress-proxy-sites-enabled-config @@ -6,8 +6,7 @@ data: status.conf: | server { listen 80; - listen [::]:80; - server_name localhost; + server_name status.runnable.io; location /nginx_status { access_log off; @@ -18,7 +17,7 @@ data: user-pixel.conf: | server { listen 80; - server_name blue.runnableapp.com; + server_name blue.runnable.io; location / { return 404; } @@ -26,7 +25,7 @@ data: server { listen 443 ssl; - server_name blue.runnableapp.com; + server_name blue.runnable.io; gzip off; ssl on; @@ -48,7 +47,7 @@ data: resolver_timeout 5s; location = /pixel.gif { - add_header Set-Cookie "isModerating=1; Domain=.runnableapp.com; Path=/; HttpOnly;"; + add_header Set-Cookie "isModerating=1; Domain=.runnable.io; Path=/; HttpOnly;"; empty_gif; } diff --git a/ansible/k8/delta/navi-proxy/configMaps/navi-proxy-navi-config b/ansible/k8/delta/navi-proxy/configMaps/navi-proxy-navi-config index f662fea4..ab135c8a 100644 --- a/ansible/k8/delta/navi-proxy/configMaps/navi-proxy-navi-config +++ b/ansible/k8/delta/navi-proxy/configMaps/navi-proxy-navi-config @@ -6,8 +6,7 @@ data: status.conf: | server { listen 80; - listen [::]:80; - server_name localhost; + server_name status.runnableapp.com; location /nginx_status { access_log off; @@ -15,6 +14,7 @@ data: } } + navi.conf: | map $http_upgrade $connection_upgrade { default upgrade; diff --git a/ansible/k8/gamma/ingress-proxy/configMaps/ingress-proxy-sites-enabled-config b/ansible/k8/gamma/ingress-proxy/configMaps/ingress-proxy-sites-enabled-config index 0d9960e2..39b39544 100644 --- a/ansible/k8/gamma/ingress-proxy/configMaps/ingress-proxy-sites-enabled-config +++ b/ansible/k8/gamma/ingress-proxy/configMaps/ingress-proxy-sites-enabled-config @@ -6,8 +6,7 @@ data: status.conf: | server { listen 80; - listen [::]:80; - server_name localhost; + server_name status.runnable-gamma.com; location /nginx_status { access_log off; @@ -18,7 +17,7 @@ data: user-pixel.conf: | server { listen 80; - server_name blue.runnablecloud.com; + server_name blue.runnable-gamma.com; location / { return 404; } @@ -26,7 +25,7 @@ data: server { listen 443 ssl; - server_name blue.runnablecloud.com; + server_name blue.runnable-gamma.com; gzip off; ssl on; @@ -48,7 +47,7 @@ data: resolver_timeout 5s; location = /pixel.gif { - add_header Set-Cookie "isModerating=1; Domain=.runnablecloud.com; Path=/; HttpOnly;"; + add_header Set-Cookie "isModerating=1; Domain=.runnable-gamma.com; Path=/; HttpOnly;"; empty_gif; } diff --git a/ansible/k8/gamma/navi-proxy/configMaps/navi-proxy-navi-config b/ansible/k8/gamma/navi-proxy/configMaps/navi-proxy-navi-config index 80fb3efb..a0beb06c 100644 --- a/ansible/k8/gamma/navi-proxy/configMaps/navi-proxy-navi-config +++ b/ansible/k8/gamma/navi-proxy/configMaps/navi-proxy-navi-config @@ -6,8 +6,7 @@ data: status.conf: | server { listen 80; - listen [::]:80; - server_name localhost; + server_name status.runnablecloud.com; location /nginx_status { access_log off; @@ -15,6 +14,7 @@ data: } } + navi.conf: | map $http_upgrade $connection_upgrade { default upgrade; diff --git a/ansible/roles/content-domain-proxy/tasks/main.yml b/ansible/roles/content-domain-proxy/tasks/main.yml index 3c0d4b2b..6effb2ae 100644 --- a/ansible/roles/content-domain-proxy/tasks/main.yml +++ b/ansible/roles/content-domain-proxy/tasks/main.yml @@ -27,7 +27,7 @@ src: proxy-nginx.conf dest: "{{ config_maps_path }}/{{ name }}-base-config" -- name: create api template +- name: create navi template tags: [ configure_proxy, configure_files ] template: src: navi.tmpl diff --git a/ansible/roles/content-domain-proxy/templates/navi.tmpl b/ansible/roles/content-domain-proxy/templates/navi.tmpl index 9f5756f2..7dfb2992 100644 --- a/ansible/roles/content-domain-proxy/templates/navi.tmpl +++ b/ansible/roles/content-domain-proxy/templates/navi.tmpl @@ -6,8 +6,7 @@ data: status.conf: | server { listen 80; - listen [::]:80; - server_name localhost; + server_name status.{{ user_content_domain }}; location /nginx_status { access_log off; @@ -15,6 +14,7 @@ data: } } + navi.conf: | map $http_upgrade $connection_upgrade { default upgrade; diff --git a/ansible/roles/runnable-domain-proxy/templates/sites-enabled.tmpl b/ansible/roles/runnable-domain-proxy/templates/sites-enabled.tmpl index 05ed2af4..e176f288 100644 --- a/ansible/roles/runnable-domain-proxy/templates/sites-enabled.tmpl +++ b/ansible/roles/runnable-domain-proxy/templates/sites-enabled.tmpl @@ -6,8 +6,7 @@ data: status.conf: | server { listen 80; - listen [::]:80; - server_name localhost; + server_name status.{{ domain }}; location /nginx_status { access_log off; @@ -18,7 +17,7 @@ data: user-pixel.conf: | server { listen 80; - server_name blue.{{ user_content_domain }}; + server_name blue.{{ domain }}; location / { return 404; } @@ -26,7 +25,7 @@ data: server { listen 443 ssl; - server_name blue.{{ user_content_domain }}; + server_name blue.{{ domain }}; gzip off; ssl on; @@ -48,7 +47,7 @@ data: resolver_timeout 5s; location = /pixel.gif { - add_header Set-Cookie "isModerating=1; Domain=.{{ user_content_domain }}; Path=/; HttpOnly;"; + add_header Set-Cookie "isModerating=1; Domain=.{{ domain }}; Path=/; HttpOnly;"; empty_gif; }