diff --git a/CT-Build/Alpine.yaml b/CT-Build/Alpine.yaml index edcdefd..18a81cf 100644 --- a/CT-Build/Alpine.yaml +++ b/CT-Build/Alpine.yaml @@ -464,38 +464,38 @@ packages: #PKGS for nextcloud - packages: - - php82-pdo_mysql - - php82-pecl-imagick - - php82-cli - - php82-pecl-apcu - - php82-pecl-redis - - php82-fpm - - php82-cgi - - php82-common - - php82-mbstring - - php82-curl - - php82-gd - - php82-intl - - php82-soap - - php82-xml - - php82-zip - - php82-pear - - php82-session - - php82-posix - - php82-pdo - - php82-dom - - php82-simplexml - - php82-xmlreader - - php82-xmlwriter - - php82-opcache - - php82-pcntl - - php82-fileinfo - - php82-bcmath - - php82-gmp - - php82-sysvsem - - php82-exif - - php82-bz2 - - php82-sodium + - 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 - libpng - zlib - imagemagick @@ -541,12 +541,12 @@ packages: #PKGS for MailBackup - packages: - dovecot - - php82-xml - - php82-fpm - - php82-curl - - php82-dom - - php82-zip - - php82-mbstring + - php83-xml + - php83-fpm + - php83-curl + - php83-dom + - php83-zip + - php83-mbstring - php-openssl - py3-pip - sudo @@ -584,19 +584,19 @@ packages: #PKGS for Heimdall - packages: - git - - php82 - - php82-ctype - - php82-curl - - php82-pdo_sqlite - - php82-mbstring - - php82-json - - php82-zip - - php82-xml - - php82-fpm - - php82-session - - php82-openssl - - php82-tokenizer - - php82-fileinfo + - 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 action: install variants: - heimdall @@ -611,31 +611,31 @@ packages: #PKGS for FreshRSS - packages: - git - - php82 - - php82-fpm - - php82-curl - - php82-gmp - - php82-intl - - php82-mbstring - - php82-xml - - php82-zip - - php82-ctype - - php82-dom - - php82-fileinfo - - php82-iconv - - php82-json - - php82-opcache - - php82-openssl - - php82-phar - - php82-session - - php82-simplexml - - php82-xmlreader - - php82-xmlwriter - - php82-xml - - php82-tokenizer - - php82-zlib - - php82-pdo_mysql - #- php82-pdo_sqlite + - 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 + #- php83-pdo_sqlite action: install variants: - freshrss diff --git a/CT-Files/freshrss/Configs/crontab b/CT-Files/freshrss/Configs/crontab index 3576610..82536bf 100644 --- a/CT-Files/freshrss/Configs/crontab +++ b/CT-Files/freshrss/Configs/crontab @@ -1 +1 @@ -27,57 * * * * php82 /opt/freshrss/app/actualize_script.php 2>> /proc/1/fd/2 > /tmp/FreshRSS.log \ No newline at end of file +27,57 * * * * php83 /opt/freshrss/app/actualize_script.php 2>> /proc/1/fd/2 > /tmp/FreshRSS.log \ No newline at end of file diff --git a/CT-Files/freshrss/Configs/nginx.conf b/CT-Files/freshrss/Configs/nginx.conf index 01a0098..01e4060 100644 --- a/CT-Files/freshrss/Configs/nginx.conf +++ b/CT-Files/freshrss/Configs/nginx.conf @@ -38,7 +38,7 @@ http { } location ~ \.php$ { include fastcgi_params; - fastcgi_pass unix:/run/php-fpm82/php-fpm.sock; + fastcgi_pass unix:/run/php-fpm83/php-fpm.sock; fastcgi_split_path_info ^(.+\.php)(/.*)$; set $path_info $fastcgi_path_info; fastcgi_param PATH_INFO $path_info; diff --git a/CT-Files/freshrss/Configs/php.conf b/CT-Files/freshrss/Configs/php.conf index a785505..df7a4ca 100644 --- a/CT-Files/freshrss/Configs/php.conf +++ b/CT-Files/freshrss/Configs/php.conf @@ -1,7 +1,7 @@ [freshrss] user = nginx group = nginx -listen = /run/php-fpm82/php-fpm.sock +listen = /run/php-fpm83/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:/run/php-fpm82/php-fpm.sock:/tmp +php_admin_value[open_basedir] = /opt/freshrss:/run/php-fpm83/php-fpm.sock:/tmp php_admin_value[session.use_strict_mode] = 1 php_admin_value[session.cookie_httponly] = 1 diff --git a/CT-Files/freshrss/Scripts/Init.sh b/CT-Files/freshrss/Scripts/Init.sh index 10aa6b9..157c34f 100644 --- a/CT-Files/freshrss/Scripts/Init.sh +++ b/CT-Files/freshrss/Scripts/Init.sh @@ -5,9 +5,9 @@ rm -rf /etc/nginx/conf.d mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf #Configure Php-Fpm -rm -rf /etc/php82/php-fpm.d/* -mv /opt/Setup/Configs/php.conf /etc/php82/php-fpm.d/freshrss.conf -mv /opt/Setup/Configs/phpTimezone.ini /etc/php82/conf.d/04_date_timezone.ini +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 #Configure Cron mv /opt/Setup/Configs/crontab /etc/crontabs/nginx @@ -21,4 +21,4 @@ rm /tmp/freshrss.tar.gz #Enable services on boot rc-update add nginx -rc-update add php-fpm82 \ No newline at end of file +rc-update add php-fpm83 \ No newline at end of file diff --git a/CT-Files/heimdall/Configs/nginx.conf b/CT-Files/heimdall/Configs/nginx.conf index ba28641..5c34aa3 100644 --- a/CT-Files/heimdall/Configs/nginx.conf +++ b/CT-Files/heimdall/Configs/nginx.conf @@ -37,7 +37,7 @@ http { } location ~ \.php$ { include fastcgi_params; - fastcgi_pass unix:/run/php-fpm82/php-fpm.sock; + fastcgi_pass unix:/run/php-fpm83/php-fpm.sock; fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; diff --git a/CT-Files/heimdall/Configs/php.conf b/CT-Files/heimdall/Configs/php.conf index f88d744..9c74dae 100644 --- a/CT-Files/heimdall/Configs/php.conf +++ b/CT-Files/heimdall/Configs/php.conf @@ -1,7 +1,7 @@ [heimdall] user = nginx group = nginx -listen = /run/php-fpm82/php-fpm.sock +listen = /run/php-fpm83/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-fpm82/php-fpm.sock:/tmp +php_admin_value[open_basedir] = /opt/heimdall:/run/php-fpm83/php-fpm.sock:/tmp php_admin_value[session.use_strict_mode] = 1 php_admin_value[session.cookie_httponly] = 1 diff --git a/CT-Files/heimdall/Scripts/Init.sh b/CT-Files/heimdall/Scripts/Init.sh index 434527b..fea5bd4 100644 --- a/CT-Files/heimdall/Scripts/Init.sh +++ b/CT-Files/heimdall/Scripts/Init.sh @@ -5,9 +5,9 @@ rm -rf /etc/nginx/conf.d mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf #Configure Php-Fpm -rm -rf /etc/php82/php-fpm.d/* -mv /opt/Setup/Configs/php.conf /etc/php82/php-fpm.d/heimdall.conf -mv /opt/Setup/Configs/phpTimezone.ini /etc/php82/conf.d/04_date_timezone.ini +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 #Install Heimdall git clone -b 2.x https://github.com/linuxserver/Heimdall.git /opt/heimdall @@ -15,4 +15,4 @@ chown -R nginx:nginx /opt/heimdall #Enable services on boot rc-update add nginx -rc-update add php-fpm82 \ No newline at end of file +rc-update add php-fpm83 \ No newline at end of file diff --git a/CT-Files/nextcloud/Configs/nginx.conf b/CT-Files/nextcloud/Configs/nginx.conf index d1882ad..19a8281 100644 --- a/CT-Files/nextcloud/Configs/nginx.conf +++ b/CT-Files/nextcloud/Configs/nginx.conf @@ -110,7 +110,7 @@ http { fastcgi_param HTTPS on; fastcgi_param modHeadersAvailable true; fastcgi_param front_controller_active true; - fastcgi_pass unix:/run/php-fpm82/php-fpm.sock; + fastcgi_pass unix:/run/php-fpm83/php-fpm.sock; fastcgi_intercept_errors on; fastcgi_request_buffering off; fastcgi_max_temp_file_size 0; diff --git a/CT-Files/nextcloud/Configs/php.conf b/CT-Files/nextcloud/Configs/php.conf index 18942f5..8f57806 100644 --- a/CT-Files/nextcloud/Configs/php.conf +++ b/CT-Files/nextcloud/Configs/php.conf @@ -1,7 +1,7 @@ [nextcloud] user = nginx group = nginx -listen = /run/php-fpm82/php-fpm.sock +listen = /run/php-fpm83/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-fpm82/php-fpm.sock:/run/redis/redis.sock:/proc/meminfo:/proc/cpuinfo:/dev/urandom:/tmp +php_admin_value[open_basedir] = /opt/nextcloud/:/var/nextcloud:/run/php-fpm83/php-fpm.sock:/run/redis/redis.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 diff --git a/CT-Files/nextcloud/Scripts/FirstRun.sh b/CT-Files/nextcloud/Scripts/FirstRun.sh index b4105d0..1e069da 100644 --- a/CT-Files/nextcloud/Scripts/FirstRun.sh +++ b/CT-Files/nextcloud/Scripts/FirstRun.sh @@ -18,24 +18,24 @@ if [ $ThisScriptConfigured = no ]; then echo "Script is not configured" exit fi -sudo -u nginx php82 /opt/nextcloud/occ maintenance:install --database mysql --database-name "$MysqlDatabase" --database-host "$MysqlIP" --database-port "$MysqlPort" --database-user "$MysqlUsername" --database-pass "$MysqlPassword" --database-table-space "" --admin-user "$NextcloudUsername" --admin-pass "$NexcloudPassword" --data-dir /var/nextcloud +sudo -u nginx php83 /opt/nextcloud/occ maintenance:install --database mysql --database-name "$MysqlDatabase" --database-host "$MysqlIP" --database-port "$MysqlPort" --database-user "$MysqlUsername" --database-pass "$MysqlPassword" --database-table-space "" --admin-user "$NextcloudUsername" --admin-pass "$NexcloudPassword" --data-dir /var/nextcloud sed -n -i '/#SetupBlockStart/{:a;N;/#SetupBlockEnd/!ba;N;s/.*//};p' /etc/nginx/nginx.conf service nginx reload -sudo -u nginx php82 /opt/nextcloud/occ db:convert-filecache-bigint -sudo -u nginx php82 /opt/nextcloud/occ db:add-missing-indices -#sudo -u nginx php82 /opt/nextcloud/occ app:disable firstrunwizard -sudo -u nginx php82 /opt/nextcloud/occ config:system:set default_language --value=nl -sudo -u nginx php82 /opt/nextcloud/occ config:system:set default_locale --value=nl -sudo -u nginx php82 /opt/nextcloud/occ config:system:set default_phone_region --value=nl -sudo -u nginx php82 /opt/nextcloud/occ config:system:set skeletondirectory --value= -sudo -u nginx php82 /opt/nextcloud/occ config:system:set memcache.local --value='\OC\Memcache\APCu' -sudo -u nginx php82 /opt/nextcloud/occ config:system:set trashbin_retention_obligation --value=30,30 -sudo -u nginx php82 /opt/nextcloud/occ config:system:set memcache.distributed --value='\OC\Memcache\Redis' -sudo -u nginx php82 /opt/nextcloud/occ config:system:set memcache.locking --value='\OC\Memcache\Redis' -sudo -u nginx php82 /opt/nextcloud/occ config:system:set redis host --value=localhost -sudo -u nginx php82 /opt/nextcloud/occ config:system:set redis port --value=6379 -sudo -u nginx php82 /opt/nextcloud/occ config:system:set trusted_domains 1 --value="$(ifconfig | grep -A 1 'eth0' | tail -1 | cut -d ':' -f 2 | cut -d ' ' -f 1)" -sudo -u nginx php82 /opt/nextcloud/occ config:system:set overwrite.cli.url --value="$NextcloudWebProto://$(ifconfig | grep -A 1 'eth0' | tail -1 | cut -d ':' -f 2 | cut -d ' ' -f 1)" -sudo -u nginx php82 /opt/nextcloud/occ config:system:set overwriteprotocol --value="$NextcloudWebProto" \ No newline at end of file +sudo -u nginx php83 /opt/nextcloud/occ db:convert-filecache-bigint +sudo -u nginx php83 /opt/nextcloud/occ db:add-missing-indices +#sudo -u nginx php83 /opt/nextcloud/occ app:disable firstrunwizard +sudo -u nginx php83 /opt/nextcloud/occ config:system:set default_language --value=nl +sudo -u nginx php83 /opt/nextcloud/occ config:system:set default_locale --value=nl +sudo -u nginx php83 /opt/nextcloud/occ config:system:set default_phone_region --value=nl +sudo -u nginx php83 /opt/nextcloud/occ config:system:set skeletondirectory --value= +sudo -u nginx php83 /opt/nextcloud/occ config:system:set memcache.local --value='\OC\Memcache\APCu' +sudo -u nginx php83 /opt/nextcloud/occ config:system:set trashbin_retention_obligation --value=30,30 +sudo -u nginx php83 /opt/nextcloud/occ config:system:set memcache.distributed --value='\OC\Memcache\Redis' +sudo -u nginx php83 /opt/nextcloud/occ config:system:set memcache.locking --value='\OC\Memcache\Redis' +sudo -u nginx php83 /opt/nextcloud/occ config:system:set redis host --value=localhost +sudo -u nginx php83 /opt/nextcloud/occ config:system:set redis port --value=6379 +sudo -u nginx php83 /opt/nextcloud/occ config:system:set trusted_domains 1 --value="$(ifconfig | grep -A 1 'eth0' | tail -1 | cut -d ':' -f 2 | cut -d ' ' -f 1)" +sudo -u nginx php83 /opt/nextcloud/occ config:system:set overwrite.cli.url --value="$NextcloudWebProto://$(ifconfig | grep -A 1 'eth0' | tail -1 | cut -d ':' -f 2 | cut -d ' ' -f 1)" +sudo -u nginx php83 /opt/nextcloud/occ config:system:set overwriteprotocol --value="$NextcloudWebProto" \ No newline at end of file diff --git a/CT-Files/nextcloud/Scripts/Init.sh b/CT-Files/nextcloud/Scripts/Init.sh index 375173d..8c2b812 100644 --- a/CT-Files/nextcloud/Scripts/Init.sh +++ b/CT-Files/nextcloud/Scripts/Init.sh @@ -7,12 +7,12 @@ 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/php82/php.ini +sed -i '/memory_limit =/c\memory_limit = 512M' /etc/php83/php.ini #Configure Php-Fpm -rm -rf /etc/php82/php-fpm.d/* -mv /opt/Setup/Configs/php.conf /etc/php82/php-fpm.d/nextcloud.conf -mv /opt/Setup/Configs/phpTimezone.ini /etc/php82/conf.d/04_date_timezone.ini +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 @@ -20,9 +20,9 @@ tar jxf /opt/Setup/nextcloud.tar.bz2 -C /opt/nextcloud --strip 1 rm -rf /opt/Setup/nextcloud.tar.bz2 chown -R nginx:nginx /opt/nextcloud chown -R nginx:nginx /var/nextcloud -echo "*/5 * * * * php82 -f /opt/nextcloud/cron.php > /dev/null 2>&1" >> /etc/crontabs/nginx -echo "apc.enable_cli=1" >> /etc/php82/php.ini +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-fpm82 +rc-update add php-fpm83 rc-update add redis \ No newline at end of file diff --git a/CT-Files/nextcloud/Scripts/PTKAppUpdate.sh b/CT-Files/nextcloud/Scripts/PTKAppUpdate.sh index 34d8130..34ba2b4 100644 --- a/CT-Files/nextcloud/Scripts/PTKAppUpdate.sh +++ b/CT-Files/nextcloud/Scripts/PTKAppUpdate.sh @@ -1,3 +1,3 @@ #!/bin/sh # Update script for updating apps with ProxmoxHelper/ProxMoxToolKit -sudo -u nginx php82 /opt/nextcloud/updater/updater.phar --no-interaction \ No newline at end of file +sudo -u nginx php83 /opt/nextcloud/updater/updater.phar --no-interaction \ No newline at end of file diff --git a/Scripts/AlpineUpdatePHPVer.sh b/Scripts/AlpineUpdatePHPVer.sh index 8074abe..3168ff2 100644 --- a/Scripts/AlpineUpdatePHPVer.sh +++ b/Scripts/AlpineUpdatePHPVer.sh @@ -4,9 +4,9 @@ #Goto ProjectRoot cd "$( cd "$( dirname "$0" )" &> /dev/null && pwd )/.." -read -p "Old PHP version (example 82): " OldPHPVer -read -p "New PHP version (example 83): " NewPHPVer +read -p "Old PHP version (example 82 for 8.2): " OldPHPVer +read -p "New PHP version (example 83 for 8.3): " NewPHPVer -sed -e -i "s/php$OldPHPVer/php$NewPHPVer/g" ./CT-Build/Alpine.yaml +sed -i -e "s/php$OldPHPVer/php$NewPHPVer/g" ./CT-Build/Alpine.yaml -find ./CT-Files -name '*' | xargs sed -i -e "s/php-fpm$OldPHPVer/php-fpm$NewPHPVer/g" -e "s/php$OldPHPVer/php$NewPHPVer/g" +find ./CT-Files -type f | xargs sed -i -e "s/php-fpm$OldPHPVer/php-fpm$NewPHPVer/g" -e "s/php$OldPHPVer/php$NewPHPVer/g"