From f612c5d0ed13a9e116c75beeb5f301c7fe845e0e Mon Sep 17 00:00:00 2001 From: MattIPv4 Date: Wed, 10 Jun 2020 21:07:26 +0100 Subject: [PATCH] Include LE in main server block if not forcing HTTPS --- src/nginxconfig/generators/conf/website.conf.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/nginxconfig/generators/conf/website.conf.js b/src/nginxconfig/generators/conf/website.conf.js index 5a443d5..edb529e 100644 --- a/src/nginxconfig/generators/conf/website.conf.js +++ b/src/nginxconfig/generators/conf/website.conf.js @@ -227,6 +227,9 @@ export default (domain, domains, global) => { serverConfig.push(['# additional config', '']); serverConfig.push(['include', 'nginxconfig.io/general.conf']); + 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.drupalRules.computed) serverConfig.push(['include', 'nginxconfig.io/drupal.conf']); if (domain.php.magentoRules.computed) serverConfig.push(['include', 'nginxconfig.io/magento.conf']); @@ -234,6 +237,9 @@ export default (domain, domains, global) => { // Unified serverConfig.push(...Object.entries(generalConf(domains, global))); + 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.drupalRules.computed) serverConfig.push(...Object.entries(drupalConf(global))); if (domain.php.magentoRules.computed) serverConfig.push(...Object.entries(magentoConf()));