From 1fbeab5f6ec0ba9b5d3408eb334b51b45c01a812 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Sat, 25 Aug 2018 14:45:55 -0400 Subject: [PATCH] Fixes for MariaDB configuration --- Linux_Installer.sh | 38 +++++++++++--------------------------- Makefile | 7 ------- docker-compose.yml | 2 ++ 3 files changed, 13 insertions(+), 34 deletions(-) diff --git a/Linux_Installer.sh b/Linux_Installer.sh index f15e252..5ae5c60 100755 --- a/Linux_Installer.sh +++ b/Linux_Installer.sh @@ -207,11 +207,7 @@ elif [ "$choice" == "2" ]; then unzip -o Game/client/cache.zip -d ~/OpenRSC | tee -a installer.log &>/dev/null clear - echo "Please enter your desired username for the new root SQL user. (No spaces)" - read -s dbuser - - clear - echo "Please enter your desired password for '"$dbuser"'." + echo "Please enter your desired password for SQL user 'root'." read -s dbpass clear @@ -238,21 +234,15 @@ elif [ "$choice" == "2" ]; then echo "Please enter your email address for Lets Encrypt HTTPS registration." read -s email - sudo docker stop nginx | tee -a certbot.log &>/dev/null - sudo mv etc/nginx/default.conf etc/nginx/default.conf.BAK | tee -a certbot.log &>/dev/null - sudo mv etc/nginx/HTTPS_default.conf.BAK etc/nginx/default.conf | tee -a certbot.log &>/dev/null - sudo sed -i 's/live\/openrsc.com/live\/'"$publicdomain"'/g' etc/nginx/default.conf | tee -a certbot.log &>/dev/null + sudo docker stop nginx | tee -a installer.log &>/dev/null + sudo mv etc/nginx/default.conf etc/nginx/default.conf.BAK | tee -a installer.log &>/dev/null + sudo mv etc/nginx/HTTPS_default.conf.BAK etc/nginx/default.conf | tee -a installer.log &>/dev/null + sudo sed -i 's/live\/openrsc.com/live\/'"$publicdomain"'/g' etc/nginx/default.conf | tee -a installer.log &>/dev/null clear echo "Enabling HTTPS" - sudo certbot certonly \ - --standalone \ - --preferred-challenges http \ - --agree-tos -n \ - --config-dir ./etc/letsencrypt \ - -d $publicdomain -d $privatedomain --expand \ - -m $email | tee -a certbot.log &>/dev/null + sudo certbot certonly --standalone --preferred-challenges http --agree-tos -n --config-dir ./etc/letsencrypt -d $publicdomain -d $privatedomain --expand -m $email | tee -a installer.log &>/dev/null elif [ "$httpask" == "2" ]; then continue @@ -277,25 +267,19 @@ elif [ "$choice" == "2" ]; then # Automated edits of the .env file sudo sed -i 's/URL=http:\/\/localhost\/blog/URL=http:\/\/'"$publicdomain"'\/blog/g' .env | tee -a installer.log &>/dev/null sudo sed -i 's/NGINX_HOST=localhost/NGINX_HOST='"$publicdomain"'/g' .env | tee -a installer.log &>/dev/null - sudo sed -i 's/MARIADB_ROOT_USER=root/MARIADB_ROOT_USER='"$dbuser"'/g' .env | tee -a installer.log &>/dev/null + sudo sed -i 's/MARIADB_PASS=pass/MARIADB_PASS='"$dbpass"'/g' .env | tee -a installer.log &>/dev/null sudo sed -i 's/MARIADB_ROOT_PASSWORD=root/MARIADB_ROOT_PASSWORD='"$dbpass"'/g' .env | tee -a installer.log &>/dev/null clear - echo "Creating SQL user '"$dbuser"'." - sudo make create-user + #echo "Restarting Nginx to enact changes." + #sudo docker stop nginx | tee -a installer.log &>/dev/null && sudo docker start nginx | tee -a installer.log &>/dev/null - clear - echo "Removing pre-existing SQL users." - sudo make clean-users - - clear - echo "Restarting Nginx to enact changes." - sudo docker stop nginx | tee -a installer.log &>/dev/null && sudo docker start nginx | tee -a installer.log &>/dev/null + echo "Restarting Docker containers to enact changes." + sudo make stop | tee -a installer.log &>/dev/null && sudo make start | tee -a installer.log &>/dev/null # Automated file edits clear echo "Configuring Open RSC based on your input." - sudo sed -i 's/DB_LOGIN">root/DB_LOGIN">'"$dbuser"'/g' Game/server/config/config.xml | tee -a installer.log &>/dev/null sudo sed -i 's/DB_PASS">root/DB_PASS">'"$dbpass"'/g' Game/server/config/config.xml | tee -a installer.log &>/dev/null sudo sed -i 's/NAME">Open RSC/NAME">'"$gamename"'/g' Game/server/config/config.xml | tee -a installer.log &>/dev/null sudo sed -i 's/\@OpenRSC/\@'"$gamename"'/g' Game/server/config/config.xml | tee -a installer.log &>/dev/null diff --git a/Makefile b/Makefile index bb6d156..5ac6da7 100755 --- a/Makefile +++ b/Makefile @@ -67,13 +67,6 @@ restore: restore-windows: @docker exec -i mysql mysql -u"$(MARIADB_ROOT_USER)" -p"$(MARIADB_ROOT_PASSWORD)" < $(MYSQL_DUMPS_DIR)/db.sql -create-user: - @docker exec -i $(shell sudo docker-compose ps -q mysqldb) mysql -u"root" -p"root" -Bse "DROP USER IF EXISTS 'openrsc'@'%';FLUSH PRIVILEGES;" 2>/dev/null - @docker exec -i $(shell sudo docker-compose ps -q mysqldb) mysql -u"root" -p"root" -Bse "CREATE USER '$(MARIADB_ROOT_USER)'@'%' IDENTIFIED BY '$(MARIADB_ROOT_PASSWORD)';GRANT ALL PRIVILEGES ON * . * TO '$(MARIADB_ROOT_USER)'@'%'; CREATE USER '$(MARIADB_ROOT_USER)'localhost'%' IDENTIFIED BY '$(MARIADB_ROOT_PASSWORD)';GRANT ALL PRIVILEGES ON * . * TO '$(MARIADB_ROOT_USER)'@'%'; FLUSH PRIVILEGES;" 2>/dev/null - -clean-users: - @docker exec -i $(shell sudo docker-compose ps -q mysqldb) mysql -u"$(MARIADB_ROOT_USER)" -p"$(MARIADB_ROOT_PASSWORD)" -Bse "DROP USER IF EXISTS 'root'@'localhost'; DROP USER IF EXISTS 'root'@'%'; DROP USER IF EXISTS 'user'@'%'; DROP USER IF EXISTS 'Any'@'%'; FLUSH PRIVILEGES;" 2>/dev/null - import-game: @docker exec -i $(shell sudo docker-compose ps -q mysqldb) mysql -u"$(MARIADB_ROOT_USER)" -p"$(MARIADB_ROOT_PASSWORD)" < Game/Databases/openrsc_config.sql 2>/dev/null @docker exec -i $(shell sudo docker-compose ps -q mysqldb) mysql -u"$(MARIADB_ROOT_USER)" -p"$(MARIADB_ROOT_PASSWORD)" < Game/Databases/openrsc_logs.sql 2>/dev/null diff --git a/docker-compose.yml b/docker-compose.yml index 65b850d..e3ab0da 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,6 +42,8 @@ services: - MYSQL_ROOT_USER=${MARIADB_ROOT_USER} - MYSQL_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD} - MYSQL_ALLOW_EMPTY_PASSWORD=no + - MYSQL_USER=${MARIADB_USER} + - MYSQL_PASSWORD=${MARIADB_PASS} ports: - "127.0.0.1:3306:3306" volumes: