Skip to content

Commit a7b0a4e

Browse files
PDowneyPDowney
committed
Minor Fixes
1 parent 9cadafb commit a7b0a4e

11 files changed

Lines changed: 55 additions & 85 deletions

File tree

‎enginescript-install.sh‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ echo "32bit or 64bit = $BIT_TYPE"
5858
echo "Server Memory = $SERVER_MEMORY_TOTAL_100"
5959
echo "IP Address = $IP_ADDRESS"
6060
echo "Linux Version = $UBUNTU_TYPE $UBUNTU_VERSION $UBUNTU_CODENAME"
61-
echo "Server Memory = $SERVER_MEMORY_TOTAL_100"
6261
echo -e "${BOLD}\nEngineScript Install Options:${NORMAL}"
6362
echo "AUTOMATIC_LOSSLESS_IMAGE_OPTIMIZATION = $AUTOMATIC_LOSSLESS_IMAGE_OPTIMIZATION"
6463
echo "AUTOMATIC_ENGINESCRIPT_UPDATES = $AUTOMATIC_ENGINESCRIPT_UPDATES"
@@ -104,13 +103,6 @@ if [ "$INSTALL_S3_BACKUP" = 1 ] && [ "$S3_BUCKET_NAME" = PLACEHOLDER ];
104103
exit
105104
fi
106105

107-
# Check S3 Bucket Name
108-
if [ "$INSTALL_S3_BACKUP" = 0 ] && [ "$S3_BUCKET_NAME" != PLACEHOLDER ];
109-
then
110-
echo -e "\nWARNING:\n\nYou have set INSTALL_S3_BACKUP=0 but have changed S3_BUCKET_NAME from PLACEHOLDER.\nPlease return to the config file with command ${BOLD}es.config${NORMAL} and change INSTALL_S3_BACKUP to 1. If this is a mistake, you can avoid this error by setting S3_BUCKET_NAME to PLACEHOLDER\n"
111-
exit
112-
fi
113-
114106
# Check Cloudflare Global API Key
115107
if [ "$CF_GLOBAL_API_KEY" = PLACEHOLDER ] && [ "$CF_ACCOUNT_EMAIL" = PLACEHOLDER ];
116108
then
@@ -428,8 +420,12 @@ fi
428420
# Server Reboot
429421
clear
430422

423+
# Display Install Info
424+
/usr/local/bin/enginescript/scripts/functions/alias/alias-server-info.sh
425+
426+
# Reboot Notice
431427
echo -e "${BOLD}Server needs to reboot.${NORMAL}\n\nEnter command ${BOLD}es.menu${NORMAL} after reboot to continue.\n" | boxes -a c -d shell -p a1l2
432-
sleep 15
428+
sleep 10
433429
clear
434430

435431
echo -e "Server rebooting now...\n\n${NORMAL}When reconnected, use command ${BOLD}es.menu${NORMAL} to start EngineScript.\nSelect option 1 to create a new vhost configuration on your server.\n\n${BOLD}Bye! Manually reconnect in 30 seconds.\n" | boxes -a c -d shell -p a1l2

‎enginescript-variables.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ PHPMYADMIN_VER="5.2.2"
2222
PNGOUT_VER="20200115"
2323
ZLIB_VER="1.3.1"
2424

25-
# No Longer Used
26-
WORDFENCE_CLI_VER="3.0.2"
27-
2825
# Old Software Versions
2926
OLDPHP="8.0"
3027
OLDPCRE="8.45"

‎scripts/functions/alias/alias-server-info.sh‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,8 @@ fi
2424
# Start Main Script
2525

