AFPy/infra
AFPy
/
infra
9
0
Fork 2
Code Issues 5 Pull Requests Projects Releases Wiki Activity

nginx: Unifying logs, we're at 600+ files in /var/log/nginx, it's unusable.

This commit is contained in:
Julien Palard 2023-02-13 23:33:35 +01:00
parent a45cbbefcd
commit 2cb12d55d1
Signed by: mdk
GPG Key ID: 0EFC1AC1006886F8
12 changed files with 19 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
afpy.org.yml
View File

@ -46,8 +46,6 @@
{
listen [::]:80; listen 80;
server_name www.afpy.org afpy.org;
access_log /var/log/nginx/afpy.org-access.log;
error_log /var/log/nginx/afpy.org-error.log;
return 301 https://www.afpy.org$request_uri;
}
@ -55,8 +53,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name afpy.org;
access_log /var/log/nginx/afpy.org-access.log;
error_log /var/log/nginx/afpy.org-error.log;
include snippets/letsencrypt-afpy.org.conf;
return 301 https://www.afpy.org$request_uri;
}
@ -65,8 +61,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name www.afpy.org;
access_log /var/log/nginx/afpy.org-access.log;
error_log /var/log/nginx/afpy.org-error.log;
root /var/www/afpy.org/;
include snippets/letsencrypt-afpy.org.conf;
index index.html;
@ -211,8 +205,6 @@
{
listen [::]:80; listen 80;
server_name afpyro.afpy.org;
access_log /var/log/nginx/afpyro.afpy.org-access.log;
error_log /var/log/nginx/afpyro.afpy.org-error.log;
return 301 https://discuss.afpy.org/upcoming-events;
}
@ -220,8 +212,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name afpyro.afpy.org;
access_log /var/log/nginx/afpyro.afpy.org-access.log;
error_log /var/log/nginx/afpyro.afpy.org-error.log;
include snippets/letsencrypt-afpyro.afpy.org.conf;
return 301 https://discuss.afpy.org/upcoming-events;
}
@ -254,8 +244,6 @@
{
listen [::]:80; listen 80;
server_name lists.afpy.org;
access_log /var/log/nginx/lists.afpy.org-access.log;
error_log /var/log/nginx/lists.afpy.org-error.log;
return 301 https://discuss.afpy.org/;
}
@ -263,8 +251,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name lists.afpy.org;
access_log /var/log/nginx/lists.afpy.org-access.log;
error_log /var/log/nginx/lists.afpy.org-error.log;
include snippets/letsencrypt-lists.afpy.org.conf;
return 301 https://discuss.afpy.org/;
}
@ -280,8 +266,6 @@
{
listen [::]:80; listen 80;
server_name photos.afpy.org;
access_log /var/log/nginx/photos.afpy.org-access.log;
error_log /var/log/nginx/photos.afpy.org-error.log;
return 301 https://photos.afpy.org$request_uri;
}
@ -289,8 +273,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name photos.afpy.org;
access_log /var/log/nginx/photos.afpy.org-access.log;
error_log /var/log/nginx/photos.afpy.org-error.log;
include snippets/letsencrypt-photos.afpy.org.conf;
root /var/www/photos.afpy.org/;
}

4
autoconfig.yml
View File

@ -19,8 +19,6 @@
{
listen [::]:80; listen 80;
server_name autoconfig.afpy.org autoconfig.pycon.fr;
access_log /var/log/nginx/autoconfig.afpy.org-access.log;
error_log /var/log/nginx/autoconfig.afpy.org-error.log;
return 301 https://$host$request_uri;
}
@ -28,8 +26,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name autoconfig.afpy.org autoconfig.pycon.fr;
access_log /var/log/nginx/autoconfig.afpy.org-access.log;
error_log /var/log/nginx/autoconfig.afpy.org-error.log;
include snippets/letsencrypt-autoconfig.afpy.org.conf;
root /var/www/autoconfig.afpy.org;
autoindex on;

8
dl.yml
View File

