From 4fabd0c0d92c9bb5b4692e2273750de278b6c710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Casani=20Guerra?= Date: Tue, 4 Oct 2022 20:20:26 +0000 Subject: [PATCH] Move share link from nginx.conf to nginxconfig.txt (#395) * :sparkles: feat: external shared link * :white_check_mark: chore: apply eslint * Update src/nginxconfig/generators/index.js Co-authored-by: Matt Cowley * Update src/nginxconfig/generators/conf/nginx.conf.js Co-authored-by: Matt Cowley Co-authored-by: Matt Cowley --- src/nginxconfig/generators/conf/nginx.conf.js | 4 +--- src/nginxconfig/generators/index.js | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/nginxconfig/generators/conf/nginx.conf.js b/src/nginxconfig/generators/conf/nginx.conf.js index 3ff1b82..e2feb5f 100644 --- a/src/nginxconfig/generators/conf/nginx.conf.js +++ b/src/nginxconfig/generators/conf/nginx.conf.js @@ -26,15 +26,13 @@ THE SOFTWARE. import sslProfiles from '../../util/ssl_profiles'; import websiteConf from './website.conf'; -import shareQuery from '../../util/share_query'; export default (domains, global) => { const config = {}; // Source config['# Generated by nginxconfig.io'] = ''; - const query = shareQuery(domains.map((domain, index) => [domain, index]).filter(d => d[0] !== null), global); - config[`# ${window.location.protocol}//${window.location.host}${window.location.pathname}${query}`] = ''; + config['# See nginxconfig.txt for the configuration share link'] = ''; // Basic nginx conf config.user = global.nginx.user.computed; diff --git a/src/nginxconfig/generators/index.js b/src/nginxconfig/generators/index.js index 548e02a..37e088f 100644 --- a/src/nginxconfig/generators/index.js +++ b/src/nginxconfig/generators/index.js @@ -40,6 +40,7 @@ import magentoConf from './conf/magento.conf'; import joomlaConf from './conf/joomla.conf'; import dockerComposeYaml from './yaml/dockerCompose.yaml'; import dockerConf from './ext/docker'; +import shareQuery from '../util/share_query'; export default (domains, global) => { const files = {}; @@ -106,5 +107,8 @@ export default (domains, global) => { files['nginxconfig.io/php_fastcgi.conf'] = toConf(phpConf(domains)); } + const query = shareQuery(domains.map((domain, index) => [domain, index]).filter(d => d[0] !== null), global); + files['nginxconfig.txt'] = `${window.location.protocol}//${window.location.host}${window.location.pathname}${query}`; + return files; };