From e5d39c55094f1f2ce97ef4c5623c5720f171a999 Mon Sep 17 00:00:00 2001
From: Aman Agarwal <aman@Amans-MacBook-Air.local>
Date: Wed, 25 May 2022 19:30:47 +0530
Subject: [PATCH] config for user's selection for php server

---
 src/nginxconfig/generators/conf/website.conf.js   | 2 +-
 src/nginxconfig/generators/conf/wordpress.conf.js | 6 ++++--
 src/nginxconfig/generators/index.js               | 7 +++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/nginxconfig/generators/conf/website.conf.js b/src/nginxconfig/generators/conf/website.conf.js
index 1d67aef..44a9d26 100644
--- a/src/nginxconfig/generators/conf/website.conf.js
+++ b/src/nginxconfig/generators/conf/website.conf.js
@@ -312,7 +312,7 @@ export default (domain, domains, global, ipPortPairs) => {
         if (!domain.https.forceHttps.computed && domain.https.certType.computed === 'letsEncrypt')
             serverConfig.push(...Object.entries(letsEncryptConf(global)));
 
-        if (domain.php.wordPressRules.computed) serverConfig.push(...Object.entries(wordPressConf(global)));
+        if (domain.php.wordPressRules.computed) serverConfig.push(...Object.entries(wordPressConf(global, domain)));
         if (domain.php.drupalRules.computed) serverConfig.push(...Object.entries(drupalConf(global)));
         if (domain.php.magentoRules.computed) serverConfig.push(...Object.entries(magentoConf()));
         if (domain.php.joomlaRules.computed) serverConfig.push(...Object.entries(joomlaConf()));
diff --git a/src/nginxconfig/generators/conf/wordpress.conf.js b/src/nginxconfig/generators/conf/wordpress.conf.js
index 39b5eac..9464dd5 100644
--- a/src/nginxconfig/generators/conf/wordpress.conf.js
+++ b/src/nginxconfig/generators/conf/wordpress.conf.js
@@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-export default global => {
+export default (global, domain) => {
     const config = {};
 
     config['# WordPress: allow TinyMCE'] = '';
@@ -60,8 +60,10 @@ export default global => {
         config['location = /wp-login.php'] = {
             limit_req: 'zone=login burst=2 nodelay',
             include: 'nginxconfig.io/php_fastcgi.conf',
-            fastcgi_pass: 'unix:/run/php/php7.4-fpm.sock',
         };
+        if (domain.php.wordPressRules.computed) {
+            config['location = /wp-login.php'].fastcgi_pass = 'unix:/run/php/php7.4-fpm.sock';
+        }
     }
 
     // Done!
diff --git a/src/nginxconfig/generators/index.js b/src/nginxconfig/generators/index.js
index 0479b29..00ed034 100644
--- a/src/nginxconfig/generators/index.js
+++ b/src/nginxconfig/generators/index.js
@@ -61,6 +61,9 @@ export default (domains, global) => {
         const ipPortPairs = new Set();
         for (const domain of domains) {
             files[`${sitesDir}/${domain.server.domain.computed}.conf`] = toConf(websiteConf(domain, domains, global, ipPortPairs));
+            // WordPress
+            if (domains.some(d => d.php.wordPressRules.computed))
+                files['nginxconfig.io/wordpress.conf'] = toConf(wordPressConf(global, domain));
         }
 
         // Let's encrypt
@@ -85,10 +88,6 @@ export default (domains, global) => {
         if (domains.some(d => d.reverseProxy.reverseProxy.computed))
             files['nginxconfig.io/proxy.conf'] = toConf(proxyConf(global));
 
-        // WordPress
-        if (domains.some(d => d.php.wordPressRules.computed))
-            files['nginxconfig.io/wordpress.conf'] = toConf(wordPressConf(global));
-
         // Drupal
         if (domains.some(d => d.php.drupalRules.computed))
             files['nginxconfig.io/drupal.conf'] = toConf(drupalConf(global));