From 45ba39e3fec23f793a0e32a667f4616a2a58407f Mon Sep 17 00:00:00 2001 From: Anthony Date: Fri, 20 Sep 2024 23:28:55 +0800 Subject: [PATCH] Updated DB grant to 127.0.0.1 --- scripts/installWP.jps | 86 ++++++++++++++++++++++++++----------------- scripts/setupUser.sh | 2 +- 2 files changed, 53 insertions(+), 35 deletions(-) diff --git a/scripts/installWP.jps b/scripts/installWP.jps index 8a025ad..8f93b43 100644 --- a/scripts/installWP.jps +++ b/scripts/installWP.jps @@ -4,23 +4,26 @@ name: WordPress Core Installation description: WordPress Core Installation mixins: - - ${globals.BASE_URL}/configs/vers.yaml + - ${globals.BASE_URL}/configs/vers.yaml globals: - WP_ADMIN_PASS: ${settings.wp_admin_pass} - WP_TITLE: ${settings.wp_title} - WP_ADMIN_USER: ${settings.wp_admin_user:admin} - WP_ADMIN_EMAIL: ${settings.wp_admin_email:admin@example.com} - DB_HOST: ${settings.db_host} - DB_NAME: wp_${fn.random} - DB_USER: ${settings.db_user} - DB_PASS: ${settings.db_pass} - REDIS_HOST: ${settings.redis_host:} - REDIS_PORT: ${settings.redis_port:} - REDIS_USER: ${settings.redis_user:} - REDIS_PSWD: ${settings.redis_pswd:} - WP_URL: ${settings.wp_url} - BASE_URL: ${globals.BASE_URL} + WP_ADMIN_PASS: "${settings.wp_admin_pass}" + WP_TITLE: "${settings.wp_title}" + WP_ADMIN_USER: "${settings.wp_admin_user:admin}" + WP_ADMIN_EMAIL: "${settings.wp_admin_email:admin@example.com}" + DB_HOST: "${settings.db_host}" + DB_NAME: "wp_${fn.random}" + DB_USER: "${settings.db_user}" + DB_PASS: "${settings.db_pass}" + REDIS_HOST: "${settings.redis_host:/var/run/redis/redis.sock}" + REDIS_PORT: "${settings.redis_port:0}" + REDIS_USER: "${settings.redis_user:}" + REDIS_PSWD: "${settings.redis_pswd:}" + WP_URL: "${settings.wp_url}" + BASE_URL: "${globals.BASE_URL}" + VERSION_WORDPRESS: "${settings.version_wordpress:6.3.1}" + version_lscache: "${settings.version_lscache:5.6.4}" + TARGET_NODE_ID: "${settings.targetNodeID}" onInstall: - deployWordPress @@ -32,47 +35,62 @@ onInstall: actions: deployWordPress: - - cmd[${nodes.cp.master.id}]: |- - wget -qO /tmp/wordpress.tar.gz 'https://wordpress.org/wordpress-${globals.version_wordpress}.tar.gz'; + - cmd[${globals.TARGET_NODE_ID}]: |- + echo "Deploying WordPress Version ${globals.VERSION_WORDPRESS}" >> /var/log/deploy_wordpress.log; + wget -qO /tmp/wordpress.tar.gz 'https://wordpress.org/wordpress-${globals.VERSION_WORDPRESS}.tar.gz'; [ -d /tmp/wordpress/ ] && rm -rf /tmp/wordpress; tar -xzf /tmp/wordpress.tar.gz -C /tmp/; - rsync -a /tmp/wordpress/ /var/www/webroot/ROOT/; + rsync -a /tmp/wordpress/ /var/www/webroot/ROOT/ >> /var/log/deploy_wordpress.log 2>&1; - addContext [cp]: name: ROOT fileName: WordPress type: ARCHIVE installWordpress: - - 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}; - cd /var/www/webroot/ROOT && wp core install --title="${globals.WP_TITLE}" --admin_user=${globals.WP_ADMIN_USER} --admin_password=${globals.WP_ADMIN_PASS} --url=${globals.WP_URL} --admin_email=${globals.WP_ADMIN_EMAIL} --skip-email; - wget ${globals.BASE_URL}/images/favicon.ico -O /var/www/webroot/ROOT/favicon.ico; + - cmd[${globals.TARGET_NODE_ID}]: |- + echo "Creating Database ${globals.DB_NAME}" >> /var/log/install_wordpress.log; + mysql -u${globals.DB_USER} -p${globals.DB_PASS} -h ${globals.DB_HOST} -e "CREATE DATABASE IF NOT EXISTS ${globals.DB_NAME};" >> /var/log/install_wordpress.log 2>&1; + echo "Configuring wp-config.php" >> /var/log/install_wordpress.log; + 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 >> /var/log/install_wordpress.log 2>&1; + echo "Installing WordPress Core" >> /var/log/install_wordpress.log; + cd /var/www/webroot/ROOT && wp core install --title="${globals.WP_TITLE}" --admin_user=${globals.WP_ADMIN_USER} --admin_password=${globals.WP_ADMIN_PASS} --url=${globals.WP_URL} --admin_email=${globals.WP_ADMIN_EMAIL} --skip-email --path=/var/www/webroot/ROOT >> /var/log/install_wordpress.log 2>&1; + echo "Downloading favicon.ico" >> /var/www/webroot/ROOT/favicon.ico; + wget ${globals.BASE_URL}/images/favicon.ico -O /var/www/webroot/ROOT/favicon.ico >> /var/log/install_wordpress.log 2>&1; installScripts: - cmd[cp]: |- + echo "Installing WP-CLI" >> /var/log/install_scripts.log; [ ! -d $HOME/bin ] && mkdir $HOME/bin; curl -o $HOME/bin/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar && chmod +x $HOME/bin/wp; + echo "Configuring WP-CLI" >> /var/log/install_scripts.log; echo "apache_modules:" > $HOME/bin/wp-cli.yml; echo " - mod_rewrite" >> $HOME/bin/wp-cli.yml; echo "export PATH=\$PATH:\$HOME/bin/" >> $HOME/.bash_profile; - wget ${globals.BASE_URL}/scripts/setupWP.sh?_r=${fn.random} -O $HOME/bin/setupWP.sh &>> /var/log/run.log; + echo "Downloading setupWP.sh" >> /var/log/install_scripts.log; + wget ${globals.BASE_URL}/scripts/setupWP.sh?_r=${fn.random} -O $HOME/bin/setupWP.sh &>> /var/log/install_scripts.log; - cmd[cp]: - echo ${response.out} >> /etc/jelastic/redeploy.conf; - yum install jq -y &>> /var/log/run.log; + echo "Updating redeploy.conf and installing jq" >> /var/log/install_scripts.log; + echo ${response.out} >> /etc/jelastic/redeploy.conf; + yum install jq -y &>> /var/log/install_scripts.log; user: root setupWordPress: - - cmd[${nodes.cp.master.id}]: |- + - cmd[${globals.TARGET_NODE_ID}]: |- + echo "Disabling WP Auto Update Core" >> /var/log/setup_wordpress.log; grep -qE "(WP_AUTO_UPDATE_CORE)" /var/www/webroot/ROOT/wp-config.php || sed -i "/^\$table_prefix.*/a define( 'WP_AUTO_UPDATE_CORE', false );" /var/www/webroot/ROOT/wp-config.php; - wp option update permalink_structure '/%postname%/' --path=/var/www/webroot/ROOT; - wp rewrite structure '/%postname%/' --hard --path=/var/www/webroot/ROOT; + echo "Updating Permalink Structure" >> /var/log/setup_wordpress.log; + wp option update permalink_structure '/%postname%/' --path=/var/www/webroot/ROOT >> /var/log/setup_wordpress.log 2>&1; + echo "Setting Rewrite Structure" >> /var/www/webroot/ROOT/wp-config.php; + wp rewrite structure '/%postname%/' --hard --path=/var/www/webroot/ROOT >> /var/log/setup_wordpress.log 2>&1; installPlugins: - - cmd[${nodes.cp.master.id}]: |- - wp plugin install litespeed-cache --version=${globals.version_lscache} --activate --path=/var/www/webroot/ROOT &>> /var/log/run.log; - wp cache flush --path=/var/www/webroot/ROOT &>> /var/log/run.log; + - cmd[${globals.TARGET_NODE_ID}]: |- + echo "Installing LiteSpeed Cache Plugin Version ${globals.version_lscache}" >> /var/log/install_plugins.log; + wp plugin install litespeed-cache --version=${globals.version_lscache} --activate --path=/var/www/webroot/ROOT &>> /var/log/install_plugins.log; + echo "Flushing WordPress Cache" >> /var/log/install_plugins.log; + wp cache flush --path=/var/www/webroot/ROOT &>> /var/log/install_plugins.log; setupPlugins: - - cmd[${nodes.cp.master.id}]: |- - bash $HOME/bin/setupWP.sh --pgcache true --objectcache true --REDIS_HOST ${globals.REDIS_HOST} --REDIS_PORT ${globals.REDIS_PORT} --REDIS_USER ${globals.REDIS_USER} --REDIS_PSWD ${globals.REDIS_PSWD}; + - cmd[${globals.TARGET_NODE_ID}]: |- + echo "Running setupWP.sh with Redis Configuration" >> /var/log/setup_plugins.log; + bash $HOME/bin/setupWP.sh --pgcache true --objectcache true --REDIS_HOST ${globals.REDIS_HOST} --REDIS_PORT ${globals.REDIS_PORT} --REDIS_USER ${globals.REDIS_USER} --REDIS_PSWD ${globals.REDIS_PSWD} >> /var/log/setup_plugins.log 2>&1; diff --git a/scripts/setupUser.sh b/scripts/setupUser.sh index c2b8cd8..72d2618 100644 --- a/scripts/setupUser.sh +++ b/scripts/setupUser.sh @@ -5,7 +5,7 @@ PASSWORD=$2 ADMIN_PASSWORD=`pwgen 10 1` JEM=`which jem` MYSQL=`which mysql` -cmd="CREATE USER '$USER'@'localhost' IDENTIFIED BY '$PASSWORD'; CREATE USER '$USER'@'%' IDENTIFIED BY '$PASSWORD'; GRANT ALL PRIVILEGES ON *.* TO '$USER'@'localhost' WITH GRANT OPTION; GRANT ALL PRIVILEGES ON *.* TO '$USER'@'%' WITH GRANT OPTION; FLUSH PRIVILEGES;" +cmd="CREATE USER '$USER'@'127.0.0.1' IDENTIFIED BY '$PASSWORD'; CREATE USER '$USER'@'%' IDENTIFIED BY '$PASSWORD'; GRANT ALL PRIVILEGES ON *.* TO '$USER'@'127.0.0.1' WITH GRANT OPTION; GRANT ALL PRIVILEGES ON *.* TO '$USER'@'%' WITH GRANT OPTION; FLUSH PRIVILEGES;" unset resp; resp=$(mysql -u$USER -p$PASSWORD mysql --execute="SHOW COLUMNS FROM user") [ -z "$resp" ] && {