Skip to content

Commit 38df083

Browse files
PDowneyPDowney
committed
Fixed lots of stuff
1 parent 801af36 commit 38df083

20 files changed

Lines changed: 54 additions & 43 deletions

‎scripts/install/cron/cron-install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fi
2626
# Start Main Script
2727

2828
# Copy Sites.sh
29-
cp -p /usr/local/bin/enginescript/scripts/cron/sites.sh /home/EngineScript/sites-list/sites.sh
29+
cp -rf /usr/local/bin/enginescript/scripts/cron/sites.sh /home/EngineScript/sites-list/sites.sh
3030

3131
# Set Cron Jobs
3232

‎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
# Install Dependencies
2828
apt update && apt upgrade -y
2929

30-
apt install -qy advancecomp apt-listchanges apt-show-versions apt-transport-https apt-utils autoconf autoconf-archive autogen automake autotools-dev axel bash-completion bc binutils bison brotli build-essential ccache ccze checkinstall cmake colordiff curl debhelper dh-systemd dialog dmidecode expat findutils g++-10 g++-9 g++-9-multilib gcc-10 gcc-9 geoipupdate gettext ghostscript gifsicle glances guile-2.0-libs htop imagemagick jpegoptim 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 libgc1c2 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 libmaxminddb-dev libmcrypt-dev libmcrypt4 libmhash-dev libmnl-dev libopts25-dev libpam0g-dev libpcre2-dev libpcre3 libpcre3-dev libperl-dev librabbitmq4 libreadline-dev libssh2-1-dev libssl-dev libtidy-dev libtool libxml2 libxml2-dev libxslt1-dev lm-sensors logtail lsb-release make mc mcrypt mlocate moreutils net-tools netcat nload nmon openssl optipng perl pigz pkg-config pngcrush pngquant po-debconf python3-apt python3-jinja2 python3-markupsafe python3-pip python3-psutil python3-pyasn1 python3-requests python3-setuptools re2c rlwrap rsync ruby-dev socat tar tree ubuntu-minimal ufw unzip uuid-dev webmin webp wget whois yara zip zlib1g zlib1g-dev zlibc zstd
30+
apt install -qy advancecomp apt-listchanges apt-show-versions apt-transport-https apt-utils autoconf autoconf-archive autogen automake autotools-dev axel bash bash-completion bc binutils bison brotli build-essential ccache ccze checkinstall cmake colordiff curl debhelper dh-systemd dialog dmidecode expat findutils g++-10 g++-9 g++-9-multilib gcc-10 gcc-9 geoipupdate gettext ghostscript gifsicle glances guile-2.0-libs gzip htop imagemagick jpegoptim 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 libgc1c2 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 libmaxminddb-dev libmcrypt-dev libmcrypt4 libmhash-dev libmnl-dev libopts25-dev libpam0g-dev libpcre2-dev libpcre3 libpcre3-dev libperl-dev librabbitmq4 libreadline-dev libssh2-1-dev libssl-dev libtidy-dev libtool libxml2 libxml2-dev libxslt1-dev lm-sensors logtail lsb-release lsof make mc mcrypt mlocate moreutils net-tools netcat nload nmon openssl optipng perl pigz pkg-config pngcrush pngquant po-debconf python3-apt python3-jinja2 python3-markupsafe python3-pip python3-psutil python3-pyasn1 python3-requests python3-setuptools re2c rlwrap rsync ruby-dev sed socat tar tree ubuntu-minimal ufw unzip uuid-dev webp wget whois yara zip zlib1g zlib1g-dev zlibc zstd
3131

3232
# Nano
3333
update-alternatives --set editor /bin/nano

‎scripts/install/kernel/kernel-tweaks-install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fi
2525
# Start Main Script
2626

2727
# Kernel Tweaks
28-
cp -p /usr/local/bin/enginescript/etc/sysctl.d/60-enginescript.conf /etc/sysctl.d/60-enginescript.conf
28+
cp -rf /usr/local/bin/enginescript/etc/sysctl.d/60-enginescript.conf /etc/sysctl.d/60-enginescript.conf
2929
chown -R root:root /etc/sysctl.d/60-enginescript.conf
3030
chmod 0664 /etc/sysctl.d/60-enginescript.conf
3131

‎scripts/install/kernel/ksm.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ fi
2121
apt-get install ksmtuned --no-install-recommends
2222
sudo systemctl enable --now ksm.service
2323
mkdir -p /opt/kernel-samepage-merging/
24-
cp -p /usr/local/bin/enginescript/etc/systemd/system/ksm.service /etc/systemd/system/ksm.service
25-
cp -p /usr/local/bin/enginescript/opt/kernel-samepage-merging/ksm-service.sh /opt/kernel-samepage-merging/ksm-service.sh
24+
cp -rf /usr/local/bin/enginescript/etc/systemd/system/ksm.service /etc/systemd/system/ksm.service
25+
cp -rf /usr/local/bin/enginescript/opt/kernel-samepage-merging/ksm-service.sh /opt/kernel-samepage-merging/ksm-service.sh
2626
echo 'w /sys/kernel/mm/ksm/run - - - - 1' >> /etc/tmpfiles.d/ksm.conf
2727

2828
# Persmissions

‎scripts/install/mariadb/mariadb-install.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ y
4949
EOF
5050

