From 1716814665732ff55230a5b7d9afc0578212a6e9 Mon Sep 17 00:00:00 2001
From: Aman Agarwal <aman@Amans-MacBook-Air.local>
Date: Thu, 26 May 2022 00:22:36 +0530
Subject: [PATCH] comment fixes

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

diff --git a/src/nginxconfig/generators/conf/website.conf.js b/src/nginxconfig/generators/conf/website.conf.js
index 44a9d26..f08cb9a 100644
--- a/src/nginxconfig/generators/conf/website.conf.js
+++ b/src/nginxconfig/generators/conf/website.conf.js
@@ -301,7 +301,7 @@ export default (domain, domains, global, ipPortPairs) => {
         if (!domain.https.forceHttps.computed && domain.https.certType.computed === 'letsEncrypt')
             serverConfig.push(['include', 'nginxconfig.io/letsencrypt.conf']);
 
-        if (domain.php.wordPressRules.computed) serverConfig.push(['include', 'nginxconfig.io/wordpress.conf']);
+        if (domain.php.wordPressRules.computed) serverConfig.push(['include', `nginxconfig.io/${domain.server.domain.computed}.wordpress.conf`]);
         if (domain.php.drupalRules.computed) serverConfig.push(['include', 'nginxconfig.io/drupal.conf']);
         if (domain.php.magentoRules.computed) serverConfig.push(['include', 'nginxconfig.io/magento.conf']);
         if (domain.php.joomlaRules.computed) serverConfig.push(['include', 'nginxconfig.io/joomla.conf']);
diff --git a/src/nginxconfig/generators/conf/wordpress.conf.js b/src/nginxconfig/generators/conf/wordpress.conf.js
index 9464dd5..baf37ab 100644
--- a/src/nginxconfig/generators/conf/wordpress.conf.js
+++ b/src/nginxconfig/generators/conf/wordpress.conf.js
@@ -24,6 +24,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+import phpPath from '../../util/php_path';
+import phpUpstream from '../../util/php_upstream';
+
 export default (global, domain) => {
     const config = {};
 
@@ -62,7 +65,8 @@ export default (global, domain) => {
             include: 'nginxconfig.io/php_fastcgi.conf',
         };
         if (domain.php.wordPressRules.computed) {
-            config['location = /wp-login.php'].fastcgi_pass = 'unix:/run/php/php7.4-fpm.sock';
+            config['location = /wp-login.php'].fastcgi_pass = domain.php.phpBackupServer.computed !== ''
+            ? phpUpstream(domain) : phpPath(domain)
         }
     }
 
diff --git a/src/nginxconfig/generators/index.js b/src/nginxconfig/generators/index.js
index 00ed034..548e02a 100644
--- a/src/nginxconfig/generators/index.js
+++ b/src/nginxconfig/generators/index.js
@@ -63,7 +63,7 @@ export default (domains, global) => {
             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));
+                files[`nginxconfig.io/${domain.server.domain.computed}.wordpress.conf`] = toConf(wordPressConf(global, domain));
         }
 
         // Let's encrypt