@ -58,8 +58,6 @@
{
listen [::]:80; listen 80;
server_name dl.afpy.org;
access_log /var/log/nginx/http-access.log;
error_log /var/log/nginx/http-error.log;
return 301 https://$host$request_uri;
}
@ -67,8 +65,6 @@
{
listen [::]:80; listen 80;
server_name videos-2015.pycon.fr;
access_log /var/log/nginx/http-access.log;
error_log /var/log/nginx/http-error.log;
return 301 https://dl.afpy.org/pycon-fr-15$request_uri;
}
@ -76,8 +72,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name videos-2015.pycon.fr;
access_log /var/log/nginx/videos-2015.pycon.fr-access.log;
error_log /var/log/nginx/videos-2015.pycon.fr-error.log;
include snippets/letsencrypt-dl.afpy.org.conf;
return 301 https://dl.afpy.org/pycon-fr-15$request_uri;
}
@ -87,8 +81,6 @@
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name dl.afpy.org;
charset utf-8;
access_log /var/log/nginx/dl.afpy.org-access.log;
error_log /var/log/nginx/dl.afpy.org-error.log;
include snippets/letsencrypt-dl.afpy.org.conf;
root /var/www/dl.afpy.org/;

4
logs.afpy.org.yml
View File

@ -17,8 +17,6 @@
{
listen [::]:80; listen 80;
server_name logs.afpy.org;
access_log /var/log/nginx/logs.afpy.org-access.log;
error_log /var/log/nginx/logs.afpy.org-error.log;
return 301 https://$host$request_uri;
}
@ -26,8 +24,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name logs.afpy.org;
access_log /var/log/nginx/logs.afpy.org-access.log;
error_log /var/log/nginx/logs.afpy.org-error.log;
include snippets/letsencrypt-logs.afpy.org.conf;
location /
{

4
makemake.yml
View File

@ -51,8 +51,6 @@
{
listen [::]:80; listen 80;
server_name planet.afpy.org;
access_log /var/log/nginx/planet.afpy.org-access.log;
error_log /var/log/nginx/planet.afpy.org-error.log;
return 301 https://$host$request_uri;
}
@ -60,8 +58,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name planet.afpy.org;
access_log /var/log/nginx/planet.afpy.org-access.log;
error_log /var/log/nginx/planet.afpy.org-error.log;
include snippets/letsencrypt-planet.afpy.org.conf;
root /home/makemake/www/;
}

8
ponyconf.yml
View File

