Fix the non copy of main.php

README.md

@@ -1,11 +1,11 @@
-<h1 align="center"> Yiimpool Yiimp Install Scrypt v0.6.0 With DaemonBuilder and addport (update 2022-12-01) </h1>
+<h1 align="center"> Yiimpool Yiimp Install Scrypt v0.6.1 With DaemonBuilder and addport (update 2022-12-01) </h1>
 
 <a href="https://discord.gg/TTprjGD2tw"><img src="https://img.shields.io/discord/904564600354254898.svg?style=flat&label=Discord %3C3%20&color=7289DA%22" alt="Join Community Badge"/></a>
 </p>
 The Development is still in progress. Please report any issues you find.
 
 <h2 align="center"> Description </h2>
-This is the main page for Yiimpool Yiimp Install script. Here you find information all documentation about <b> Yiimpool Yiimp Installer v0.6.0</b><p>The installer automatically install all requirements to get Yiimp installed correctly.</p><p><b> Yiimpool Yiimp Install Scrypt</b> is a Script that will install <b> Yiimp</b> Mining Pool on a clean<b>Ubuntu 18.04 VPS.</p>
+This is the main page for Yiimpool Yiimp Install script. Here you find information all documentation about <b> Yiimpool Yiimp Installer v0.6.1</b><p>The installer automatically install all requirements to get Yiimp installed correctly.</p><p><b> Yiimpool Yiimp Install Scrypt</b> is a Script that will install <b> Yiimp</b> Mining Pool on a clean<b>Ubuntu 18.04 VPS.</p>
 
 More information will be added soon.
 <p align="center">

install.sh

@@ -6,12 +6,12 @@
 # Updated by Afiniel for Yiimpool use...
 # This script is intended to be run like this:
 #
-#   curl https://raw.githubusercontent.com/afiniel/yiimp_install_script/master/install.sh | bash
+# curl https://raw.githubusercontent.com/afiniel/yiimp_install_script/master/install.sh | bash
 
 #
 #########################################################
 if [ -z "${TAG}" ]; then
-	TAG=v0.6.0
+	TAG=v0.6.1
 fi
 
 
@@ -21,7 +21,7 @@ if [ ! -d $HOME/yiimp_install_script ]; then
 		echo Installing git . . .
 		apt-get -q -q update
 		DEBIAN_FRONTEND=noninteractive apt-get -q -q install -y git < /dev/null
-		echo DONE...
+		clear
 		echo
 
 	fi

install/functions.sh