2626
echo -e "${BOLD}\n\n--------------------\nConfiguration Review\n--------------------${NORMAL}"
27-
echo -e "${BOLD}\nServer Information:${NORMAL}"
28-
echo "Variables File Date = $VARIABLES_DATE"
29-
echo "Script Run Date = $DT"
30-
echo "CPU Count = $CPU_COUNT"
31-
echo "32bit or 64bit = $BIT_TYPE"
32-
echo "Server Memory = $SERVER_MEMORY_TOTAL_100"
33-
echo "IP Address = $IP_ADDRESS"
34-
echo "Linux Version = $UBUNTU_TYPE $UBUNTU_VERSION $UBUNTU_CODENAME"
35-
echo "Server Memory = $SERVER_MEMORY_TOTAL_100"
36-
echo -e "${BOLD}\nEngineScript Install Options:${NORMAL}"
27+
28+
echo -e "\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-\nEnginescript Install Options\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n"
3729
echo "AUTOMATIC_LOSSLESS_IMAGE_OPTIMIZATION = $AUTOMATIC_LOSSLESS_IMAGE_OPTIMIZATION"
3830
echo "AUTOMATIC_ENGINESCRIPT_UPDATES = $AUTOMATIC_ENGINESCRIPT_UPDATES"
3931
echo "INSTALL_ADMINER = $INSTALL_ADMINER"
@@ -51,13 +43,30 @@ echo "INSTALL_DROPBOX_BACKUP = $INSTALL_DROPBOX_BACKUP"
5143
echo "DAILY_DROPBOX_DATABASE_BACKUP = $DAILY_DROPBOX_DATABASE_BACKUP"
5244
echo "HOURLY_DROPBOX_DATABASE_BACKUP = $HOURLY_DROPBOX_DATABASE_BACKUP"
5345
echo "WEEKLY_DROPBOX_WPCONTENT_BACKUP = $WEEKLY_DROPBOX_WPCONTENT_BACKUP"
54-
echo -e "${BOLD}\n--------------------\nNginx Version\n--------------------${NORMAL}"
46+
47+
echo -e "\n\n=-=-=-=-=-=-=-=-=-\nServer Info\n=-=-=-=-=-=-=-=-=-\n"
48+
echo "Variables File Date = $VARIABLES_DATE"
49+
echo "Script Run Date = $DT"
50+
echo "CPU Count = $CPU_COUNT"
51+
echo "32bit or 64bit = $BIT_TYPE"
52+
echo "Server Memory = $SERVER_MEMORY_TOTAL_100"
53+
echo "IP Address = $IP_ADDRESS"
54+
echo "Linux Version = $UBUNTU_TYPE $UBUNTU_VERSION $UBUNTU_CODENAME"
55+
56+
echo -e "\n\n=-=-=-=-=-=-=-=-=-\nNginx Info\n=-=-=-=-=-=-=-=-=-\n"
5557
nginx -Vv
58+
echo "Nginx Executable Properties:"
5659
checksec --format=json --file=/usr/sbin/nginx --extended | jq -r
57-
echo -e "${BOLD}\n\n--------------------\nPHP Version\n--------------------${NORMAL}"
60+
61+
echo -e "\n\n=-=-=-=-=-=-=-=-=-\nPHP Info\n=-=-=-=-=-=-=-=-=-\n"
5862
php -version
63+
echo ""
64+
php -m
65+
5966
echo -e "${BOLD}\n\n--------------------\nMariaDB Version\n--------------------${NORMAL}"
6067
mariadb -V
68+
6169
echo -e "${BOLD}\n\n--------------------\nRedis Version\n--------------------${NORMAL}"
6270
redis-server --version
71+
6372
echo ""

‎scripts/install/depends/depends-install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fi
2727
/usr/local/bin/enginescript/scripts/functions/enginescript-apt-update.sh
2828

