diff --git a/host_vars/apollo.archlinux.org b/host_vars/apollo.archlinux.org index 5e15da4632a07b205c81b9a251e3ea939a912211..deef677d183b090ce9bad631a499e1ed73078f26 100644 --- a/host_vars/apollo.archlinux.org +++ b/host_vars/apollo.archlinux.org @@ -36,5 +36,3 @@ fail2ban_jails: sshd: true postfix: true dovecot: false - -fastcgi_cache: wiki diff --git a/roles/archwiki/templates/nginx.d.conf.j2 b/roles/archwiki/templates/nginx.d.conf.j2 index 89688e839b8fb069c27f1b2477812c9e05de5508..d775e20c36bdb50fa569613d6cea7de3777fcbd1 100644 --- a/roles/archwiki/templates/nginx.d.conf.j2 +++ b/roles/archwiki/templates/nginx.d.conf.j2 @@ -1,3 +1,6 @@ +fastcgi_cache_path /etc/nginx/wikicache levels=1:2 keys_zone=wiki:100m inactive=60m; +fastcgi_cache_key "$scheme$request_method$host$request_uri"; + upstream archwiki { server unix://{{ archwiki_socket }}; } diff --git a/roles/nginx/defaults/main.yml b/roles/nginx/defaults/main.yml index ce608684f93261eaea940178cc1bea15917aeb03..00cd5b8296d4f1278d606913f6e3eb936b9aa186 100644 --- a/roles/nginx/defaults/main.yml +++ b/roles/nginx/defaults/main.yml @@ -1,3 +1,2 @@ --- letsencrypt_validation_dir: "/var/lib/letsencrypt" -fastcgi_cache: false diff --git a/roles/nginx/templates/nginx.conf.j2 b/roles/nginx/templates/nginx.conf.j2 index 03f61ebf77339c10117fdfb405481015ee538cbc..0940ba039b6d51620aaf325745b038b1a12a401e 100644 --- a/roles/nginx/templates/nginx.conf.j2 +++ b/roles/nginx/templates/nginx.conf.j2 @@ -72,11 +72,6 @@ http { index index.php index.html index.htm; -{% if fastcgi_cache %} - fastcgi_cache_path /etc/nginx/wikicache levels=1:2 keys_zone=wiki:100m inactive=60m; - fastcgi_cache_key "$scheme$request_method$host$request_uri"; - -{% endif %} access_log syslog:server=unix:/dev/log,nohostname,tag=nginx_http main; include snippets/sslsettings.conf;