Skip to content
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

Jump to bottom

Remove ipv6 support and add logging #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove ipv6 support and add logging #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion _init/nginx/channelserver.conf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
server {
server_name ${CHANNELSERVER}.${NGINX_DOMAIN_NAME};
listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /certs/channelserver.cer;
ssl_certificate_key /certs/channelserver.key;

Expand Down
3 changes: 1 addition & 2 deletions _init/nginx/channelserver_nossl.conf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
server {
server_name ${CHANNELSERVER}.${NGINX_DOMAIN_NAME};
listen 80;
listen [::]:80;

location / {
proxy_pass http://channelserver:8000;
Expand All @@ -12,4 +11,4 @@ server {
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
}
}
5 changes: 0 additions & 5 deletions _init/nginx/fxa.conf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ gzip_types
server {
server_name ${CONTENT}.${NGINX_DOMAIN_NAME};
listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /certs/content.cer;
ssl_certificate_key /certs/content.key;

Expand All @@ -39,7 +38,6 @@ server {
server {
server_name ${AUTH}.${NGINX_DOMAIN_NAME};
listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /certs/auth.cer;
ssl_certificate_key /certs/auth.key;

Expand All @@ -54,7 +52,6 @@ server {
server {
server_name ${OAUTH}.${NGINX_DOMAIN_NAME};
listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /certs/oauth.cer;
ssl_certificate_key /certs/oauth.key;

Expand All @@ -70,7 +67,6 @@ server {
server {
server_name ${PROFILE}.${NGINX_DOMAIN_NAME};
listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /certs/profile.cer;
ssl_certificate_key /certs/profile.key;

Expand All @@ -88,7 +84,6 @@ server {
server {
server_name ${SYNC}.${NGINX_DOMAIN_NAME};
listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /certs/sync.cer;
ssl_certificate_key /certs/sync.key;

Expand Down
4 changes: 0 additions & 4 deletions _init/nginx/fxa_nossl.conf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ gzip_types
server {
server_name ${CONTENT}.${NGINX_DOMAIN_NAME};
listen 80;
listen [::]:80;

location / {
proxy_pass http://fxa-content-server:3030;
Expand All @@ -38,7 +37,6 @@ server {
server_name ${AUTH}.${NGINX_DOMAIN_NAME};
server_name ${OAUTH}.${NGINX_DOMAIN_NAME};
listen 80;
listen [::]:80;

location / {
proxy_pass http://fxa-auth-server:9000;
Expand All @@ -51,7 +49,6 @@ server {
server {
server_name ${PROFILE}.${NGINX_DOMAIN_NAME};
listen 80;
listen [::]:80;

location ^~/img/ {
proxy_pass http://fxa-profile-static:1112/;
Expand All @@ -67,7 +64,6 @@ server {
server {
server_name ${SYNC}.${NGINX_DOMAIN_NAME};
listen 80;
listen [::]:80;

location / {
proxy_pass http://syncserver:5000;
Expand Down
1 change: 0 additions & 1 deletion _init/nginx/kinto.conf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
server {
server_name ${KINTO}.${NGINX_DOMAIN_NAME};
listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /certs/kinto.cer;
ssl_certificate_key /certs/kinto.key;

Expand Down
3 changes: 1 addition & 2 deletions _init/nginx/kinto_nossl.conf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
server {
server_name ${KINTO}.${NGINX_DOMAIN_NAME};
listen 80;
listen [::]:80;

client_max_body_size 75M;

location / {
proxy_pass http://kinto:8888;
}
}
}
1 change: 0 additions & 1 deletion _init/nginx/send.conf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
server {
server_name ${SEND}.${NGINX_DOMAIN_NAME};
listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /certs/send.cer;
ssl_certificate_key /certs/send.key;

Expand Down
1 change: 0 additions & 1 deletion _init/nginx/send_nossl.conf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
server {
server_name ${SEND}.${NGINX_DOMAIN_NAME};
listen 80;
listen [::]:80;

location / {
proxy_http_version 1.1;
Expand Down
10 changes: 5 additions & 5 deletions docker-compose.tmpl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
#! -> create database if not exists sync;
#@ if data.values.debug.deps_logs == False:
logging: #! do not show logs
driver: "none"
driver: "json-file"
#@ end
restart: unless-stopped
command: "--event-scheduler=ON"
Expand All @@ -35,7 +35,7 @@ services:
- "6379"
#@ if data.values.debug.deps_logs == False:
logging: #! do not show logs
driver: "none"
driver: "json-file"
#@ end
restart: unless-stopped

Expand Down Expand Up @@ -645,7 +645,7 @@ services:

#@ if data.values.debug.deps_logs == False:
logging: #! do not show logs
driver: "none"
driver: "json-file"
#@ end
#! use envsubst only replace domain name https://github.com/docker-library/docs/issues/496#! issuecomment-186149231
#! build command!
Expand Down Expand Up @@ -706,7 +706,7 @@ services:
- "6379"
#@ if data.values.debug.deps_logs == False:
logging: #! do not show logs
driver: "none"
driver: "json-file"
#@ end
#@ end

Expand Down Expand Up @@ -784,7 +784,7 @@ services:
- #@ "{persistencepath}/postgres_data:/var/lib/postgresql/data".format(persistencepath=data.values.persistencepath)
#@ if data.values.debug.deps_logs == False:
logging: #! do not show logs
driver: "none"
driver: "json-file"
#@ end
restart: unless-stopped
#@ end
Expand Down