2929
# Define the packages to install
30-
packages="advancecomp apt-listchanges apt-show-versions apt-transport-https apt-utils aptitude autoconf autoconf-archive autogen automake autotools-dev axel bash bash-completion bc binutils bison brotli build-essential ccache ccze checkinstall checksec cmake colordiff cron curl debconf-utils debhelper dialog dmidecode dnsutils duf expat findutils freebsd-manpages geoipupdate gettext ghostscript gifsicle guile-3.0-libs gzip htop hurl iotop imagemagick inotify-tools jpegoptim ktls-utils libpam-cgfs libatomic-ops-dev libatomic1 libbsd-dev libbz2-1.0 libbz2-dev libbz2-ocaml libbz2-ocaml-dev libc6-dev libcunit1-dev libcurl4-openssl-dev libelf-dev libev-dev libevent-dev libexpat-dev libgc1 libgd-dev libgeoip-dev libgmp-dev libgoogle-perftools-dev libimage-exiftool-perl libjansson-dev libjemalloc-dev libjemalloc2 libjpeg-progs libluajit-5.1-2 libluajit-5.1-common libluajit-5.1-dev libkqueue-dev libmaxminddb-dev libmcrypt-dev libmcrypt4 libmhash-dev libmnl-dev libopts25-dev libpam0g-dev libpcre2-dev libpcre3 libpcre3-dev libperl-dev librabbitmq4 libreadline-dev libsodium-dev libssh2-1-dev libssl-dev libtidy-dev libtool libxml2 libxml2-dev libxslt1-dev lm-sensors logtail lsb-release lsof make mc mcrypt moreutils ncdu net-tools netcat-traditional nload nmon openssl optipng perl pigz pkg-config plocate pngcrush pngquant po-debconf procps python3-packaging re2c rlwrap rsync ruby-dev sed socat sockstat sysstat tar tree ubuntu-minimal ufw unzip update-manager-core uuid-dev vnstat webp wget whois yara zip zlib1g zlib1g-dev zstd"
30+
packages="advancecomp apt-listchanges apt-show-versions apt-transport-https apt-utils aptitude autoconf autoconf-archive autogen automake autotools-dev axel bash bash-completion bc binutils bison brotli build-essential ccache ccze checkinstall checksec cmake colordiff cron curl debconf-utils debhelper dialog dmidecode dnsutils duf expat findutils freebsd-manpages geoipupdate gettext ghostscript gifsicle gzip htop hurl iotop imagemagick inotify-tools jpegoptim ktls-utils libpam-cgfs libatomic-ops-dev libatomic1 libbsd-dev libbz2-dev libbz2-ocaml libbz2-ocaml-dev libc6-dev libcunit1-dev libcurl4-openssl-dev libelf-dev libev-dev libevent-dev libexpat-dev libgc1 libgd-dev libgeoip-dev libgmp-dev libgoogle-perftools-dev libimage-exiftool-perl libjansson-dev libjemalloc-dev libjemalloc2 libjpeg-progs libmaxminddb-dev libmcrypt-dev libmcrypt4 libmhash-dev libmnl-dev libopts25-dev libpam0g-dev libpcre2-dev libpcre3 libpcre3-dev libperl-dev librabbitmq4 libreadline-dev libsodium-dev libssh2-1-dev libssl-dev libtidy-dev libtool libxml2 libxml2-dev libxslt1-dev lm-sensors logtail lsb-release lsof make mc mcrypt moreutils ncdu net-tools netcat-traditional nload nmon openssl optipng perl pigz pkg-config plocate pngcrush pngquant po-debconf procps python3-packaging re2c rlwrap rsync ruby-dev sed socat sockstat sysstat tar tree ubuntu-minimal ufw unzip update-manager-core uuid-dev vnstat webp wget whois yara zip zlib1g zlib1g-dev zstd"
3131

