brammp/HomeServerCTs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

CT's Nextcloud, Freshrss.heimdall & mailbackup: Refractored PHP Installation

Browse Source 
Now using external `AlpinePHPTool`  script for installing/configuring php.
This wil make upgrading PHP on existing containers automaticaly plausible/easier.

Removed php packages from alpine.yaml and moved them to CT-Files `Config/php.pkglist`
Remove PHP configurations steps from CT's init.sh and integrated them in  ` AlpinePHPTool`
Removed PHP timezone configuration files and intergradeded them in `AlpinePHPTool`
Updated
This commit is contained in:
Bram Prieshof
2024-07-21 15:21:16 +02:00
parent fd00751efa
commit a41c5bef3c
21 changed files with 222 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CT-Files/elkarbackupALP/Scripts/Init.sh
View File

@@ -34,7 +34,7 @@ rm -rf /etc/nginx/conf.d
mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf
#Configure Php
rm -rf /etc/php7/php-fpm.d/*
echo ";Placeholder" > /etc/php7/php-fpm.d/www.conf
mv /opt/Setup/Configs/php.conf /etc/php7/php-fpm.d/elkarbackup.conf
mv /opt/Setup/Configs/phpTimezone.ini /etc/php7/conf.d/04_date_timezone.ini

2
CT-Files/freshrss/Configs/nginx.conf
View File

@@ -38,7 +38,7 @@ http {
}
location ~ \.php$ {
include fastcgi_params;
fastcgi_pass unix:/run/php-fpm83/php-fpm.sock;
fastcgi_pass unix:/run/php-fpmPHPver/php-fpm.sock;
fastcgi_split_path_info ^(.+\.php)(/.*)$;
set $path_info $fastcgi_path_info;
fastcgi_param PATH_INFO $path_info;

4
CT-Files/freshrss/Configs/php.conf
View File

@@ -1,7 +1,7 @@
[freshrss]
user = nginx
group = nginx
listen = /run/php-fpm83/php-fpm.sock
listen = /run/php-fpmPHPver/php-fpm.sock
listen.owner = nginx
listen.group = nginx
php_admin_value[disable_functions] = exec,passthru,system
@@ -27,7 +27,7 @@ php_admin_value[max_input_time] = 15
php_admin_value[cgi.fix_pathinfo] = 0
php_admin_value[allow_url_fopen] = 1
php_admin_value[file_uploads] = On
php_admin_value[open_basedir] = /opt/freshrss:/opt/freshrss-Extensions:/run/php-fpm83/php-fpm.sock:/tmp
php_admin_value[open_basedir] = /opt/freshrss:/opt/freshrss-Extensions:/run/php-fpmPHPver/php-fpm.sock:/tmp
php_admin_value[session.use_strict_mode] = 1
php_admin_value[session.cookie_httponly] = 1

1
CT-Files/freshrss/Configs/php.pkglist Normal file
View File

@@ -0,0 +1 @@
php83 php83-fpm php83-curl php83-gmp php83-intl php83-mbstring php83-xml php83-zip php83-ctype php83-dom php83-fileinfo php83-iconv php83-json php83-opcache php83-openssl php83-phar php83-session php83-simplexml php83-xmlreader php83-xmlwriter php83-xml php83-tokenizer php83-zlib php83-pdo_mysql

2
CT-Files/freshrss/Configs/phpTimezone.ini
View File

@@ -1,2 +0,0 @@
[Date]
date.timezone = Europe/Amsterdam

10
CT-Files/freshrss/Scripts/Init.sh
View File

@@ -4,10 +4,9 @@
rm -rf /etc/nginx/conf.d
mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf
#Configure Php-Fpm
rm -rf /etc/php83/php-fpm.d/*
mv /opt/Setup/Configs/php.conf /etc/php83/php-fpm.d/freshrss.conf
mv /opt/Setup/Configs/phpTimezone.ini /etc/php83/conf.d/04_date_timezone.ini
#SetupPHP
ash /opt/Setup/Scripts/PHPTool.sh -d freshrss || exit 1
rm /opt/Setup/Scripts/PHPTool.sh
#Configure Cron
mv /opt/Setup/Configs/crontab /etc/crontabs/nginx
@@ -31,5 +30,4 @@ ln -s /opt/freshrss-Extensions/cntools/xExtension-YouTubeChannel2RssFeed /opt/fr
chown -R nginx:nginx /opt/freshrss-Extensions
#Enable services on boot
rc-update add nginx
rc-update add php-fpm83
rc-update add nginx

2
CT-Files/heimdall/Configs/nginx.conf
View File

@@ -37,7 +37,7 @@ http {
}
location ~ \.php$ {
include fastcgi_params;
fastcgi_pass unix:/run/php-fpm83/php-fpm.sock;
fastcgi_pass unix:/run/php-fpmPHPver/php-fpm.sock;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

4
CT-Files/heimdall/Configs/php.conf
View File

@@ -1,7 +1,7 @@
[heimdall]
user = nginx
group = nginx
listen = /run/php-fpm83/php-fpm.sock
listen = /run/php-fpmPHPver/php-fpm.sock
listen.owner = nginx
listen.group = nginx
php_admin_value[disable_functions] = exec,passthru,system
@@ -27,7 +27,7 @@ php_admin_value[max_input_time] = 15
php_admin_value[cgi.fix_pathinfo] = 0
php_admin_value[allow_url_fopen] = 1
php_admin_value[file_uploads] = On
php_admin_value[open_basedir] = /opt/heimdall:/run/php-fpm83/php-fpm.sock:/tmp
php_admin_value[open_basedir] = /opt/heimdall:/run/php-fpmPHPver/php-fpm.sock:/tmp
php_admin_value[session.use_strict_mode] = 1
php_admin_value[session.cookie_httponly] = 1

1
CT-Files/heimdall/Configs/php.pkglist Normal file
View File

@@ -0,0 +1 @@
php83 php83-ctype php83-curl php83-pdo_sqlite php83-mbstring php83-json php83-zip php83-xml php83-fpm php83-session php83-openssl php83-tokenizer php83-fileinfo

2
CT-Files/heimdall/Configs/phpTimezone.ini
View File

@@ -1,2 +0,0 @@
[Date]
date.timezone = Europe/Amsterdam

10
CT-Files/heimdall/Scripts/Init.sh
View File

@@ -4,15 +4,13 @@
rm -rf /etc/nginx/conf.d
mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf
#Configure Php-Fpm
rm -rf /etc/php83/php-fpm.d/*
mv /opt/Setup/Configs/php.conf /etc/php83/php-fpm.d/heimdall.conf
mv /opt/Setup/Configs/phpTimezone.ini /etc/php83/conf.d/04_date_timezone.ini
#SetupPHP
ash /opt/Setup/Scripts/PHPTool.sh -d heimdall || exit 1
rm /opt/Setup/Scripts/PHPTool.sh
#Install Heimdall
git clone -b 2.x https://github.com/linuxserver/Heimdall.git /opt/heimdall
chown -R nginx:nginx /opt/heimdall
#Enable services on boot
rc-update add nginx
rc-update add php-fpm83
rc-update add nginx

7
CT-Files/mailbackup/Scripts/Init.sh
View File

@@ -2,9 +2,16 @@
#Get Resources
git clone https://git.bprieshof.nl/Tools/MailBackup-sys.git /opt/Setup/MailBackup-sys
mkdir -p /opt/Setup/Configs
mv /opt/Setup/MailBackup-sys/Configs/php.* /opt/Setup/Configs
#Install and configure using git.bprieshof.nl MailBackup-sys
DistoBuilderINT=true ash /opt/Setup/MailBackup-sys/install.sh
#Setup PHP
ash /opt/Setup/Scripts/PHPTool.sh -d mailbackup || exit 1
rm /opt/Setup/Scripts/PHPTool.sh
#cleanup
rm -rf /opt/Setup/MailBackup-sys
rm -f /opt/Setup/rlcl.zip

1
CT-Files/mysql/Scripts/Init.sh
View File

@@ -14,6 +14,7 @@ mv /opt/Setup/Configs/my.cnf /etc/mysql/my.cnf
mkdir /opt/PhpMyAdmin
tar -C /opt/PhpMyAdmin -xzf /opt/Setup/phpmyadmin.tar.gz --strip 1
rm -rf /opt/Setup/phpmyadmin.tar.gz
mv /opt/Setup/Configs/php.ini /opt/PhpMyAdmin/php.ini
mv /opt/Setup/Configs/config.inc.php /opt/PhpMyAdmin/config.inc.php
mv /opt/Setup/Configs/phpmyadmin.service /etc/systemd/system/phpmyadmin.service
mv /opt/Setup/Scripts/UpdatePhpMyadmin.sh /opt/UpdatePhpMyadmin.sh

2
CT-Files/nextcloud/Configs/nginx.conf
View File

@@ -110,7 +110,7 @@ http {
fastcgi_param HTTPS on;
fastcgi_param modHeadersAvailable true;
fastcgi_param front_controller_active true;
fastcgi_pass unix:/run/php-fpm83/php-fpm.sock;
fastcgi_pass unix:/run/php-fpmPHPver/php-fpm.sock;
fastcgi_intercept_errors on;
fastcgi_request_buffering off;
fastcgi_max_temp_file_size 0;

4
CT-Files/nextcloud/Configs/php.conf
View File

@@ -1,7 +1,7 @@
[nextcloud]
user = nginx
group = nginx
listen = /run/php-fpm83/php-fpm.sock
listen = /run/php-fpmPHPver/php-fpm.sock
listen.owner = nginx
listen.group = nginx
php_admin_value[disable_functions] = exec,passthru,system
@@ -27,7 +27,7 @@ php_admin_value[memory_limit] = 512M
php_admin_value[cgi.fix_pathinfo] = 0
php_admin_value[allow_url_fopen] = Off
php_admin_value[file_uploads] = on
php_admin_value[open_basedir] = /opt/nextcloud/:/var/nextcloud:/run/php-fpm83/php-fpm.sock:/run/valkey/valkey.sock:/proc/meminfo:/proc/cpuinfo:/dev/urandom:/tmp
php_admin_value[open_basedir] = /opt/nextcloud/:/var/nextcloud:/run/php-fpmPHPver/php-fpm.sock:/run/valkey/valkey.sock:/proc/meminfo:/proc/cpuinfo:/dev/urandom:/tmp
php_admin_value[session.use_strict_mode] = 1
php_admin_value[session.cookie_httponly] = 1
;HTTPSONLY php_admin_value[session.cookie_samesite] = Strict

1
CT-Files/nextcloud/Configs/php.pkglist Normal file
View File

@@ -0,0 +1 @@
php83-pdo_mysql php83-pecl-imagick php83-cli php83-pecl-apcu php83-pecl-redis php83-fpm php83-cgi php83-common php83-mbstring php83-curl php83-gd php83-intl php83-soap php83-xml php83-zip php83-pear php83-session php83-posix php83-pdo php83-dom php83-simplexml php83-xmlreader php83-xmlwriter php83-opcache php83-pcntl php83-fileinfo php83-bcmath php83-gmp php83-sysvsem php83-exif php83-bz2 php83-sodium php83-ctype

2
CT-Files/nextcloud/Configs/phpTimezone.ini
View File

@@ -1,2 +0,0 @@
[Date]
date.timezone = Europe/Amsterdam

11
CT-Files/nextcloud/Scripts/Init.sh
View File

@@ -6,13 +6,10 @@ curl -L --retry 7 --retry-delay 5 https://download.nextcloud.com/server/releases
rm -rf /etc/nginx/conf.d
mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf
#Configure Php-Cli
sed -i '/memory_limit =/c\memory_limit = 512M' /etc/php83/php.ini
#Setup PHP
ash /opt/Setup/Scripts/PHPTool.sh -d nextcloud || exit 1
rm /opt/Setup/Scripts/PHPTool.sh
#Configure Php-Fpm
rm -rf /etc/php83/php-fpm.d/*
mv /opt/Setup/Configs/php.conf /etc/php83/php-fpm.d/nextcloud.conf
mv /opt/Setup/Configs/phpTimezone.ini /etc/php83/conf.d/04_date_timezone.ini
#Install Nextcloud
mkdir /opt/nextcloud /var/nextcloud
@@ -21,8 +18,6 @@ rm -rf /opt/Setup/nextcloud.tar.bz2
chown -R nginx:nginx /opt/nextcloud
chown -R nginx:nginx /var/nextcloud
echo "*/5 * * * * php83 -f /opt/nextcloud/cron.php > /dev/null 2>&1" >> /etc/crontabs/nginx
echo "apc.enable_cli=1" >> /etc/php83/php.ini
#Enable services on boot
rc-update add nginx
rc-update add php-fpm83
rc-update add valkey