diff --git a/installer.sh b/installer.sh index a488d27..2e41ec1 100644 --- a/installer.sh +++ b/installer.sh @@ -278,6 +278,7 @@ if [ $wordpress = 1 ]; then db_name="wp_$db_suffix" db_user="wp_$db_suffix" db_pass=$(date +%s|sha256sum|base64|head -c 32) + WPSalts=$(wget https://api.wordpress.org/secret-key/1.1/salt/ -q -O -) mysql -u root -p"$password" -e "CREATE DATABASE "$db_name" DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;" mysql -u root -p"$password" -e "CREATE USER '"$db_user"'@'localhost' IDENTIFIED BY '"$db_pass"';" mysql -u root -p"$password" -e "GRANT ALL ON "$db_name".* TO '"$db_user"'@'localhost';" @@ -285,51 +286,10 @@ if [ $wordpress = 1 ]; then wget https://wordpress.org/latest.tar.gz -O /tmp/wp.tar.gz tar xzvf /tmp/wp.tar.gz -C /tmp mv /tmp/wordpress/wp-config-sample.php /tmp/wordpress/wp-config.php - cp -a /tmp/wordpress/. /var/www/"$domain"/html - WPSalts=$(wget https://api.wordpress.org/secret-key/1.1/salt/ -q -O -) -cat < /var/www/"$domain"/html/wp-config.php - array( -# '127.0.0.1:11211' -# ) -#); -#define('WP_REDIS_HOST', '127.0.0.1'); -#define('WP_REDIS_PASSWORD', '$password'); -#define('WP_REDIS_PORT', '6379'); -require_once(ABSPATH . 'wp-settings.php'); -EOF + cp -a /tmp/wordpress/. /var/www/"$domain"/html +wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/master/config/WordPress-Bare-Config.php -O /var/www/"$domain"/html/wp-config.php +sed -i -e 's/DBPass/'$db_pass'/' -e 's/DBUser/'$db_user'/' -e 's/DBName/'$db_name'/' -e 's/DOMAINname/'$domain'/' /var/www/"$domain"/html/wp-config.php +printf '%s\n' "g/WPsalty/d" a "$WPSalts" . w | ed -s /var/www/"$domain"/html/wp-config.php fi ##-------------------##