diff --git a/manifest.jps b/manifest.jps index b11240b..ee3fe62 100644 --- a/manifest.jps +++ b/manifest.jps @@ -45,7 +45,6 @@ onInstall: - setDomain - createUserDB - installWordpress - - if (${settings.mu-addon:false}): installMultisite - if (${settings.le-addon:false}): - installLEaddon - setupLEdomain diff --git a/scripts/installWP.jps b/scripts/installWP.jps index 3a5c9a3..1423510 100644 --- a/scripts/installWP.jps +++ b/scripts/installWP.jps @@ -46,14 +46,14 @@ actions: cmd[${nodes.cp.master.id}]: |- mysql -u${globals.DB_USER} -p${globals.DB_PASS} -h ${nodes.sqldb.master.intIP} -e "CREATE DATABASE IF NOT EXISTS ${globals.DB_NAME};" 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.PROTOCOL}://${globals.DOMAIN}/" --admin_email=${user.email} --skip-email --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; - else: cmd[${nodes.cp.master.id}]: |- mysql -u${globals.DB_USER} -p${globals.DB_PASS} -h ${globals.DB_HOST} -e "CREATE DATABASE IF NOT EXISTS ${globals.DB_NAME};" cd /var/www/webroot/ROOT && wp core config --dbhost=${globals.DB_HOST} --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.PROTOCOL}://${globals.DOMAIN}/" --admin_email=${user.email} --skip-email --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; wget ${baseUrl}../images/favicon.ico -O /var/www/webroot/ROOT/favicon.ico; installScripts: