Skip to content

Commit 6116a8f

Browse files
committed
Install UI update
1 parent 947eae7 commit 6116a8f

File tree

4 files changed

+40
-21
lines changed

4 files changed

+40
-21
lines changed

install/start.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ if [[ ("$FIRST_TIME_SETUP" == "1") ]]; then
5454
#check for user
5555
echo -e "$YELLOW => Installing needed packages for setup to continue <= $COL_RESET"
5656
hide_output sudo apt-get -q -q update
57+
hide_output sudo apt-get instal -y figlet
58+
hide_output sudo apt-get install -y lolcat
5759
apt_get_quiet install dialog python3 python3-pip acl nano git apt-transport-https || exit 1
5860

5961
# Are we running as root?

yiimp_single/start.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,12 @@ export LC_TYPE=en_US.UTF-8
2828
export NCURSES_NO_UTF8_ACS=1
2929

3030
# Create the temporary installation directory if it doesn't already exist.
31-
echo -e "$CYAN => Creating the temporary YiiMP installation folder... <= $COL_RESET"
31+
echo -e "$CYAN => Creating the YiiMP folder structure... <= $COL_RESET"
3232
if [ ! -d $STORAGE_ROOT/yiimp/yiimp_setup ]; then
3333
sudo mkdir -p $STORAGE_ROOT/{wallets,yiimp/{yiimp_setup/log,site/{web,stratum,configuration,crons,log},starts}}
3434
sudo touch $STORAGE_ROOT/yiimp/yiimp_setup/log/installer.log
3535
fi
3636
echo
37-
echo -e "$GREEN Folders created...$COL_RESET"
3837

3938
# Start the installation.
4039
source menu.sh

yiimp_single/system.sh

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,45 +34,43 @@ if [ ! -f /etc/timezone ]; then
3434
echo "Etc/UTC" /etc/timezone >sudo
3535
restart_service rsyslog
3636
fi
37-
38-
echo -e "$GREEN <-- Done -->$COL_RESET"
3937
echo
4038

4139
# Add repository
42-
echo -e "$YELLOW => Adding the required repsoitories <= $COL_RESET"
40+
echo -e "$MAGENTA => Adding the required repsoitories <= $COL_RESET"
4341
if [ ! -f /usr/bin/add-apt-repository ]; then
42+
echo
4443
echo -e "$MAGENTA => Installing add-apt-repository... <= $COL_RESET"
45-
hide_output sudo apt-get -y update
44+
hide_output sudo apt-get update
4645
hide_output sudo apt-get -y install software-properties-common
4746
fi
4847
echo
4948

5049
# PHP 7.3
51-
echo -e "$MAGENTA => Installing Ondrej PHP PPA <= $COL_RESET"
50+
echo -e "$YELLOW => Installing Ondrej PHP PPA <= $COL_RESET"
5251
if [ ! -f /etc/apt/sources.list.d/ondrej-php-bionic.list ]; then
5352
hide_output sudo add-apt-repository -y ppa:ondrej/php
5453
hide_output sudo apt-get -y update
55-
hide_output sudo apt-get -y install software-properties-common
54+
echo -e "$GREEN <-- Done -->$COL_RESET"
55+
# hide_output sudo apt-get -y install software-properties-common
5656
fi
57-
echo -e "$GREEN <-- Done -->$COL_RESET"
5857

5958
# CertBot
6059
echo
61-
echo -e "$MAGENTA => Installing CertBot PPA <= $COL_RESET"
60+
echo -e "$YELLOW => Installing CertBot PPA <= $COL_RESET"
6261
hide_output sudo add-apt-repository -y ppa:certbot/certbot
6362
hide_output sudo apt-get -y update
64-
echo
6563
echo -e "$GREEN <-- Done -->$COL_RESET"
6664

6765
# MariaDB
68-
echo -e "$MAGENTA => Installing MariaDB <= $COL_RESET"
66+
echo
67+
echo -e "$YELLOW => Installing MariaDB <= $COL_RESET"
6968
hide_output sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8
7069
if [[ ("$DISTRO" == "18") ]]; then
7170
sudo add-apt-repository 'deb [arch=amd64,arm64,i386,ppc64el] http://mirror.one.com/mariadb/repo/10.4/ubuntu bionic main' >/dev/null 2>&1
7271
else
7372
sudo add-apt-repository 'deb [arch=amd64,arm64,ppc64el] http://mirror.one.com/mariadb/repo/10.4/ubuntu xenial main' >/dev/null 2>&1
7473
fi
75-
echo
7674
echo -e "$GREEN <-- Done -->$COL_RESET"
7775

