From 16a860f5ca06a9e074181bf205b7c245cf036dde Mon Sep 17 00:00:00 2001
From: MattIPv4 <me@mattcowley.co.uk>
Date: Thu, 11 Jun 2020 14:56:05 +0100
Subject: [PATCH] Move generic PHP location block after specific rules (fixes
 #112)

---
 .../generators/conf/website.conf.js           | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/nginxconfig/generators/conf/website.conf.js b/src/nginxconfig/generators/conf/website.conf.js
index edb529e..06ddc53 100644
--- a/src/nginxconfig/generators/conf/website.conf.js
+++ b/src/nginxconfig/generators/conf/website.conf.js
@@ -207,20 +207,6 @@ export default (domain, domains, global) => {
         serverConfig.push([`location ${domain.reverseProxy.path.computed}`, locConf]);
     }
 
-    // PHP
-    if (domain.php.php.computed) {
-        serverConfig.push(['# handle .php', '']);
-
-        const loc = `location ~ ${domain.routing.legacyPhpRouting.computed ? '[^/]\\.php(/|$)' : '\\.php$'}`;
-        if (global.tools.modularizedStructure.computed || domain.php.wordPressRules.computed) {
-            // Modularized
-            serverConfig.push([loc, { include: 'nginxconfig.io/php_fastcgi.conf' }]);
-        } else {
-            // Unified
-            serverConfig.push([loc, phpConf(domains, global)]);
-        }
-    }
-
     // Additional config
     if (global.tools.modularizedStructure.computed) {
         // Modularized
@@ -245,6 +231,20 @@ export default (domain, domains, global) => {
         if (domain.php.magentoRules.computed) serverConfig.push(...Object.entries(magentoConf()));
     }
 
+    // PHP
+    if (domain.php.php.computed) {
+        serverConfig.push(['# handle .php', '']);
+
+        const loc = `location ~ ${domain.routing.legacyPhpRouting.computed ? '[^/]\\.php(/|$)' : '\\.php$'}`;
+        if (global.tools.modularizedStructure.computed || domain.php.wordPressRules.computed) {
+            // Modularized
+            serverConfig.push([loc, { include: 'nginxconfig.io/php_fastcgi.conf' }]);
+        } else {
+            // Unified
+            serverConfig.push([loc, phpConf(domains, global)]);
+        }
+    }
+
     // Add the server config to the parent config now its built
     config.push(['server', serverConfig]);