Merge branch 'master' into SAN-6926-starlord-3

Author: Myztiq

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,15 +17,15 @@ data:
   user-pixel.conf: |
     server {
       listen 80;
-      server_name blue.runnableapp.com;
+      server_name blue.runnable.io;
       location / {
         return 404;
       }
     }
 
     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;
       }
 

ansible/k8/delta/navi-proxy/configMaps/navi-proxy-navi-config

@@ -6,15 +6,15 @@ data:
   status.conf: |
     server {
       listen 80;
-      listen [::]:80;
-      server_name localhost;
+      server_name status.runnableapp.com;
 
       location /nginx_status {
         access_log off;
         stub_status on;
       }
     }
 
+
   navi.conf: |
     map $http_upgrade $connection_upgrade {
       default upgrade;

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,15 +17,15 @@ data:
   user-pixel.conf: |
     server {
       listen 80;
-      server_name blue.runnablecloud.com;
+      server_name blue.runnable-gamma.com;
       location / {
         return 404;
       }
     }
 
     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;
       }
 

ansible/k8/gamma/navi-proxy/configMaps/navi-proxy-navi-config

@@ -6,15 +6,15 @@ data:
   status.conf: |
     server {
       listen 80;
-      listen [::]:80;
-      server_name localhost;
+      server_name status.runnablecloud.com;
 
       location /nginx_status {
         access_log off;
         stub_status on;
       }
     }
 
+
   navi.conf: |
     map $http_upgrade $connection_upgrade {
       default upgrade;

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

ansible/roles/content-domain-proxy/templates/navi.tmpl

@@ -6,15 +6,15 @@ data:
   status.conf: |
     server {
       listen 80;
-      listen [::]:80;
-      server_name localhost;
+      server_name status.{{ user_content_domain }};
 
       location /nginx_status {
         access_log off;
         stub_status on;
       }
     }
 
+
   navi.conf: |
     map $http_upgrade $connection_upgrade {
       default upgrade;

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,15 +17,15 @@ data:
   user-pixel.conf: |
     server {
       listen 80;
-      server_name blue.{{ user_content_domain }};
+      server_name blue.{{ domain }};
       location / {
         return 404;
       }
     }
 
     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;
       }