7876
# Upgrade System Files
@@ -92,16 +90,14 @@ apt_get_quiet dist-upgrade
9290

9391
apt_get_quiet autoremove
9492

95-
echo -e "$GREEN <-- Done -->$COL_RESET"
9693
echo
9794
echo -e "$MAGENTA => Installing Base system packages <= $COL_RESET"
9895
apt_install python3 python3-dev python3-pip \
9996
wget curl git sudo coreutils bc \
10097
haveged pollinate unzip \
101-
unattended-upgrades cron ntp fail2ban screen rsyslog
98+
unattended-upgrades cron ntp fail2ban screen rsyslog lolcat
10299

103100
# ### Seed /dev/urandom
104-
echo
105101
echo -e "$GREEN <-- Done -->$COL_RESET"
106102
echo
107103
echo -e "$YELLOW => Initializing system random number generator <= $COL_RESET"
@@ -115,22 +111,44 @@ set +eu +o pipefail
115111
if [ -z "${DISABLE_FIREWALL:-}" ]; then
116112
# Install `ufw` which provides a simple firewall configuration.
117113
apt_install ufw
118-
119-
# Allow incoming connections to SSH.
114+
echo
115+
echo -e "$YELLOW => Allow incoming connections to SSH <= $COL_RESET"
116+
echo
117+
echo -e "$YELLOW ssh port$GREEN OPEN $COL_RESET"
118+
echo
120119
ufw_allow ssh
120+
sleep 0.5
121+
echo -e "$YELLOW http port$GREEN OPEN $COL_RESET"
122+
echo
123+
sleep 0.5
121124
ufw_allow http
125+
echo
126+
sleep 0.5
127+
echo
122128
ufw_allow https
129+
123130
# ssh might be running on an alternate port. Use sshd -T to dump sshd's #NODOC
124131
# settings, find the port it is supposedly running on, and open that port #NODOC
125132
# too. #NODOC
126133
SSH_PORT=$(sshd -T 2>/dev/null | grep "^port " | sed "s/port //") #NODOC
127134
if [ ! -z "$SSH_PORT" ]; then
128135
if [ "$SSH_PORT" != "22" ]; then
129136

130-
echo Opening alternate SSH port $SSH_PORT. #NODOC
137+
echo -e "$YELLOW => Allow incoming connections to SSH <= $COL_RESET"
138+
echo
139+
echo -e $"YELLOW Opening alternate SSH port:$GREEN $SSH_PORT $COL_RESET"
140+
echo
131141
ufw_allow $SSH_PORT
142+
sleep 0.5
143+
echo
144+
echo -e "$YELLOW http port$GREEN open $COL_RESET"
132145
ufw_allow http
146+
sleep 0.5
147+
echo
148+
echo -e "$YELLOW https port$GREEN OPEN $COL_RESET"
133149
ufw_allow https
150+
sleep 0.5
151+
echo
134152

135153
fi
136154
fi
@@ -209,4 +227,4 @@ fi
209227
hide_output service nginx restart
210228

211229
set +eu +o pipefail
212-
cd $HOME/yiimp_install_script/yiimp_single
230+
cd $HOME/yiimp_install_script/yiimp_single

yiimp_single/ubuntu/etc/update-motd.d/00-header

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if [ -z "$DISTRIB_DESCRIPTION" ] && [ -x /usr/bin/lsb_release ]; then
3333
DISTRIB_DESCRIPTION=$(lsb_release -s -d)
3434
fi
3535

36-
figlet -f slant -w 100 "YiimpooL"
36+
figlet -f slant -w 100 "YiimpooL" | lolcat
3737
printf "\n"
3838

3939
printf "Welcome to %s (%s).\n" "$DISTRIB_DESCRIPTION" "YiimPool Version v0.6.3"

0 commit comments

Comments
 (0)