From 9795a7703e62a17bacbd5d62bcdcc5a5bc91388f Mon Sep 17 00:00:00 2001
From: bprieshof <bprieshof@noreply.example.org>
Date: Thu, 11 Jul 2019 11:22:38 +0200
Subject: [PATCH] Update 'Apache-Installer.sh'

---
 Apache-Installer.sh | 93 ++-------------------------------------------
 1 file changed, 4 insertions(+), 89 deletions(-)

diff --git a/Apache-Installer.sh b/Apache-Installer.sh
index 921a2e2..cfb399d 100644
--- a/Apache-Installer.sh
+++ b/Apache-Installer.sh
@@ -15,24 +15,15 @@
 mkdir -p /var/www/"$domain"/html
 chmod -R 755 /var/www
 
-##--------------------##
-#    Apache + MySQL    #
-##--------------------##
+##------------##
+#    Apache    #
+##------------##
 
-apt install -y apache2 mysql-server
+apt install -y apache2
 if [ $datauser= = 1 ]; then
  source /root/data-user_setup.sh 
 
 fi
-# mysql_secure_installation automated
-mysqladmin -u root password "$password"
-mysql -u root -p"$password" -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1')"
-mysql -u root -p"$password" -e "DELETE FROM mysql.user WHERE User=''"
-mysql -u root -p"$password" -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\_%'"
-mysql -u root -p"$password" -e "SELECT user,authentication_string,plugin,host FROM mysql.user;"
-mysql -u root -p"$password" -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '"$password"';"
-mysql -u root -p"$password" -e "FLUSH PRIVILEGES;"
-mysql -u root -p"$password" -e "SELECT user,authentication_string,plugin,host FROM mysql.user;"
 cat <<EOF > /etc/apache2/mods-enabled/dir.conf
 <IfModule mod_dir.c>
     DirectoryIndex index.php index.html index.cgi index.pl index.xhtml index.htm
@@ -80,19 +71,6 @@ sed -i 's/; max_input_vars = 1000/max_input_vars = 10000/g' /etc/php/"$phpver"/a
 sed -i 's/upload_max_filesize = 2/upload_max_filesize = 128/g' /etc/php/"$phpver"/apache2/php.ini
 sed -i 's/post_max_size = 8/post_max_size = 64/g' /etc/php/"$phpver"/apache2/php.ini
 
-##----------------##
-#    PHPMyAdmin    #
-##----------------##
-
-debconf-set-selections <<< "phpmyadmin phpmyadmin/dbconfig-install boolean true"
-debconf-set-selections <<< "phpmyadmin phpmyadmin/app-password-confirm password $password"
-debconf-set-selections <<< "phpmyadmin phpmyadmin/mysql/admin-pass password $password"
-debconf-set-selections <<< "phpmyadmin phpmyadmin/mysql/app-pass password $passsword"
-debconf-set-selections <<< "phpmyadmin phpmyadmin/reconfigure-webserver multiselect apache2"
-apt install -y phpmyadmin
-# Redirect phpmyadmin -> database
-ln -s /usr/share/phpmyadmin /var/www/"$domain"/html/database
-a2disconf phpmyadmin
 
 ##-------------##
 #    Postfix    #
@@ -160,69 +138,6 @@ elif [ $domainwww = 0 ]; then
     echo "certbot --apache -n -d $domain -m $email --hsts --redirect --no-eff-email --agree-tos" > ~/certbotactivate.sh
 fi
 
-
-
-##---------------##
-#    Wordpress    #
-##---------------##
-
-if [ $wordpress = 1 ]; then
-    db_suffix=`expr $(ls -l /var/www | grep -c ^d) - 1`
-    db_name="wp_$db_suffix"
-    db_user="wp_$db_suffix"
-    db_pass=$(date +%s|sha256sum|base64|head -c 32)
-    mysql -u root -p"$password" -e "CREATE DATABASE "$db_name" DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;"
-    mysql -u root -p"$password" -e "GRANT ALL ON "$db_name".* TO '"$db_user"'@'localhost' IDENTIFIED BY '"$db_pass"';"
-    mysql -u root -p"$password" -e "FLUSH PRIVILEGES;"
-    wget https://wordpress.org/latest.tar.gz -O /tmp/wp.tar.gz
-    tar xzf /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 <<EOF > /var/www/"$domain"/html/wp-config.php
-<?php
-define('DB_NAME', '$db_name');
-define('DB_USER', '$db_user');
-define('DB_PASSWORD', '$db_pass');
-define('DB_HOST', 'localhost');
-define('DB_CHARSET', 'utf8');
-define('DB_COLLATE', '');
-#define( 'WP_SITEURL', '' );
-#define( 'WP_HOME', '' );
-#define( 'ALTERNATE_WP_CRON', true );
-#define('DISABLE_WP_CRON', 'true');
-#define('WP_CRON_LOCK_TIMEOUT', 900);
-#define('AUTOSAVE_INTERVAL', 300);
-define( 'WP_MEMORY_LIMIT', '256M' );
-define( 'DISALLOW_FILE_EDIT', true );
-#define( 'EMPTY_TRASH_DAYS', 7 );
-define( 'NOBLOGREDIRECT', 'https://$domain' );
-#define( 'FS_CHMOD_DIR', ( 0755 & ~ umask() ) );
-#define( 'FS_CHMOD_FILE', ( 0644 & ~ umask() ) );
-#define( 'WP_ALLOW_REPAIR', true );
-#define( 'FORCE_SSL_ADMIN', true );
-#define( 'AUTOMATIC_UPDATER_DISABLED', true );
-#define( 'WP_AUTO_UPDATE_CORE', false );
-$WPSalts
-#\$table_prefix = '$db_name';
-\$table_prefix = 'wp';
-
-define('WP_DEBUG', false);
-if ( !defined('ABSPATH') )
-	define('ABSPATH', dirname(__FILE__) . '/');
-
-#\$memcached_servers = array(
-#    'default' => 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
-fi
-
 ##-----------------##
 #    Opcache GUI    #
 ##-----------------##