@ -48,8 +48,6 @@
{
listen [::]:80; listen 80;
server_name cfp.pycon.fr;
access_log /var/log/nginx/cfp.pycon.fr-access.log;
error_log /var/log/nginx/cfp.pycon.fr-error.log;
return 301 https://cfp-2023.pycon.fr$request_uri;
}
@ -57,8 +55,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name cfp.pycon.fr;
access_log /var/log/nginx/cfp.pycon.fr-access.log;
error_log /var/log/nginx/cfp.pycon.fr-error.log;
include snippets/letsencrypt-cfp.pycon.fr.conf;
return 301 https://cfp-2023.pycon.fr$request_uri;
}
@ -75,8 +71,6 @@
{
listen [::]:80; listen 80;
server_name {{ item.domain }};
access_log /var/log/nginx/{{ item.domain }}-access.log;
error_log /var/log/nginx/{{ item.domain }}-error.log;
return 301 https://{{ item.domain }}$request_uri;
}
@ -84,8 +78,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name {{ item.domain }};
access_log /var/log/nginx/{{ item.domain }}-access.log;
error_log /var/log/nginx/{{ item.domain }}-error.log;
include snippets/letsencrypt-{{ item.domain }}.conf;
location /static/ {

30
pycon.fr.yml
View File

@ -26,8 +26,6 @@
{
listen [::]:80; listen 80;
server_name .pycon.fr;
access_log /var/log/nginx/pycon.fr-access.log;
error_log /var/log/nginx/pycon.fr-error.log;
return 301 https://$host$request_uri;
}
@ -35,8 +33,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name pycon.fr;
access_log /var/log/nginx/pycon.fr-access.log;
error_log /var/log/nginx/pycon.fr-error.log;
include snippets/letsencrypt-pycon.fr.conf;
return 301 https://www.pycon.fr$request_uri;
}
@ -45,8 +41,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name www.pycon.fr;
access_log /var/log/nginx/pycon.fr-access.log;
error_log /var/log/nginx/pycon.fr-error.log;
include snippets/letsencrypt-pycon.fr.conf;
root /var/www/pycon.fr/;
charset utf-8;
@ -80,8 +74,6 @@
{
listen [::]:80; listen 80;
server_name 2016.pycon.fr;
access_log /var/log/nginx/2016.pycon.fr-access.log;
error_log /var/log/nginx/2016.pycon.fr-error.log;
return 301 https://www.pycon.fr/2016/;
}
@ -89,8 +81,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name 2016.pycon.fr;
access_log /var/log/nginx/2016.pycon.fr-access.log;
error_log /var/log/nginx/2016.pycon.fr-error.log;
include snippets/letsencrypt-2016.pycon.fr.conf;
return 301 https://www.pycon.fr/2016/;
}
@ -106,8 +96,6 @@
{
listen [::]:80; listen 80;
server_name 2012.pycon.fr;
access_log /var/log/nginx/2012.pycon.fr-access.log;
error_log /var/log/nginx/2012.pycon.fr-error.log;
return 301 https://www.pycon.fr/2012/;
}
@ -115,8 +103,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name 2012.pycon.fr;
access_log /var/log/nginx/2012.pycon.fr-access.log;
error_log /var/log/nginx/2012.pycon.fr-error.log;
include snippets/letsencrypt-2012.pycon.fr.conf;
return 301 https://www.pycon.fr/2012/;
}
@ -131,8 +117,6 @@
{
listen [::]:80; listen 80;
server_name 2011.pycon.fr;
access_log /var/log/nginx/2011.pycon.fr-access.log;
error_log /var/log/nginx/2011.pycon.fr-error.log;
return 301 https://www.pycon.fr/2011/;
}
@ -140,8 +124,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name 2011.pycon.fr;
access_log /var/log/nginx/2011.pycon.fr-access.log;
error_log /var/log/nginx/2011.pycon.fr-error.log;
include snippets/letsencrypt-2011.pycon.fr.conf;
return 301 https://www.pycon.fr/2011/;
}
@ -156,8 +138,6 @@
{
listen [::]:80; listen 80;
server_name 2010.pycon.fr;
access_log /var/log/nginx/2010.pycon.fr-access.log;
error_log /var/log/nginx/2010.pycon.fr-error.log;
return 301 https://www.pycon.fr/2010/;
}
@ -165,8 +145,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name 2010.pycon.fr;
access_log /var/log/nginx/2010.pycon.fr-access.log;
error_log /var/log/nginx/2010.pycon.fr-error.log;
include snippets/letsencrypt-2010.pycon.fr.conf;
return 301 https://www.pycon.fr/2010/;
}
@ -183,8 +161,6 @@
{
listen [::]:80; listen 80;
server_name paullaroid.pycon.fr;
access_log /var/log/nginx/paullaroid.pycon.fr-access.log;
error_log /var/log/nginx/paullaroid.pycon.fr-error.log;
return 301 https://$host$request_uri;
}
@ -194,8 +170,6 @@
listen [::]:443 ssl http2; listen 443 ssl http2;
charset utf-8;
server_name paullaroid.pycon.fr;
access_log /var/log/nginx/paullaroid.pycon.fr-access.log;
error_log /var/log/nginx/paullaroid.pycon.fr-error.log;
include snippets/letsencrypt-paullaroid.pycon.fr.conf;
root /var/www/paullaroid.pycon.fr/;
@ -212,8 +186,6 @@
{
listen [::]:80; listen 80;
server_name fr.pycon.org;
access_log /var/log/nginx/fr.pycon.org-access.log;
error_log /var/log/nginx/fr.pycon.org-error.log;
return 301 https://www.pycon.fr/;
}
@ -221,8 +193,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name fr.pycon.org;
access_log /var/log/nginx/fr.pycon.org-access.log;
error_log /var/log/nginx/fr.pycon.org-error.log;
include snippets/letsencrypt-fr.pycon.org.conf;
return 301 https://www.pycon.fr/;
}

