Fix WP breaking Moodle and generic PHP

noobient · Dec 3, 2024 · 17274ad · 17274ad
1 parent fe64674
commit 17274ad
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/tasks/config.yml b/tasks/config.yml
@@ -17,7 +17,8 @@
   loop:
     - dos.conf
     - nginx.conf
-    - php.conf
+    - php-common.conf
+    - php-wordpress.conf
     - ssl.conf
   loop_control:
     loop_var: ng_conf_item

diff --git a/templates/host.conf.j2 b/templates/host.conf.j2
@@ -43,7 +43,10 @@ server
     root {{ eff_path }};
 
 {% if mode == 'php' or mode == 'wordpress' or mode == 'moodle' %}
-    include php.conf;
+    include php-common.conf;
+{% if mode == 'wordpress' %}
+    include php-wordpress.conf;
+{% endif %}
 
 {% elif mode == 'proxy' %}
     location /

diff --git a/templates/php.conf.j2 → templates/php-common.conf.j2 b/templates/php.conf.j2 → templates/php-common.conf.j2
@@ -1,11 +1,5 @@
 index index.php;
 
-# wordpress-specific
-if (!-e $request_filename)
-{
-    rewrite ^.*$ /index.php last;
-}
-
 location ~ [^/]\.php(/|$)
 {
     if (!-f $document_root$fastcgi_script_name)

diff --git a/templates/php-wordpress.conf.j2 b/templates/php-wordpress.conf.j2
@@ -0,0 +1,5 @@
+# wordpress-specific
+if (!-e $request_filename)
+{
+    rewrite ^.*$ /index.php last;
+}