5151
# Copy my.cnf file.
52-
# innodb_buffer_pool_size is set to use 60% of total server memory.
52+
# innodb_buffer_pool_size is set to use 55% of total server memory.
5353
# If you wish to dedicate more, change it in /etc/mysql/my.cnf
5454
systemctl stop mariadb.service
5555
mv /var/lib/mysql/ib_log* /root
56-
cp -p /usr/local/bin/enginescript/etc/mysql/mariadb.cnf /etc/mysql/mariadb.cnf
56+
cp -rf /usr/local/bin/enginescript/etc/mysql/mariadb.cnf /etc/mysql/mariadb.cnf
5757
sed -i "s|SEDMYSQL55PERCENT|${SERVER_MEMORY_TOTAL_55}|g" /etc/mysql/mariadb.cnf
5858
systemctl start mariadb.service
5959

‎scripts/install/nginx/nginx-misc.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ chown -R www-data:www-data /var/www
3737
chmod 775 /var/cache/nginx
3838

3939
# Logrotate - Nginx and Domains
40-
cp -p /usr/local/bin/enginescript/etc/logrotate.d/nginx /etc/logrotate.d/nginx
41-
cp -p /usr/local/bin/enginescript/etc/logrotate.d/domains /etc/logrotate.d/domains
40+
cp -rf /usr/local/bin/enginescript/etc/logrotate.d/nginx /etc/logrotate.d/nginx
41+
cp -rf /usr/local/bin/enginescript/etc/logrotate.d/domains /etc/logrotate.d/domains
4242
find /etc/logrotate.d -type f -exec chmod 644 {} \;

‎scripts/install/nginx/nginx-service.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fi
2626

2727
# Nginx Service
2828
rm -rf /usr/lib/systemd/system/nginx.service
29-
cp -p /usr/local/bin/enginescript/etc/systemd/system/nginx.service /etc/systemd/system/nginx.service
29+
cp -rf /usr/local/bin/enginescript/etc/systemd/system/nginx.service /etc/systemd/system/nginx.service
3030
chmod 644 /etc/systemd/system/nginx.service
3131
systemctl daemon-reload
3232
systemctl enable nginx

‎scripts/install/php/php-backup.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ fi
2525
# Start Main Script
2626

2727
# Backup existing PHP config
28-
cp -r /etc/php/${PHP_VER}/fpm/php.ini /home/EngineScript/config-backups/php/php.ini
29-
cp -r /etc/php/${PHP_VER}/fpm/php-fpm.conf /home/EngineScript/config-backups/php/php-fpm.conf
30-
cp -r /etc/php/${PHP_VER}/fpm/pool.d/www.conf /home/EngineScript/config-backups/php/www.conf
28+
cp -rf/etc/php/${PHP_VER}/fpm/php.ini /home/EngineScript/config-backups/php/php.ini
29+
cp -rf/etc/php/${PHP_VER}/fpm/php-fpm.conf /home/EngineScript/config-backups/php/php-fpm.conf
30+
cp -rf/etc/php/${PHP_VER}/fpm/pool.d/www.conf /home/EngineScript/config-backups/php/www.conf
3131

3232
echo ""
3333
echo "Backing up existing php config. Backup can be found in /home/EngineScript/config-backups/php"

‎scripts/install/php/php-install.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ apt update && apt full-upgrade -y
2929
apt install php${PHP_VER} php${PHP_VER}-bcmath php${PHP_VER}-bz2 php${PHP_VER}-common php${PHP_VER}-curl php${PHP_VER}-fpm php${PHP_VER}-gd php${PHP_VER}-igbinary php${PHP_VER}-imagick php${PHP_VER}-intl php${PHP_VER}-mbstring php${PHP_VER}-msgpack php${PHP_VER}-mysql php${PHP_VER}-opcache php${PHP_VER}-readline php${PHP_VER}-redis php${PHP_VER}-soap php${PHP_VER}-ssh2 php${PHP_VER}-xml php${PHP_VER}-zip -y
3030

3131
# Logrotate
32-
cp -p /usr/local/bin/enginescript/etc/logrotate.d/opcache /etc/logrotate.d/opcache
33-
cp -p /usr/local/bin/enginescript/etc/logrotate.d/php8.0-fpm /etc/logrotate.d/php8.0-fpm
32+
cp -rf /usr/local/bin/enginescript/etc/logrotate.d/opcache /etc/logrotate.d/opcache
33+
cp -rf /usr/local/bin/enginescript/etc/logrotate.d/php${PHP_VER}-fpm /etc/logrotate.d/php${PHP_VER}-fpm
3434

3535
# Backup PHP config
3636
/usr/local/bin/enginescript/scripts/cron/php-backup.sh
@@ -49,10 +49,12 @@ touch /var/log/php/php.log
4949
chmod 775 /var/cache/opcache
5050
find /var/log/php -type d,f -exec chmod 755 {} \;
5151
find /var/log/opcache -type d,f -exec chmod 755 {} \;
52+
find /etc/php/${PHP_VER}/fpm -type d,f -exec chmod 755 {} \;
5253

5354
chown -R www-data:www-data /var/cache/opcache
5455
chown -R www-data:www-data /var/log/opcache
5556
chown -R www-data:www-data /var/log/php
57+
chown -R www-data:www-data /etc/php/${PHP_VER}/fpm
5658

5759
# Restart PHP
5860
service php${PHP_VER}-fpm restart

‎scripts/install/redis/redis-install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ chmod 775 /run/redis
3737
chown -R redis:redis /run/redis
3838
chown -R redis:redis /var/log/redis
3939

40-
cp -p /usr/local/bin/enginescript/etc/redis/redis.conf /etc/redis/redis.conf
40+
cp -rf /usr/local/bin/enginescript/etc/redis/redis.conf /etc/redis/redis.conf
4141
sed -i "s|SEDREDISMAXMEM|${SERVER_MEMORY_TOTAL_07}|g" /etc/redis/redis.conf
4242
chown -R redis:redis /etc/redis/redis.conf
4343
service redis-server restart

0 commit comments

Comments
 (0)