From eedda92895939e5916ec49dca527b5d44b74ea00 Mon Sep 17 00:00:00 2001 From: Denny Cave Date: Thu, 5 Oct 2023 23:15:15 -0500 Subject: [PATCH] Fixing .sh URLs --- addon/WPMU.jps | 2 +- addons/multisite.jps | 9 --------- scripts/installWP.jps | 4 ++-- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/addon/WPMU.jps b/addon/WPMU.jps index 1832612..6eb47b0 100755 --- a/addon/WPMU.jps +++ b/addon/WPMU.jps @@ -40,6 +40,6 @@ onInstall: - cmd[${nodes.cp.master.id}]: |- cat /tmp/.htaccess_wpmu >> /var/www/webroot/ROOT/.htaccess - wget ${baseUrl}/scripts/setupWP.sh?_r=${fn.random} -O ~/setupWP.sh &>> /var/log/run.log + wget https://deploy-proxy.mightybox.io/kits/wp-performance-cluster/raw/branch/main/scripts/setupWP.sh?_r=${fn.random} -O ~/setupWP.sh &>> /var/log/run.log bash ~/setupWP.sh --wpmu true --MODE ${settings.mode} diff --git a/addons/multisite.jps b/addons/multisite.jps index 664b56e..b47e898 100755 --- a/addons/multisite.jps +++ b/addons/multisite.jps @@ -19,15 +19,6 @@ globals: mode: ${settings.mode:subdir} onInstall: - - if (/lemp/.test("${nodes.cp.nodeType}") || /nginxphp/.test("${nodes.cp.nodeType}")): - - if ('${globals.mode}' == 'subdir'): - cmd[${nodes.cp.master.id}]: |- - wget ${baseUrl}../configs/cp/nginx/subdir.conf -O /etc/nginx/conf.d/sites-enabled/subdir.conf; - sudo jem service restart - - if ('${globals.mode}' == 'subdom'): - cmd[${nodes.cp.master.id}]: |- - wget ${baseUrl}../configs/cp/nginx/subdom.conf -O /etc/nginx/conf.d/sites-enabled/subdom.conf; - sudo jem service restart - if (/llsmp/.test("${nodes.cp.nodeType}") || /litespeed/.test("${nodes.cp.nodeType}")): - if ('${globals.mode}' == 'subdir'): diff --git a/scripts/installWP.jps b/scripts/installWP.jps index c4b73ef..3cd3448 100755 --- a/scripts/installWP.jps +++ b/scripts/installWP.jps @@ -48,7 +48,7 @@ actions: cd /var/www/webroot/ROOT && wp core config --dbhost=${nodes.sqldb.master.intIP} --dbname=${globals.DB_NAME} --dbuser=${globals.DB_USER} --dbpass=${globals.DB_PASS} --path=/var/www/webroot/ROOT; cd /var/www/webroot/ROOT && wp core install --title="${globals.WP_TITLE}" --admin_user=${user.email} --admin_password=${globals.WP_ADMIN_PASS} --url=${globals.WP_URL} --admin_email=${user.email} --skip-email --path=/var/www/webroot/ROOT; mv /var/www/webroot/ROOT/wp-config.php /tmp; sed -i "s/${nodes.sqldb.master.intIP}/${globals.DB_HOST}/g" /tmp/wp-config.php; mv /tmp/wp-config.php /var/www/webroot/ROOT; - wget ${baseUrl}../images/favicon.ico -O /var/www/webroot/ROOT/favicon.ico; + #wget ${baseUrl}../images/favicon.ico -O /var/www/webroot/ROOT/favicon.ico; - if ('${globals.CLUSTER}' == 'true'): installScripts: @@ -58,7 +58,7 @@ actions: echo "apache_modules:" > ~/bin/wp-cli.yml; echo " - mod_rewrite" >> ~/bin/wp-cli.yml; echo "export PATH=$PATH:$HOME/bin/" >> $HOME/.bash_profile; - wget ${baseUrl}/setupWP.sh?_r=${fn.random} -O ~/bin/setupWP.sh &>> /var/log/run.log; + wget https://deploy-proxy.mightybox.io/kits/wp-performance-cluster/raw/branch/main/scripts/setupWP.sh?_r=${fn.random} -O ~/bin/setupWP.sh &>> /var/log/run.log; echo $HOME/bin; - cmd[cp]: echo ${response.out} >> /etc/jelastic/redeploy.conf;