Skip to content

Fix status #657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 8, 2017
Merged

Fix status #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e88e40
add status page for nginx
May 8, 2017
eabd23f
fix delta
May 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions ansible/k8/delta/ingress-proxy/configMaps/ingress-proxy-sites-enabled-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions ansible/k8/delta/navi-proxy/configMaps/navi-proxy-navi-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 4 additions & 5 deletions ansible/k8/gamma/ingress-proxy/configMaps/ingress-proxy-sites-enabled-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions ansible/k8/gamma/navi-proxy/configMaps/navi-proxy-navi-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/content-domain-proxy/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/content-domain-proxy/templates/navi.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 4 additions & 5 deletions ansible/roles/runnable-domain-proxy/templates/sites-enabled.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
}

Expand Down