4
pydocteur.afpy.org.yml
View File

@ -22,8 +22,6 @@
{
listen [::]:80; listen 80;
server_name pydocteur.afpy.org;
access_log /var/log/nginx/pydocteur.afpy.org-access.log;
error_log /var/log/nginx/pydocteur.afpy.org-error.log;
return 301 https://$host$request_uri;
}
@ -31,8 +29,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name pydocteur.afpy.org;
access_log /var/log/nginx/pydocteur.afpy.org-access.log;
error_log /var/log/nginx/pydocteur.afpy.org-error.log;
include snippets/letsencrypt-pydocteur.afpy.org.conf;
location /
{

4
roles/discourse/tasks/main.yml
View File

@ -20,8 +20,6 @@
{
listen [::]:80; listen 80;
server_name {{ discourse_domain }};
access_log /var/log/nginx/{{ discourse_domain }}-access.log;
error_log /var/log/nginx/{{ discourse_domain }}-error.log;
return 301 https://$host$request_uri;
}
@ -29,8 +27,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name {{ discourse_domain }};
access_log /var/log/nginx/{{ discourse_domain }}-access.log;
error_log /var/log/nginx/{{ discourse_domain }}-error.log;
include snippets/letsencrypt-{{ discourse_domain }}.conf;
client_max_body_size 21m;

4
roles/gitea/tasks/setup.yml
View File

@ -120,8 +120,6 @@
{
listen [::]:80; listen 80;
server_name git.afpy.org;
access_log /var/log/nginx/git.afpy.org-access.log;
error_log /var/log/nginx/git.afpy.org-error.log;
return 301 https://git.afpy.org$request_uri;
}
@ -129,8 +127,6 @@
{
listen [::]:443 ssl http2; listen 443 ssl http2;
server_name git.afpy.org;
access_log /var/log/nginx/git.afpy.org-access.log;
error_log /var/log/nginx/git.afpy.org-error.log;
include snippets/letsencrypt-git.afpy.org.conf;
client_max_body_size 16M;

4
roles/nginx/defaults/main.yml
View File

@ -7,8 +7,6 @@ nginx_conf: |
{
listen [::]:80; listen 80;
server_name {{ nginx_domain }};
access_log /var/log/nginx/{{ nginx_domain }}-access.log;
error_log /var/log/nginx/{{ nginx_domain }}-error.log;
return 301 https://$host$request_uri;
}
@ -18,8 +16,6 @@ nginx_conf: |
listen [::]:443 ssl http2; listen 443 ssl http2;
charset utf-8;
server_name {{ nginx_domain }};
access_log /var/log/nginx/{{ nginx_domain }}-access.log;
error_log /var/log/nginx/{{ nginx_domain }}-error.log;
include snippets/letsencrypt-{{ nginx_domain }}.conf;
root {{ nginx_path }};

19
roles/nginx/tasks/main.yml
View File

@ -132,3 +132,22 @@
group: "{{ nginx_owner }}"
mode: 0755
when: nginx_owner is defined and nginx_path is defined
- name: Setup custom log format
copy:
dest: /etc/nginx/conf.d/logging.conf
owner: root
group: root
mode: 0644
content: |
log_format custom '$host $remote_addr - $remote_user [$time_local] '
'"$request" $status $body_bytes_sent '
'"$http_referer" "$http_user_agent"';
access_log /var/log/nginx/access.log custom;
- name: Hide logging setup from nginx.conf
lineinfile:
regex: access_log
state: absent
path: /etc/nginx/nginx.conf
backup: true