3232
# Install the packages with error checking
3333
apt install -qy $packages || {

‎scripts/install/gcc/gcc-install.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ fi
2727

2828
# Remove previous GCC alternatives
2929
update-alternatives --remove-all gcc
30+
echo "Ignore the error above on fresh installs."
3031

3132
UBUNTU_VERSION="$(lsb_release -sr)"
3233
if [ "${UBUNTU_VERSION}" = 22.04 ];
@@ -43,7 +44,7 @@ UBUNTU_VERSION="$(lsb_release -sr)"
4344
if [ "${UBUNTU_VERSION}" = 24.04 ];
4445
then
4546
# Install GCC for Ubuntu 22.04
46-
apt install g++-13 gcc-13 g++-14 gcc-14
47+
apt install g++-13 gcc-13 g++-14 gcc-14 -y
4748

4849
# Create new GCC alternatives
4950
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100 --slave /usr/bin/g++ g++ /usr/bin/g++-14 --slave /usr/bin/gcov gcov /usr/bin/gcov-14

‎scripts/install/tools/media/pngout.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ fi
2323
#----------------------------------------------------------------------------
2424
# Start Main Script
2525

26+
# Return to /usr/src
27+
cd /usr/src
28+
2629
# Install pngout
2730

2831
# Retrieve Latest Version
@@ -38,3 +41,6 @@ if [ ${BIT_TYPE} == 'x86_64' ];
3841
# 32-bit
3942
cp /usr/src/pngout-${PNGOUT_VER}-linux/i686/pngout /bin
4043
fi
44+
45+
# Return to /usr/src
46+
cd /usr/src

‎scripts/install/tools/mysql/mysqltuner.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,3 @@ echo ""
4242
echo "============================================================="
4343
echo ""
4444
echo ""
45-
46-
sleep 5

‎scripts/install/tools/security/wordfence-cli.sh‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,41 +25,20 @@ fi
2525

2626
# Wordfence CLI Malware scanner
2727

28+
# Return to /usr/src
29+
cd /usr/src
30+
2831
# Install
29-
wget -O /usr/src https://github.com/wordfence/wordfence-cli/releases/latest/download/wordfence.deb --no-check-certificate
32+
wget -O /usr/src/wordfence.deb https://github.com/wordfence/wordfence-cli/releases/latest/download/wordfence.deb --no-check-certificate
3033
sudo apt install /usr/src/wordfence.deb -y
3134

32-
# Old install method prior to version 2.0+
33-
#mkdir -p /usr/local/src/Wordfence-CLI/
34-
#rm -rf /usr/local/src/Wordfence-CLI/wordfence
35-
#cd /usr/src
36-
#wget -O /usr/src/wordfence_${WORDFENCE_CLI_VER}_amd64_linux_exec.tar.gz https://github.com/wordfence/wordfence-cli/releases/download/v${WORDFENCE_CLI_VER}/wordfence-${WORDFENCE_CLI_VER}.tar.gz --no-check-certificate
37-
#tar -xvf wordfence_${WORDFENCE_CLI_VER}_amd64_linux_exec.tar.gz
38-
#mv /usr/src/wordfence-${WORDFENCE_CLI_VER} /usr/local/src/Wordfence-CLI/wordfence
39-
4035
# Make Results Directory
4136
mkdir -p /home/EngineScript/wordfence-scan-results
4237

4338
# Make Cache Directory
4439
mkdir -p ~/.cache/wordfence
4540
chmod 775 ~/.cache/wordfence
4641

47-
# Configuration
48-
# Old config method prior to version 2.0+
49-
# Create your token at https://www.wordfence.com/products/wordfence-cli/
50-
#mkdir -p ~/.config/wordfence
51-
#touch ~/.config/wordfence/wordfence-cli.ini
52-
#cat >>~/.config/wordfence/wordfence-cli.ini <<EOL
53-
#[SCAN]
54-
#license = ${WORDFENCE_CLI_TOKEN}
55-
#cache_directory = ~/.cache/wordfence
56-
#workers = 1
57-
#
58-
#
59-
#EOL
60-
#
61-
#cat ~/.config/wordfence/wordfence-cli.ini
62-
6342
echo ""
6443
echo ""
6544
echo "============================================================"
@@ -70,4 +49,5 @@ echo "============================================================="
7049
echo ""
7150
echo ""
7251

73-
sleep 5
52+
# Return to /usr/src
53+
cd /usr/src

‎scripts/install/tools/tools-install.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ fi
2727
# Media Tools
2828
#------------------------------------------------
2929

30+
# Return to /usr/src
31+
cd /usr/src
32+
3033
# pngout
3134
/usr/local/bin/enginescript/scripts/install/tools/media/pngout.sh
3235

@@ -145,3 +148,6 @@ if [ "${INSTALL_S3_BACKUP}" = 1 ];
145148
else
146149
echo "Skipping Amazon CLI install"
147150
fi
151+
152+
# Return to /usr/src
153+
cd /usr/src

‎scripts/install/tools/wordpress/wp-cli.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ wp package install 10up/wpcli-vulnerability-scanner:dev-develop --allow-root
4040
wp package install pantheon-systems/wp_launch_check --allow-root
4141
wp package install wearerequired/wp-cli-clear-opcache --allow-root
4242
wp package install wp-cli/cron-command --allow-root
43-
wp package install wp-cli/doctor-command:@stable --allow-root
43+
wp package install wp-cli/doctor-command --allow-root
4444

4545
echo ""
4646
echo ""

0 commit comments

Comments
 (0)