From d495e9851bafacefe600571427ef7ecad097ba04 Mon Sep 17 00:00:00 2001 From: afiniel <44875524+afiniel@users.noreply.github.com> Date: Thu, 1 Dec 2022 04:43:45 +0100 Subject: [PATCH 1/5] move old files --- {conf => old_installer_files/conf}/bootstrap_coin.sh | 0 {conf => old_installer_files/conf}/create_user.sh | 0 {conf => old_installer_files/conf}/editconf.py | 0 {conf => old_installer_files/conf}/existing_user.sh | 0 {conf => old_installer_files/conf}/functions.sh | 0 {conf => old_installer_files/conf}/getip.sh | 0 {conf => old_installer_files/conf}/menu.sh | 0 {conf => old_installer_files/conf}/pre_setup.sh | 0 {conf => old_installer_files/conf}/preflight.sh | 0 {conf => old_installer_files/conf}/start.sh | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename {conf => old_installer_files/conf}/bootstrap_coin.sh (100%) rename {conf => old_installer_files/conf}/create_user.sh (100%) rename {conf => old_installer_files/conf}/editconf.py (100%) rename {conf => old_installer_files/conf}/existing_user.sh (100%) rename {conf => old_installer_files/conf}/functions.sh (100%) rename {conf => old_installer_files/conf}/getip.sh (100%) rename {conf => old_installer_files/conf}/menu.sh (100%) rename {conf => old_installer_files/conf}/pre_setup.sh (100%) rename {conf => old_installer_files/conf}/preflight.sh (100%) rename {conf => old_installer_files/conf}/start.sh (100%) diff --git a/conf/bootstrap_coin.sh b/old_installer_files/conf/bootstrap_coin.sh similarity index 100% rename from conf/bootstrap_coin.sh rename to old_installer_files/conf/bootstrap_coin.sh diff --git a/conf/create_user.sh b/old_installer_files/conf/create_user.sh similarity index 100% rename from conf/create_user.sh rename to old_installer_files/conf/create_user.sh diff --git a/conf/editconf.py b/old_installer_files/conf/editconf.py similarity index 100% rename from conf/editconf.py rename to old_installer_files/conf/editconf.py diff --git a/conf/existing_user.sh b/old_installer_files/conf/existing_user.sh similarity index 100% rename from conf/existing_user.sh rename to old_installer_files/conf/existing_user.sh diff --git a/conf/functions.sh b/old_installer_files/conf/functions.sh similarity index 100% rename from conf/functions.sh rename to old_installer_files/conf/functions.sh diff --git a/conf/getip.sh b/old_installer_files/conf/getip.sh similarity index 100% rename from conf/getip.sh rename to old_installer_files/conf/getip.sh diff --git a/conf/menu.sh b/old_installer_files/conf/menu.sh similarity index 100% rename from conf/menu.sh rename to old_installer_files/conf/menu.sh diff --git a/conf/pre_setup.sh b/old_installer_files/conf/pre_setup.sh similarity index 100% rename from conf/pre_setup.sh rename to old_installer_files/conf/pre_setup.sh diff --git a/conf/preflight.sh b/old_installer_files/conf/preflight.sh similarity index 100% rename from conf/preflight.sh rename to old_installer_files/conf/preflight.sh diff --git a/conf/start.sh b/old_installer_files/conf/start.sh similarity index 100% rename from conf/start.sh rename to old_installer_files/conf/start.sh From a42536076f6b0f20943b580688d9c84c7563db6e Mon Sep 17 00:00:00 2001 From: afiniel <44875524+afiniel@users.noreply.github.com> Date: Thu, 1 Dec 2022 04:59:25 +0100 Subject: [PATCH 2/5] Update main.php --- yiimp_single/yiimp_confs/main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yiimp_single/yiimp_confs/main.php b/yiimp_single/yiimp_confs/main.php index af7f1ae1..a1695801 100644 --- a/yiimp_single/yiimp_confs/main.php +++ b/yiimp_single/yiimp_confs/main.php @@ -137,7 +137,7 @@ function showPageFooter() $year = date("Y", time()); echo "
© $year ".YAAMP_SITE_NAME.' - '. - 'Open source Project
'; + 'Build with yiimp install script by Afiniel'; echo ''; } From 5ed335d9f5bb3ab2f9c6b072ada5c275d5d1cc4a Mon Sep 17 00:00:00 2001 From: afiniel <44875524+afiniel@users.noreply.github.com> Date: Thu, 1 Dec 2022 05:01:24 +0100 Subject: [PATCH 3/5] Update functions.sh --- install/functions.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/install/functions.sh b/install/functions.sh index ca6f2d8e..d6fb4f89 100644 --- a/install/functions.sh +++ b/install/functions.sh @@ -105,6 +105,8 @@ function install_end_message { # terminal art start screen. function term_art { clear + source /etc/functions.sh + source /etc/yiimpool.conf echo echo "██╗ ██╗██╗██╗███╗ ███╗██████╗ ██████╗ ██████╗ ██╗ " echo "╚██╗ ██╔╝██║██║████╗ ████║██╔══██╗██╔═══██╗██╔═══██╗██║ " @@ -126,8 +128,9 @@ function term_art { } function term_yiimpool { - source /etc/yiimpoolversion.conf clear + source /etc/functions.sh + source /etc/yiimpool.conf echo echo "██╗ ██╗██╗██╗███╗ ███╗██████╗ ██████╗ ██████╗ ██╗ " echo "╚██╗ ██╔╝██║██║████╗ ████║██╔══██╗██╔═══██╗██╔═══██╗██║ " From 4f8998c878d21fe829bbc7283ed24ce03585d214 Mon Sep 17 00:00:00 2001 From: afiniel <44875524+afiniel@users.noreply.github.com> Date: Thu, 1 Dec 2022 05:02:04 +0100 Subject: [PATCH 4/5] update tags Set tag version to: v0.5.9 --- README.md | 4 ++-- install.sh | 2 +- install/functions.sh | 10 +++++----- install/menu.sh | 2 +- old_installer_files/conf/create_user.sh | 4 ++-- old_installer_files/conf/functions.sh | 10 +++++----- old_installer_files/conf/menu.sh | 2 +- old_installer_files/conf/start.sh | 2 +- yiimp_single/start.sh | 4 ++-- yiimp_single/ubuntu/etc/update-motd.d/00-header | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 99089df0..9fff4975 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -The installer automatically install all requirements to get Yiimp installed correctly.
Yiimpool Yiimp Install Scrypt is a Script that will install Yiimp Mining Pool on a cleanUbuntu 18.04 VPS.
+This is the main page for Yiimpool Yiimp Install script. Here you find information all documentation about Yiimpool Yiimp Installer v0.6.0The installer automatically install all requirements to get Yiimp installed correctly.
Yiimpool Yiimp Install Scrypt is a Script that will install Yiimp Mining Pool on a cleanUbuntu 18.04 VPS.
More information will be added soon.diff --git a/install.sh b/install.sh index 83920991..30db220b 100644 --- a/install.sh +++ b/install.sh @@ -11,7 +11,7 @@ # ######################################################### if [ -z "${TAG}" ]; then - TAG=v0.5.9 + TAG=v0.6.0 fi diff --git a/install/functions.sh b/install/functions.sh index d6fb4f89..302fdd2a 100644 --- a/install/functions.sh +++ b/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.5.9 | $COL_RESET" + echo -e "$YELLOW | Version:$GREEN v0.6.0 | $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.5.9 $COL_RESET" + echo -e "$CYAN |$MAGENTA Version:$GREEN v0.6.0 $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.5.9 $COL_RESET" + echo -e "$YELLOW Version:$COL_RESET $GREEN v0.6.0 $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.5.9 $COL_RESET" + echo -e "$YELLOW Thank you for using the Yiimpool Installer $GREEN v0.6.0 $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.5.9 fork by Afiniel! $COL_RESET" + echo -e "$YELLOW Thank you for using Yiimp Install Script v0.6.0 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" diff --git a/install/menu.sh b/install/menu.sh index 92b8d544..f5690104 100644 --- a/install/menu.sh +++ b/install/menu.sh @@ -7,7 +7,7 @@ source /etc/functions.sh -RESULT=$(dialog --stdout --nocancel --default-item 1 --title "Yiimpool Menu v0.5.9" --menu "Choose one" -1 60 16 \ +RESULT=$(dialog --stdout --nocancel --default-item 1 --title "Yiimpool Menu v0.6.0" --menu "Choose one" -1 60 16 \ ' ' "- Install Yiimp -" \ 1 "YiiMP Single Server" \ ' ' "- Daemon Wallet Builder -" \ diff --git a/old_installer_files/conf/create_user.sh b/old_installer_files/conf/create_user.sh index d625749b..d529fe4b 100644 --- a/old_installer_files/conf/create_user.sh +++ b/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.5.9" \ +message_box "Yiimp Installer v0.6.0" \ "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.5.9" \ +message_box "Yiimp Installer v0.6.0" \ "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." diff --git a/old_installer_files/conf/functions.sh b/old_installer_files/conf/functions.sh index 0e7de449..ca77a476 100644 --- a/old_installer_files/conf/functions.sh +++ b/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.5.9 | $COL_RESET" + echo -e "$YELLOW | Version:$GREEN v0.6.0 | $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.5.9 $COL_RESET" + echo -e "$YELLOW Version:$COL_RESET $GREEN v0.6.0 $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.5.9 $COL_RESET" + echo -e "$YELLOW Version:$COL_RESET $GREEN v0.6.0 $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.5.9! $COL_RESET" + echo -e "$YELLOW Thank you for using the Yiimpool Installer $GREEN v0.6.0! $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.5.9 fork by Afiniel! $COL_RESET" + echo -e "$YELLOW Thank you for using Yiimp Install Script v0.6.0 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" diff --git a/old_installer_files/conf/menu.sh b/old_installer_files/conf/menu.sh index 0017de7a..79f776e2 100644 --- a/old_installer_files/conf/menu.sh +++ b/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.5.9" --menu "Choose one" -1 60 16 \ +RESULT=$(dialog --stdout --nocancel --default-item 1 --title "Yiimpool Installer v0.6.0" --menu "Choose one" -1 60 16 \ ' ' "- Yiimp -" \ 1 "Start Yiimp Install" \ ' ' "- Daemon Wallet Builder -" \ diff --git a/old_installer_files/conf/start.sh b/old_installer_files/conf/start.sh index 619174c9..4a01a56b 100644 --- a/old_installer_files/conf/start.sh +++ b/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.5.9" \ + message_box "Yiimp Installer v0.6.0" \ "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." diff --git a/yiimp_single/start.sh b/yiimp_single/start.sh index b852c9d7..c7a3cbce 100644 --- a/yiimp_single/start.sh +++ b/yiimp_single/start.sh @@ -68,7 +68,7 @@ if [[ ("$UsingDomain" == "yes") ]]; then source /etc/functions.sh term_yiimpool echo -e "$CYAN<-----------------------------------------------------------------------------> $COL_RESET" - echo -e "$YELLOW Thank you for using Yiimp Install Script$GREEN v0.5.9 $YELLOW fork by Afiniel! $COL_RESET" + echo -e "$YELLOW Thank you for using Yiimp Install Script$GREEN v0.6.0 $YELLOW fork by Afiniel! $COL_RESET" echo echo -e "$YELLOW => To run this installer anytime simply type:$GREEN yiimpool $COL_RESET" echo -e "$CYAN<-----------------------------------------------------------------------------> $COL_RESET" @@ -101,7 +101,7 @@ else source /etc/functions.sh term_yiimpool echo -e "$CYAN<-----------------------------------------------------------------------------> $COL_RESET" - echo -e "$YELLOW Thank you for using Yiimp Install Script$GREEN v0.5.9 $YELLOW fork by Afiniel! $COL_RESET" + echo -e "$YELLOW Thank you for using Yiimp Install Script$GREEN v0.6.0 $YELLOW fork by Afiniel! $COL_RESET" echo echo -e "$YELLOW => To run this installer anytime simply type:$GREEN yiimpool $COL_RESET" echo -e "$CYAN<-----------------------------------------------------------------------------> $COL_RESET" diff --git a/yiimp_single/ubuntu/etc/update-motd.d/00-header b/yiimp_single/ubuntu/etc/update-motd.d/00-header index 92eed710..c283dbe2 100644 --- a/yiimp_single/ubuntu/etc/update-motd.d/00-header +++ b/yiimp_single/ubuntu/etc/update-motd.d/00-header @@ -36,5 +36,5 @@ fi figlet -f slant -w 100 "YiimpooL" printf "\n" -printf "Welcome to %s (%s).\n" "$DISTRIB_DESCRIPTION" "YiimPool Version v0.5.9" +printf "Welcome to %s (%s).\n" "$DISTRIB_DESCRIPTION" "YiimPool Version v0.6.0" printf "\n" From 11e7a06358c3ee08e57aba66645449d185314d80 Mon Sep 17 00:00:00 2001 From: afiniel <44875524+afiniel@users.noreply.github.com> Date: Thu, 1 Dec 2022 05:31:44 +0100 Subject: [PATCH 5/5] Fix white AdminPage --- yiimp_single/web.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yiimp_single/web.sh b/yiimp_single/web.sh index ad03cde7..943e8d4a 100644 --- a/yiimp_single/web.sh +++ b/yiimp_single/web.sh @@ -29,7 +29,7 @@ echo -e "$MAGENTA <--------------------------------------------------->$COL_R echo -e "$CYAN => Building web file structure and copying files <= $COL_RESET" cd $STORAGE_ROOT/yiimp/yiimp_setup/yiimp -sudo sed -i 's/AdminRights/'${AdminPanel}'/' $STORAGE_ROOT/yiimp/yiimp_setup/yiimp/web/yaamp/modules/site/SiteController.php +sudo sed -i 's/myadmin/'${AdminPanel}'/' $STORAGE_ROOT/yiimp/yiimp_setup/yiimp/web/yaamp/modules/site/SiteController.php sudo cp -r $STORAGE_ROOT/yiimp/yiimp_setup/yiimp/web $STORAGE_ROOT/yiimp/site/ cd $STORAGE_ROOT/yiimp/yiimp_setup/ sudo cp -r $STORAGE_ROOT/yiimp/yiimp_setup/yiimp/bin/. /bin/ @@ -113,6 +113,6 @@ sudo rm -r /home/crypto-data/yiimp/site/web/yaamp/core/trading/exbitron_trading. sudo rm -r /home/crypto-data/yiimp/site/web/yaamp/ui/main.php cd $HOME/yiimp_install_script/yiimp_single/yiimp_confs cp -r exbitron_trading.php /home/crypto-data/yiimp/site/web/yaamp/core/trading -cp -r main.php /home/crypto-data/yiimp/site/web/yaamp/ui +cp -r main.php /home/crypto-data/yiimp/site/web/yaamp/ui/ cd $HOME/yiimp_install_script/yiimp_single