@@ -80,7 +80,7 @@ function install_end_message {
 	figlet -f slant -w 100 "Complete!"
 
 	echo -e "$CYAN  --------------------------------------------------------------------------- 	  		$COL_RESET"
-	echo -e "$YELLOW  | Version:$GREEN v0.6.0                                                 |				$COL_RESET"
+	echo -e "$YELLOW  | Version:$GREEN v0.6.1                                                 |				$COL_RESET"
 	echo -e "$YELLOW Yiimp Installer Script Fork By Afiniel https://github.com/afiniel/yiimp_install_script $COL_RESET"
 	echo -e "$CYAN  --------------------------------------------------------------------------- 	  		$COL_RESET"
 	echo -e "$YELLOW   Your mysql information (login/Password) is saved in:$RED ~/.my.cnf					$COL_RESET"
@@ -116,7 +116,7 @@ function term_art {
 	echo "   ╚═╝   ╚═╝╚═╝╚═╝     ╚═╝╚═╝      ╚═════╝  ╚═════╝ ╚══════╝ "
 	echo -e "$CYAN   ----------------------------------------------------------> 	  											$COL_RESET"
 	echo -e "$CYAN  |$YELLOW Yiimp Installer Script Fork By Afiniel!												$COL_RESET"
-	echo -e "$CYAN  |$MAGENTA Version:$GREEN v0.6.0 														$COL_RESET"
+	echo -e "$CYAN  |$MAGENTA Version:$GREEN v0.6.1 														$COL_RESET"
 	echo -e "$CYAN   ----------------------------------------------------------------------> 	  			$COL_RESET"
 	echo -e "$CYAN  |$YELLOW This script will install all the dependencies and will install Yiimp.					$COL_RESET"
 	echo -e "$CYAN  |$YELLOW It will also install a MySQL database and a Web server.								$COL_RESET"
@@ -140,7 +140,7 @@ function term_yiimpool {
 	echo "   ╚═╝   ╚═╝╚═╝╚═╝     ╚═╝╚═╝      ╚═════╝  ╚═════╝ ╚══════╝ "
 	echo -e "$CYAN   -----------------|--------------------- 	  											$COL_RESET"
 	echo -e "$YELLOW  Yiimp Installer Script Fork By Afiniel!												$COL_RESET"
-	echo -e "$YELLOW  Version:$COL_RESET $GREEN v0.6.0 											$COL_RESET"
+	echo -e "$YELLOW  Version:$COL_RESET $GREEN v0.6.1 											$COL_RESET"
 	echo -e "$CYAN   -----------------|--------------------- 	  			$COL_RESET"
 	echo
 
@@ -192,14 +192,14 @@ function hide_output {
 function last_words {
 	echo "<-------------------------------------|---------------------------------------->"
 	echo
-	echo -e "$YELLOW Thank you for using the Yiimpool Installer $GREEN v0.6.0             $COL_RESET"
+	echo -e "$YELLOW Thank you for using the Yiimpool Installer $GREEN v0.6.1             $COL_RESET"
 	echo
 	echo -e "$YELLOW To run this installer anytime simply type: $GREEN yiimpool            $COL_RESET"
 	echo -e "$YELLOW Donations for continued support of this script are welcomed at:       $COL_RESET"
 	echo "<-------------------------------------|--------------------------------------->"
 	echo -e "$YELLOW                     Donate Wallets:                                   $COL_RESET"
 	echo "<-------------------------------------|--------------------------------------->"
-	echo -e "$YELLOW Thank you for using Yiimp Install Script v0.6.0 fork by Afiniel!      $COL_RESET"
+	echo -e "$YELLOW Thank you for using Yiimp Install Script v0.6.1 fork by Afiniel!      $COL_RESET"
 	echo
 	echo -e "$YELLOW =>  To run this installer anytime simply type:$GREEN yiimpool         $COL_RESET"
 	echo -e "$YELLOW =>  Do you want to support me? Feel free to use wallets below:        $COL_RESET"

install/menu.sh

@@ -7,7 +7,7 @@
 
 source /etc/functions.sh
 
-RESULT=$(dialog --stdout --nocancel --default-item 1 --title "Yiimpool Menu v0.6.0" --menu "Choose one" -1 60 16 \
+RESULT=$(dialog --stdout --nocancel --default-item 1 --title "Yiimpool Menu v0.6.1" --menu "Choose one" -1 60 16 \
 ' ' "- Install Yiimp  -" \
 1 "YiiMP Single Server" \
 ' ' "- Daemon Wallet Builder -" \

install/preflight.sh

@@ -29,8 +29,7 @@ if [ $TOTAL_PHYSICAL_MEM -lt 1436000 ]; then
   echo " It might run unreliably when under heavy load."
 fi
 
-# Check swap
-echo Checking if swap space is needed and if so creating...
+# Check if swap is needed.
 
 SWAP_MOUNTED=$(cat /proc/swaps | tail -n+2)
 SWAP_IN_FSTAB=$(grep "swap" /etc/fstab)

old_installer_files/conf/create_user.sh

@@ -13,12 +13,12 @@ echo 'YIIMPOOL_VERSION="v0.4.2"' | sudo -E tee /etc/yiimpoolversion.conf >/dev/n
 source /etc/yiimpoolversion.conf
 
 # Welcome
-message_box "Yiimp Installer v0.6.0" \
+message_box "Yiimp Installer v0.6.1" \
   "Hello and thanks for using the Yiimpool Installer!
 \n\nInstallation for the most part is fully automated. In most cases any user responses that are needed are asked prior to the installation.
 \n\nNOTE: You should only install this on a brand new Ubuntu 16.04 or Ubuntu 18.04 installation."
 # Root warning message box
-message_box "Yiimp Installer v0.6.0" \
+message_box "Yiimp Installer v0.6.1" \
   "WARNING: You are trying to install as the root user!
 \n\nRunning any program as root is not recommended and can pose serious security risks that you want to avoid.
 \n\nThe next step you will be asked to create a new user account, you can name it whatever you want."

old_installer_files/conf/functions.sh

@@ -80,7 +80,7 @@ function install_end_message {
 	figlet -f slant -w 100 "Complete!"
 
 	echo -e "$CYAN  --------------------------------------------------------------------------- 	  		$COL_RESET"
-	echo -e "$YELLOW  | Version:$GREEN v0.6.0                                                 |				$COL_RESET"
+	echo -e "$YELLOW  | Version:$GREEN v0.6.1                                                 |				$COL_RESET"
 	echo -e "$YELLOW Yiimp Installer Script Fork By Afiniel https://github.com/afiniel/yiimp_install_script $COL_RESET"
 	echo -e "$CYAN  --------------------------------------------------------------------------- 	  		$COL_RESET"
 	echo -e "$YELLOW   Your mysql information (login/Password) is saved in:$RED ~/.my.cnf					$COL_RESET"
@@ -115,7 +115,7 @@ function term_art {
 	echo "   ╚═╝   ╚═╝╚═╝╚═╝     ╚═╝╚═╝      ╚═════╝  ╚═════╝ ╚══════╝ "
 	echo -e "$CYAN   ---------------|----------------------- 	  											$COL_RESET"
 	echo -e "$YELLOW  Yiimp Installer Script Fork By Afiniel!												$COL_RESET"
-	echo -e "$YELLOW  Version:$COL_RESET $GREEN v0.6.0 														$COL_RESET"
+	echo -e "$YELLOW  Version:$COL_RESET $GREEN v0.6.1 														$COL_RESET"
 	echo -e "$CYAN   -----------------|---------------------------------------------------- 	  			$COL_RESET"
 	echo -e "$YELLOW  This script will install all the dependencies and will install Yiimp.					$COL_RESET"
 	echo -e "$YELLOW  It will also install a MySQL database and a Web server.								$COL_RESET"
@@ -138,7 +138,7 @@ function term_yiimpool {
 	echo "   ╚═╝   ╚═╝╚═╝╚═╝     ╚═╝╚═╝      ╚═════╝  ╚═════╝ ╚══════╝ "
 	echo -e "$CYAN   -----------------|--------------------- 	  											$COL_RESET"
 	echo -e "$YELLOW  Yiimp Installer Script Fork By Afiniel!												$COL_RESET"
-	echo -e "$YELLOW  Version:$COL_RESET $GREEN v0.6.0 											$COL_RESET"
+	echo -e "$YELLOW  Version:$COL_RESET $GREEN v0.6.1 											$COL_RESET"
 	echo -e "$CYAN   -----------------|--------------------- 	  			$COL_RESET"
 	echo
 
@@ -190,14 +190,14 @@ function hide_output {
 function last_words {
 	echo "<-------------------------------------|---------------------------------------->"
 	echo
-	echo -e "$YELLOW Thank you for using the Yiimpool Installer $GREEN v0.6.0!             $COL_RESET"
+	echo -e "$YELLOW Thank you for using the Yiimpool Installer $GREEN v0.6.1!             $COL_RESET"
 	echo
 	echo -e "$YELLOW To run this installer anytime simply type: $GREEN yiimpool            $COL_RESET"
 	echo -e "$YELLOW Donations for continued support of this script are welcomed at:       $COL_RESET"
 	echo "<-------------------------------------|--------------------------------------->"
 	echo -e "$YELLOW                     Donate Wallets:                                   $COL_RESET"
 	echo "<-------------------------------------|--------------------------------------->"
-	echo -e "$YELLOW Thank you for using Yiimp Install Script v0.6.0 fork by Afiniel!      $COL_RESET"
+	echo -e "$YELLOW Thank you for using Yiimp Install Script v0.6.1 fork by Afiniel!      $COL_RESET"
 	echo
 	echo -e "$YELLOW =>  To run this installer anytime simply type:$GREEN yiimpool         $COL_RESET"
 	echo -e "$YELLOW =>  Do you want to support me? Feel free to use wallets below:        $COL_RESET"

old_installer_files/conf/menu.sh

@@ -6,7 +6,7 @@
 source /etc/functions.sh
 source /etc/yiimpoolversion.conf
 
-RESULT=$(dialog --stdout --nocancel --default-item 1 --title "Yiimpool Installer v0.6.0" --menu "Choose one" -1 60 16 \
+RESULT=$(dialog --stdout --nocancel --default-item 1 --title "Yiimpool Installer v0.6.1" --menu "Choose one" -1 60 16 \
 ' ' "-  Yiimp  -" \
 1 "Start Yiimp Install" \
 ' ' "- Daemon Wallet Builder -" \

old_installer_files/conf/start.sh

@@ -75,7 +75,7 @@ if [[ ("$FIRST_TIME_SETUP" == "1") ]]; then
     # Are we running as root?
     if [[ $EUID -ne 0 ]]; then
         # Welcome
-        message_box "Yiimp Installer v0.6.0" \
+        message_box "Yiimp Installer v0.6.1" \
         "Hello and thanks for using the Yiimpool Installer!
         \n\nInstallation for the most part is fully automated. In most cases any user responses that are needed are asked prior to the installation.
         \n\nNOTE: You should only install this on a brand new Ubuntu 16.04 or Ubuntu 18.04 VPS."

yiimp_single/db.sh

@@ -94,28 +94,28 @@ echo -e "$YELLOW => Importing YiiMP Default database values <= $COL_RESET"
 cd $STORAGE_ROOT/yiimp/yiimp_setup/yiimp/sql
 # import SQL dump
 sudo zcat 2020-11-10-yaamp.sql.gz | sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}"
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2016-04-24-market_history.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2016-04-27-settings.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2016-05-11-coins.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2016-05-15-benchmarks.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2016-05-23-bookmarks.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2016-06-01-notifications.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2016-06-04-bench_chips.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2016-11-23-coins.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2017-02-05-benchmarks.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2017-03-31-earnings_index.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2017-05-accounts_case_swaptime.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2017-06-payouts_coinid_memo.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2017-09-notifications.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2017-10-bookmarks.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2017-11-segwit.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2018-01-stratums_ports.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2018-02-coins_getinfo.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2018-09-22-workers.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2019-03-coins_thepool_life.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2020-06-03-blocks.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2022-10-14-shares_solo.sql
-sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force <2022-10-29-blocks_effort.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2016-04-24-market_history.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2016-04-27-settings.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2016-05-11-coins.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2016-05-15-benchmarks.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2016-05-23-bookmarks.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2016-06-01-notifications.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2016-06-04-bench_chips.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2016-11-23-coins.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2017-02-05-benchmarks.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2017-03-31-earnings_index.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2017-05-accounts_case_swaptime.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2017-06-payouts_coinid_memo.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2017-09-notifications.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2017-10-bookmarks.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2017-11-segwit.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2018-01-stratums_ports.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2018-02-coins_getinfo.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2018-09-22-workers.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2019-03-coins_thepool_life.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2020-06-03-blocks.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2022-10-14-shares_solo.sql
+sudo mysql -u root -p"${DBRootPassword}" "${YiiMPDBName}" --force < 2022-10-29-blocks_effort.sql
 echo -e "$YELLOW <-- Datebase import $GREEN complete -->$COL_RESET"
 
 echo -e "$YELLOW => Tweaking MariaDB for better performance <= $COL_RESET"

yiimp_single/motd.sh

@@ -7,10 +7,7 @@
 source /etc/functions.sh # load our functions
 source /etc/yiimpool.conf
 
-term_art
-echo -e "$MAGENTA    <----------------->$COL_RESET"
-echo -e "$YELLOW     <-- Update Motd -->$COL_RESET"
-echo -e "$MAGENTA    <----------------->$COL_RESET"
+echo -e "$YELLOW <-- Update Motd -->$COL_RESET"
 
 apt_install lsb-release figlet update-motd \
     landscape-common update-notifier-common

yiimp_single/nginx_domain_nonssl.sh

@@ -6,6 +6,7 @@
 source /etc/functions.sh
 source /etc/yiimpool.conf
 source $STORAGE_ROOT/yiimp/.yiimp.conf
+source $HOME/yiimp_install_script/yiimp_single/.wireguard.install.cnf
 
 set -eu -o pipefail
 

yiimp_single/nginx_domain_nossl.sh

@@ -6,6 +6,7 @@
 source /etc/functions.sh
 source /etc/yiimpool.conf
 source $STORAGE_ROOT/yiimp/.yiimp.conf
+source $HOME/yiimp_install_script/yiimp_single/.wireguard.install.cnf
 
 set -eu -o pipefail
 

yiimp_single/nginx_domain_ssl.sh

@@ -6,6 +6,7 @@
 source /etc/functions.sh
 source /etc/yiimpool.conf
 source $STORAGE_ROOT/yiimp/.yiimp.conf
+source $HOME/yiimp_install_script/yiimp_single/.wireguard.install.cnf
 
 set -eu -o pipefail
 
@@ -88,7 +89,8 @@ server {
 	restart_service nginx >/dev/null 2>&1
 	restart_service php7.3-fpm >/dev/null 2>&1
 else
-	echo -e "Certbot generation failed, after the installer is finished check /var/log/letsencrypt (must be root to view) on why it failed."
+	echo -e "$GREEN Certbot$RED generation failed, after the installer is finished check$MAGENTA /var/log/letsencrypt$YELLOW (must be root to view) on why it failed. $COL_RESET"
 fi
 set +eu +o pipefail
+
 cd $HOME/yiimp_install_script/yiimp_single

yiimp_single/nginx_subdomain_nonssl.sh

@@ -6,6 +6,7 @@
 source /etc/functions.sh
 source /etc/yiimpool.conf
 source $STORAGE_ROOT/yiimp/.yiimp.conf
+source $HOME/yiimp_install_script/yiimp_single/.wireguard.install.cnf
 
 set -eu -o pipefail
 

yiimp_single/nginx_subdomain_ssl.sh

@@ -6,6 +6,7 @@
 source /etc/functions.sh
 source /etc/yiimpool.conf
 source $STORAGE_ROOT/yiimp/.yiimp.conf
+source $HOME/yiimp_install_script/yiimp_single/.wireguard.install.cnf
 
 set -eu -o pipefail
 

yiimp_single/nginx_upgrade.sh

@@ -31,11 +31,11 @@ fi
 # NGINX upgrade TODO: CLEAN UP
 echo -e "$YELLOW => Upgrading NGINX  <= $COL_RESET"
 
-#Grab Nginx key and proper mainline package for distro
-# echo "deb http://nginx.org/packages/mainline/ubuntu `lsb_release -cs` nginx" \
-#    | sudo tee /etc/apt/sources.list.d/nginx.list >/dev/null 2>&1
-#
-#sudo curl -fsSL https://nginx.org/keys/nginx_signing.key | sudo apt-key add - >/dev/null 2>&1
+Grab Nginx key and proper mainline package for distro
+echo "deb http://nginx.org/packages/mainline/ubuntu `lsb_release -cs` nginx" \
+    | sudo tee /etc/apt/sources.list.d/nginx.list >/dev/null 2>&1
+
+sudo curl -fsSL https://nginx.org/keys/nginx_signing.key | sudo apt-key add - >/dev/null 2>&1
 hide_output sudo apt-get update
 hide_output sudo apt-get install -y nginx
 
@@ -54,29 +54,12 @@ sudo cp -r nginx_confs/letsencrypt.conf /etc/nginx/yiimpool
 # Removing default nginx site configs.
 #sudo rm -r /etc/nginx/conf.d/default.conf
 sudo rm -r /etc/nginx/sites-enabled/default
-#sudo rm -r /etc/nginx/sites-available/default*
+sudo rm -r /etc/nginx/sites-available/default*
 
 echo -e "$GREEN NGINX upgrade complete.$COL_RESET"
 restart_service nginx
 restart_service php7.3-fpm
 
-# Installing PhpMyAdmin
-
-#echo -e "$CYAN => Installing phpMyAdmin $COL_RESET"
-#echo
-#sleep 3
-
-#echo "phpmyadmin phpmyadmin/reconfigure-webserver multiselect" | sudo debconf-set-selections
-#echo "phpmyadmin phpmyadmin/dbconfig-install boolean true" | sudo debconf-set-selections
-#echo "phpmyadmin phpmyadmin/mysql/admin-user string root" | sudo debconf-set-selections
-#echo "phpmyadmin phpmyadmin/mysql/admin-pass password $rootpasswd" | sudo debconf-set-selections
-#echo "phpmyadmin phpmyadmin/mysql/app-pass password $AUTOGENERATED_PASS" | sudo debconf-set-selections
-#echo "phpmyadmin phpmyadmin/app-password-confirm password $AUTOGENERATED_PASS" | sudo debconf-set-selections
-
-#apt_install phpmyadmin
-#hide_output sudo apt-get install -y phpmyadmin
-
-echo -e "$GREEN Done...$COL_RESET"
 set +eu +o pipefail
 
 cd $HOME/yiimp_install_script/yiimp_single

yiimp_single/questions.sh

@@ -308,5 +308,4 @@ exit 0
 ;;
 esac
 
-
-cd $HOME/yiimp_install_script/yiimp_single
+cd $HOME/yiimp_install_script/yiimp_single

yiimp_single/send_mail.sh

@@ -7,6 +7,7 @@
 source /etc/functions.sh
 source /etc/yiimpool.conf
 source $STORAGE_ROOT/yiimp/.yiimp.conf
+source $HOME/yiimp_install_script/yiimp_single/.wireguard.install.cnf
 
 set -eu -o pipefail