From d8fe38012706781a911543e44b216f59655426b0 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Sat, 25 Aug 2018 11:37:54 -0400 Subject: [PATCH 01/11] Correctly sets launcher game name --- Linux_Installer.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Linux_Installer.sh b/Linux_Installer.sh index c71dce3..fb07f6c 100755 --- a/Linux_Installer.sh +++ b/Linux_Installer.sh @@ -262,6 +262,7 @@ elif [ "$choice" == "2" ]; then sudo sed -i 's/SKILL_LOOP_MODE">0/SKILL_LOOP_MODE">'"$loopmode"'/g' Game/server/config/config.xml | tee -a installer.log &>/dev/null sudo sed -i 's/String IP = "127.0.0.1";/String IP = "'$domain'";/g' Game/client/src/org/openrsc/client/Config.java | tee -a installer.log &>/dev/null sudo sed -i 's/String Domain = "localhost";/String Domain = "'$domain'";/g' Game/Launcher/src/Main.java | tee -a installer.log &>/dev/null + sudo sed -i 's/String GAME\_NAME = "Open RSC/String GAME\_NAME = "'"$gamename"'/g' Game/Launcher/src/Main.java | tee -a installer.log &>/dev/null clear echo "Do you want a Launcher button for a second world? From f24b009726ab40cc5d55092310b1741a8fe59782 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Sat, 25 Aug 2018 11:40:41 -0400 Subject: [PATCH 02/11] Typo fix --- Linux_Installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Linux_Installer.sh b/Linux_Installer.sh index fb07f6c..be681fd 100755 --- a/Linux_Installer.sh +++ b/Linux_Installer.sh @@ -235,7 +235,7 @@ elif [ "$choice" == "2" ]; then read -s loopmode # Automated edits of the .env file - sudo sed -i 's/URL=http:\/\/localhost\/blog/URL=http:\/\/'"$domai"n'\/blog/g' .env | tee -a installer.log &>/dev/null + sudo sed -i 's/URL=http:\/\/localhost\/blog/URL=http:\/\/'"$domain"'\/blog/g' .env | tee -a installer.log &>/dev/null sudo sed -i 's/NGINX_HOST=localhost/NGINX_HOST='"$domain"'/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_ROOT_PASSWORD=root/MARIADB_ROOT_PASSWORD='"$dbpass"'/g' .env | tee -a installer.log &>/dev/null From bb731fb3d82cacd819cc0a36afbe87cfba7c9c13 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Sat, 25 Aug 2018 11:47:25 -0400 Subject: [PATCH 03/11] Ghost back to Postgres --- Linux_Installer.sh | 2 +- docker-compose.yml | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Linux_Installer.sh b/Linux_Installer.sh index be681fd..00b5beb 100755 --- a/Linux_Installer.sh +++ b/Linux_Installer.sh @@ -248,7 +248,7 @@ elif [ "$choice" == "2" ]; then echo "Removing pre-existing SQL users." sudo make clean-users - sudo docker stop ghost && sudo docker start ghost + sudo make stop && sudo make start # Automated file edits clear diff --git a/docker-compose.yml b/docker-compose.yml index a76a292..e3ab0da 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,14 +72,7 @@ services: - "./etc/ghost/content:/var/lib/ghost/content" environment: - url=${URL} - - database__client=mysql - - database__connection__host=mysql - - database__connection__user=${MARIADB_ROOT_USER} - - database__connection__password=${MARIADB_ROOT_PASSWORD} - - database__connection__database=ghost - privacy__useUpdateCheck=false - depends_on: - - mysqldb php: image: nanoninja/php-fpm:7.2 From be7d6b9a25b4e6a3d7934b5332f1e18645c9d863 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Sat, 25 Aug 2018 11:49:19 -0400 Subject: [PATCH 04/11] Added verbiage --- Linux_Installer.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Linux_Installer.sh b/Linux_Installer.sh index 00b5beb..957503d 100755 --- a/Linux_Installer.sh +++ b/Linux_Installer.sh @@ -248,6 +248,8 @@ elif [ "$choice" == "2" ]; then echo "Removing pre-existing SQL users." sudo make clean-users + clear + echo "Restarting Docker containers to enable changes." sudo make stop && sudo make start # Automated file edits From cf0705a0d61e82920f61951ebddf04a2b8c2c656 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Sat, 25 Aug 2018 12:01:41 -0400 Subject: [PATCH 05/11] Separation of public and private domain input --- Linux_Installer.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Linux_Installer.sh b/Linux_Installer.sh index 957503d..bca924d 100755 --- a/Linux_Installer.sh +++ b/Linux_Installer.sh @@ -215,8 +215,13 @@ elif [ "$choice" == "2" ]; then read -s dbpass clear - echo "Please enter your server's domain name." - read -s domain + echo "Please enter your server's public domain name." + read -s publicdomain + + clear + echo "Please enter your server's private domain name if one exists or re-enter" + echo "the public domain name again." + read -s privatedomain clear echo "Please enter the name of your game." @@ -235,8 +240,8 @@ elif [ "$choice" == "2" ]; then read -s loopmode # Automated edits of the .env file - sudo sed -i 's/URL=http:\/\/localhost\/blog/URL=http:\/\/'"$domain"'\/blog/g' .env | tee -a installer.log &>/dev/null - sudo sed -i 's/NGINX_HOST=localhost/NGINX_HOST='"$domain"'/g' .env | tee -a installer.log &>/dev/null + 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_ROOT_PASSWORD=root/MARIADB_ROOT_PASSWORD='"$dbpass"'/g' .env | tee -a installer.log &>/dev/null @@ -250,7 +255,7 @@ elif [ "$choice" == "2" ]; then clear echo "Restarting Docker containers to enable changes." - sudo make stop && sudo make start + sudo make stop && sudo make start | tee -a installer.log &>/dev/null # Automated file edits clear @@ -262,8 +267,8 @@ elif [ "$choice" == "2" ]; then sudo sed -i 's/COMBAT\_XP\_RATE">1/COMBAT\_XP\_RATE">'"$xprate"'/g' Game/server/config/config.xml | tee -a installer.log &>/dev/null sudo sed -i 's/SKILL_XP_RATE">1/SKILL_XP_RATE">'"$skillrate"'/g' Game/server/config/config.xml | tee -a installer.log &>/dev/null sudo sed -i 's/SKILL_LOOP_MODE">0/SKILL_LOOP_MODE">'"$loopmode"'/g' Game/server/config/config.xml | tee -a installer.log &>/dev/null - sudo sed -i 's/String IP = "127.0.0.1";/String IP = "'$domain'";/g' Game/client/src/org/openrsc/client/Config.java | tee -a installer.log &>/dev/null - sudo sed -i 's/String Domain = "localhost";/String Domain = "'$domain'";/g' Game/Launcher/src/Main.java | tee -a installer.log &>/dev/null + sudo sed -i 's/String IP = "127.0.0.1";/String IP = "'$privatedomain'";/g' Game/client/src/org/openrsc/client/Config.java | tee -a installer.log &>/dev/null + sudo sed -i 's/String Domain = "localhost";/String Domain = "'$privatedomain'";/g' Game/Launcher/src/Main.java | tee -a installer.log &>/dev/null sudo sed -i 's/String GAME\_NAME = "Open RSC/String GAME\_NAME = "'"$gamename"'/g' Game/Launcher/src/Main.java | tee -a installer.log &>/dev/null clear @@ -306,11 +311,6 @@ elif [ "$choice" == "2" ]; then clear echo "Importing the game databases." sudo make import-game | tee -a installer.log &>/dev/null - #sudo make import-ghost | tee -a installer.log &>/dev/null - - clear - echo "Restarting Ghost container." - sudo docker stop ghost && sudo docker start ghost | tee -a installer.log &>/dev/null clear ./Linux_Fetch_Updates_Production.sh From ee1e2188652b2f17e0703b91e504cd95829d7e5a Mon Sep 17 00:00:00 2001 From: Marwolf Date: Sat, 25 Aug 2018 13:54:57 -0400 Subject: [PATCH 06/11] Automated HTTPS with certbot --- Certbot.sh | 36 +++++++++++++++++++++++++++++++++--- Linux_Installer.sh | 41 +++++++++++++++++++++++++++++++++++++++-- Makefile | 2 +- docker-compose.yml | 2 -- 4 files changed, 73 insertions(+), 8 deletions(-) diff --git a/Certbot.sh b/Certbot.sh index 9806500..dd1c3f3 100755 --- a/Certbot.sh +++ b/Certbot.sh @@ -1,8 +1,38 @@ +#!/bin/bash +exec 0/dev/null + +clear +echo "Please enter your server's public domain name." +read -s publicdomain + +clear +echo "Please enter your server's private domain name if one exists or re-enter the public domain name again." +read -s privatedomain + +clear +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 + +clear +echo "Enabling HTTPS" + sudo certbot certonly \ --standalone \ --preferred-challenges http \ --agree-tos -n \ --config-dir ./etc/letsencrypt \ --d wolfkingdom.net \ --m cleako@gmail.com \ --q +-d $publicdomain -d $privatedomain --expand \ +-m $email | tee -a certbot.log &>/dev/null + +sudo docker start nginx | tee -a certbot.log &>/dev/null + +clear +echo "Done!" diff --git a/Linux_Installer.sh b/Linux_Installer.sh index bca924d..f6e470c 100755 --- a/Linux_Installer.sh +++ b/Linux_Installer.sh @@ -219,10 +219,47 @@ elif [ "$choice" == "2" ]; then read -s publicdomain clear - echo "Please enter your server's private domain name if one exists or re-enter" - echo "the public domain name again." + echo "Please enter your server's private domain name if one exists or re-enter the public domain name again." read -s privatedomain + clear + echo "Do you want a Lets Encrypt HTTPS certificate installed? + + Choices: + ${RED}1${NC} - Yes + ${RED}2${NC} - No + " + echo "" + echo "Which of the above do you wish to do? Type the choice number and press enter." + read httpsask + + if [ "$httpask" == "1" ]; then + clear + echo "Please enter your email address for Lets Encrypt HTTPS registration." + read -s email + + sudo docker stop nginx + sudo mv etc/nginx/default.conf etc/nginx/default.conf.BAK + sudo mv etc/nginx/HTTPS_default.conf.BAK etc/nginx/default.conf + 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 \ + -q + + sudo docker start nginx + elif [ "$httpask" == "2" ]; then + continue + fi + clear echo "Please enter the name of your game." read -s gamename diff --git a/Makefile b/Makefile index 09f1a27..bb6d156 100755 --- a/Makefile +++ b/Makefile @@ -69,7 +69,7 @@ restore-windows: 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)'@'%';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 diff --git a/docker-compose.yml b/docker-compose.yml index e3ab0da..65b850d 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,8 +42,6 @@ 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: From bf23134e6715c1c8baf792eb1d09dd1643c76a4e Mon Sep 17 00:00:00 2001 From: Marwolf Date: Sat, 25 Aug 2018 14:00:48 -0400 Subject: [PATCH 07/11] Implementing Certbot changes --- Linux_Installer.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Linux_Installer.sh b/Linux_Installer.sh index f6e470c..e5bbe05 100755 --- a/Linux_Installer.sh +++ b/Linux_Installer.sh @@ -238,10 +238,10 @@ elif [ "$choice" == "2" ]; then echo "Please enter your email address for Lets Encrypt HTTPS registration." read -s email - sudo docker stop nginx - sudo mv etc/nginx/default.conf etc/nginx/default.conf.BAK - sudo mv etc/nginx/HTTPS_default.conf.BAK etc/nginx/default.conf - sudo sed -i 's/live\/openrsc.com/live\/'"$publicdomain"'/g' etc/nginx/default.conf | tee -a installer.log &>/dev/null + 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 clear echo "Enabling HTTPS" @@ -252,10 +252,10 @@ elif [ "$choice" == "2" ]; then --agree-tos -n \ --config-dir ./etc/letsencrypt \ -d $publicdomain -d $privatedomain --expand \ - -m $email \ - -q + -m $email | tee -a certbot.log &>/dev/null - sudo docker start nginx + sudo docker start nginx | tee -a certbot.log &>/dev/null + elif [ "$httpask" == "2" ]; then continue fi From 99278eaf87f704e8b0f275a4e508f91848ba01b1 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Sat, 25 Aug 2018 14:03:33 -0400 Subject: [PATCH 08/11] Nginx restart tweaks --- Linux_Installer.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Linux_Installer.sh b/Linux_Installer.sh index e5bbe05..f15e252 100755 --- a/Linux_Installer.sh +++ b/Linux_Installer.sh @@ -254,8 +254,6 @@ elif [ "$choice" == "2" ]; then -d $publicdomain -d $privatedomain --expand \ -m $email | tee -a certbot.log &>/dev/null - sudo docker start nginx | tee -a certbot.log &>/dev/null - elif [ "$httpask" == "2" ]; then continue fi @@ -291,8 +289,8 @@ elif [ "$choice" == "2" ]; then sudo make clean-users clear - echo "Restarting Docker containers to enable changes." - sudo make stop && sudo make start | tee -a installer.log &>/dev/null + 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 # Automated file edits clear From 1fbeab5f6ec0ba9b5d3408eb334b51b45c01a812 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Sat, 25 Aug 2018 14:45:55 -0400 Subject: [PATCH 09/11] 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: From fb45851e4da58a26c442b5dd99ed35c7dcf42ac9 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Sat, 25 Aug 2018 14:48:54 -0400 Subject: [PATCH 10/11] Typo in httpsask --- Linux_Installer.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Linux_Installer.sh b/Linux_Installer.sh index 5ae5c60..dc08ba1 100755 --- a/Linux_Installer.sh +++ b/Linux_Installer.sh @@ -229,7 +229,7 @@ elif [ "$choice" == "2" ]; then echo "Which of the above do you wish to do? Type the choice number and press enter." read httpsask - if [ "$httpask" == "1" ]; then + if [ "$httpsask" == "1" ]; then clear echo "Please enter your email address for Lets Encrypt HTTPS registration." read -s email @@ -244,7 +244,7 @@ elif [ "$choice" == "2" ]; then 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 + elif [ "$httpsask" == "2" ]; then continue fi From ba07dc4f54edc74f9c9b3bf4c377d283ecbcddb0 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Sat, 25 Aug 2018 15:08:59 -0400 Subject: [PATCH 11/11] Adds proper alternative world name --- Linux_Installer.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Linux_Installer.sh b/Linux_Installer.sh index dc08ba1..492ae70 100755 --- a/Linux_Installer.sh +++ b/Linux_Installer.sh @@ -315,6 +315,7 @@ elif [ "$choice" == "2" ]; then sudo sed -i 's/"Dev Server"/\/\/"'"$worldname2"'"/g' Game/Launcher/src/Main.java | tee -a installer.log &>/dev/null sudo sed -i 's/Dev\_Domain = "localhost"/Dev\_Domain = "'"$worldurl2"'"/g' Game/Launcher/src/Main.java | tee -a installer.log &>/dev/null sudo sed -i 's/Dev\_GAME\_NAME = "Dev Test World"/Dev\_GAME\_NAME = "Play '"$worldname2"'"/g' Game/Launcher/src/Main.java | tee -a installer.log &>/dev/null + sudo sed -i 's/Dev Server News/'"$worldname2"' News/g' Game/Launcher/src/Main.java | tee -a installer.log &>/dev/null elif [ "$launcherbutton" == "2" ]; then # Disables the extra world button