Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F11700435
D3632.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
13 KB
Referenced Files
None
Subscribers
None
D3632.diff
View Options
diff --git a/_modules/paas_docker.py b/_modules/paas_docker.py
--- a/_modules/paas_docker.py
+++ b/_modules/paas_docker.py
@@ -119,6 +119,10 @@
return f"{dir}/_default.conf"
+def is_nginx_service(full_service):
+ return any(["host" in container for _, container in full_service.items()])
+
+
# -------------------------------------------------------------
# Monitoring
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/roles/paas-docker/nginx/config.sls b/roles/paas-docker/nginx/config.sls
--- a/roles/paas-docker/nginx/config.sls
+++ b/roles/paas-docker/nginx/config.sls
@@ -31,6 +31,13 @@
ipv6: "{{ salt['node.get_ipv6_list']() }}"
{% for service, instances in containers.items() %}
+
+{% if salt["paas_docker"]["is_nginx_service"](instances) %}
+/var/log/www/{{ service }}:
+ file.directory:
+ - user: nginx
+ - group: root
+
{% for instance, container in instances.items() %}
{% if 'host' in container %}
@@ -43,6 +50,8 @@
- makedirs: True
- template: jinja
- context:
+ service: {{ service }}
+ instance: {{ instance }}
fqdn: {{ container['host'] }}
app_port: {{ container['app_port'] }}
aliases: {{ container['aliases'] | default('', true) | join(" ") }}
@@ -52,4 +61,5 @@
{% endif %}
{% endfor %}
+{% endif %}
{% endfor %}
diff --git a/roles/paas-docker/nginx/files/vhosts/_default.conf b/roles/paas-docker/nginx/files/vhosts/_default.conf
--- a/roles/paas-docker/nginx/files/vhosts/_default.conf
+++ b/roles/paas-docker/nginx/files/vhosts/_default.conf
@@ -43,4 +43,6 @@
error_page 502 /502.html;
location /502.html {}
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
diff --git a/roles/paas-docker/nginx/files/vhosts/acme_dns.conf b/roles/paas-docker/nginx/files/vhosts/acme_dns.conf
--- a/roles/paas-docker/nginx/files/vhosts/acme_dns.conf
+++ b/roles/paas-docker/nginx/files/vhosts/acme_dns.conf
@@ -32,6 +32,9 @@
ssl_certificate /srv/letsencrypt/etc/live/{{ fqdn }}/fullchain.pem;
ssl_certificate_key /srv/letsencrypt/etc/live/{{ fqdn }}/privkey.pem;
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
+
include includes/letsencrypt;
# ---------------------------------------------------------
diff --git a/roles/paas-docker/nginx/files/vhosts/auth-grove.conf b/roles/paas-docker/nginx/files/vhosts/auth-grove.conf
--- a/roles/paas-docker/nginx/files/vhosts/auth-grove.conf
+++ b/roles/paas-docker/nginx/files/vhosts/auth-grove.conf
@@ -42,4 +42,7 @@
root /var/wwwroot-502/$server_name;
error_page 502 /502.html;
location /502.html {}
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
diff --git a/roles/paas-docker/nginx/files/vhosts/base/fallback.conf b/roles/paas-docker/nginx/files/vhosts/base/fallback.conf
--- a/roles/paas-docker/nginx/files/vhosts/base/fallback.conf
+++ b/roles/paas-docker/nginx/files/vhosts/base/fallback.conf
@@ -22,6 +22,9 @@
root /var/wwwroot-content/_fallback;
index index.html;
+ error_log /var/log/www/fallback-error.log;
+ access_log /var/log/www/fallback-access.log;
+
try_files $uri $uri/ index.html;
}
}
diff --git a/roles/paas-docker/nginx/files/vhosts/base/server.conf b/roles/paas-docker/nginx/files/vhosts/base/server.conf
--- a/roles/paas-docker/nginx/files/vhosts/base/server.conf
+++ b/roles/paas-docker/nginx/files/vhosts/base/server.conf
@@ -39,6 +39,9 @@
root /var/wwwroot-content/{{ fqdn }};
index index.html;
+ error_log /var/log/www/base-error.log;
+ access_log /var/log/www/base-access.log;
+
###
### API
###
@@ -57,6 +60,9 @@
listen [::]:80;
server_name {{ ipv4 }} {{ ipv6 }} localhost;
+ error_log /var/log/www/base-error.log;
+ access_log /var/log/www/base-access.log;
+
location / {
root /var/wwwroot-content/{{ fqdn }};
index index.html;
diff --git a/roles/paas-docker/nginx/files/vhosts/bugzilla.conf b/roles/paas-docker/nginx/files/vhosts/bugzilla.conf
--- a/roles/paas-docker/nginx/files/vhosts/bugzilla.conf
+++ b/roles/paas-docker/nginx/files/vhosts/bugzilla.conf
@@ -44,4 +44,7 @@
root /var/wwwroot-502/_default;
error_page 502 /502.html;
location /502.html {}
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
diff --git a/roles/paas-docker/nginx/files/vhosts/cachet.conf b/roles/paas-docker/nginx/files/vhosts/cachet.conf
--- a/roles/paas-docker/nginx/files/vhosts/cachet.conf
+++ b/roles/paas-docker/nginx/files/vhosts/cachet.conf
@@ -42,4 +42,7 @@
root /var/wwwroot-502/{{ fqdn }};
error_page 502 /502.html;
location /502.html {}
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
diff --git a/roles/paas-docker/nginx/files/vhosts/etherpad.conf b/roles/paas-docker/nginx/files/vhosts/etherpad.conf
--- a/roles/paas-docker/nginx/files/vhosts/etherpad.conf
+++ b/roles/paas-docker/nginx/files/vhosts/etherpad.conf
@@ -46,4 +46,7 @@
root /var/wwwroot-502/$server_name;
error_page 502 /502.html;
location /502.html {}
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
diff --git a/roles/paas-docker/nginx/files/vhosts/hauk.conf b/roles/paas-docker/nginx/files/vhosts/hauk.conf
--- a/roles/paas-docker/nginx/files/vhosts/hauk.conf
+++ b/roles/paas-docker/nginx/files/vhosts/hauk.conf
@@ -54,4 +54,7 @@
root /var/wwwroot-502/_default;
error_page 502 /502.html;
location /502.html {}
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
diff --git a/roles/paas-docker/nginx/files/vhosts/jenkins.conf b/roles/paas-docker/nginx/files/vhosts/jenkins.conf
--- a/roles/paas-docker/nginx/files/vhosts/jenkins.conf
+++ b/roles/paas-docker/nginx/files/vhosts/jenkins.conf
@@ -48,4 +48,7 @@
root /var/wwwroot-502/_default;
error_page 502 /502.html;
location /502.html {}
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
diff --git a/roles/paas-docker/nginx/files/vhosts/notifications.conf b/roles/paas-docker/nginx/files/vhosts/notifications.conf
--- a/roles/paas-docker/nginx/files/vhosts/notifications.conf
+++ b/roles/paas-docker/nginx/files/vhosts/notifications.conf
@@ -42,4 +42,6 @@
error_page 502 /502.html;
location /502.html {}
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
diff --git a/roles/paas-docker/nginx/files/vhosts/openfire.conf b/roles/paas-docker/nginx/files/vhosts/openfire.conf
--- a/roles/paas-docker/nginx/files/vhosts/openfire.conf
+++ b/roles/paas-docker/nginx/files/vhosts/openfire.conf
@@ -46,6 +46,9 @@
root /var/wwwroot-502/_default;
error_page 502 /502.html;
location /502.html {}
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
{%- if aliases %}
@@ -66,5 +69,8 @@
include includes/letsencrypt;
return 301 https://{{ fqdn }}$request_uri;
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
{%- endif %}
diff --git a/roles/paas-docker/nginx/files/vhosts/orbeon.conf b/roles/paas-docker/nginx/files/vhosts/orbeon.conf
--- a/roles/paas-docker/nginx/files/vhosts/orbeon.conf
+++ b/roles/paas-docker/nginx/files/vhosts/orbeon.conf
@@ -50,4 +50,7 @@
error_page 502 /502.html;
location /502.html {}
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
diff --git a/roles/paas-docker/nginx/files/vhosts/penpot_web.conf b/roles/paas-docker/nginx/files/vhosts/penpot_web.conf
--- a/roles/paas-docker/nginx/files/vhosts/penpot_web.conf
+++ b/roles/paas-docker/nginx/files/vhosts/penpot_web.conf
@@ -170,4 +170,7 @@
root /var/wwwroot-502/_default;
error_page 502 /502.html;
location /502.html {}
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
diff --git a/roles/paas-docker/nginx/files/vhosts/phabricator.conf b/roles/paas-docker/nginx/files/vhosts/phabricator.conf
--- a/roles/paas-docker/nginx/files/vhosts/phabricator.conf
+++ b/roles/paas-docker/nginx/files/vhosts/phabricator.conf
@@ -63,6 +63,9 @@
root /var/wwwroot-502/{{ fqdn }};
error_page 502 /502.html;
location /502.html {}
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
# -------------------------------------------------------------
@@ -92,6 +95,9 @@
include includes/proxy_params;
proxy_redirect off;
}
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
{%- if 'blogs' in args %}
@@ -139,6 +145,9 @@
root /var/wwwroot-502/{{ fqdn }};
error_page 502 /502.html;
location /502.html {}
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
# -------------------------------------------------------------
@@ -156,6 +165,9 @@
include includes/letsencrypt;
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
+
return 301 https://{{ blog['host'] }}$request_uri;
}
@@ -178,6 +190,10 @@
include includes/letsencrypt;
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
+
return 301 https://{{ fqdn }}$request_uri;
}
{%- endif %}
diff --git a/roles/paas-docker/nginx/files/vhosts/pixelfed.conf b/roles/paas-docker/nginx/files/vhosts/pixelfed.conf
--- a/roles/paas-docker/nginx/files/vhosts/pixelfed.conf
+++ b/roles/paas-docker/nginx/files/vhosts/pixelfed.conf
@@ -51,4 +51,7 @@
root /var/wwwroot-502/_default;
error_page 502 /502.html;
location /502.html {}
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
diff --git a/roles/paas-docker/nginx/files/vhosts/rabbitmq.conf b/roles/paas-docker/nginx/files/vhosts/rabbitmq.conf
--- a/roles/paas-docker/nginx/files/vhosts/rabbitmq.conf
+++ b/roles/paas-docker/nginx/files/vhosts/rabbitmq.conf
@@ -46,4 +46,7 @@
root /var/wwwroot-502/_default;
error_page 502 /502.html;
location /502.html {}
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
diff --git a/roles/paas-docker/nginx/files/vhosts/registry.conf b/roles/paas-docker/nginx/files/vhosts/registry.conf
--- a/roles/paas-docker/nginx/files/vhosts/registry.conf
+++ b/roles/paas-docker/nginx/files/vhosts/registry.conf
@@ -54,4 +54,7 @@
root /var/wwwroot-502/_default;
error_page 502 /502.html;
location /502.html {}
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
diff --git a/roles/paas-docker/nginx/files/vhosts/sentry.conf b/roles/paas-docker/nginx/files/vhosts/sentry.conf
--- a/roles/paas-docker/nginx/files/vhosts/sentry.conf
+++ b/roles/paas-docker/nginx/files/vhosts/sentry.conf
@@ -63,4 +63,7 @@
root /var/wwwroot-502/_default;
error_page 502 /502.html;
location /502.html {}
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
diff --git a/roles/paas-docker/nginx/files/vhosts/tommy.conf b/roles/paas-docker/nginx/files/vhosts/tommy.conf
--- a/roles/paas-docker/nginx/files/vhosts/tommy.conf
+++ b/roles/paas-docker/nginx/files/vhosts/tommy.conf
@@ -42,4 +42,7 @@
root /var/wwwroot-502/_default;
error_page 502 /502.html;
location /502.html {}
+
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
diff --git a/roles/paas-docker/nginx/files/vhosts/vault.conf b/roles/paas-docker/nginx/files/vhosts/vault.conf
--- a/roles/paas-docker/nginx/files/vhosts/vault.conf
+++ b/roles/paas-docker/nginx/files/vhosts/vault.conf
@@ -40,4 +40,6 @@
error_page 502 /502.html;
location /502.html {}
+ error_log /var/log/www/{{ service }}/{{ instance }}-error.log;
+ access_log /var/log/www/{{ service }}/{{ instance }}-access.log;
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Sep 13, 13:47 (16 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2980955
Default Alt Text
D3632.diff (13 KB)
Attached To
Mode
D3632: Provision error logs by service and instance on PaaS Docker
Attached
Detach File
Event Timeline
Log In to Comment