diff --git a/CT-Files/heimdall/Configs/nginx.conf b/CT-Files/heimdall/Configs/nginx.conf index 5d02dd9..ba28641 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-fpm81/php-fpm.sock; + fastcgi_pass unix:/run/php-fpm82/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 010669c..f88d744 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-fpm81/php-fpm.sock +listen = /run/php-fpm82/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-fpm81/php-fpm.sock:/tmp +php_admin_value[open_basedir] = /opt/heimdall:/run/php-fpm82/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 050ad6b..434527b 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/php81/php-fpm.d/* -mv /opt/Setup/Configs/php.conf /etc/php81/php-fpm.d/heimdall.conf -mv /opt/Setup/Configs/phpTimezone.ini /etc/php81/conf.d/04_date_timezone.ini +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 #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-fpm81 \ No newline at end of file +rc-update add php-fpm82 \ No newline at end of file diff --git a/CT-Files/nextcloud/Configs/nginx.conf b/CT-Files/nextcloud/Configs/nginx.conf index 6dc9a9f..ce1dfba 100644 --- a/CT-Files/nextcloud/Configs/nginx.conf +++ b/CT-Files/nextcloud/Configs/nginx.conf @@ -86,7 +86,7 @@ http { fastcgi_param HTTPS on; fastcgi_param modHeadersAvailable true; fastcgi_param front_controller_active true; - fastcgi_pass unix:/run/php-fpm81/php-fpm.sock; + fastcgi_pass unix:/run/php-fpm82/php-fpm.sock; fastcgi_intercept_errors on; fastcgi_request_buffering off; } diff --git a/CT-Files/nextcloud/Configs/php.conf b/CT-Files/nextcloud/Configs/php.conf index fc4db7e..18942f5 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-fpm81/php-fpm.sock +listen = /run/php-fpm82/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-fpm81/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-fpm82/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 905a4d0..b4105d0 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 php81 /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 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 sed -n -i '/#SetupBlockStart/{:a;N;/#SetupBlockEnd/!ba;N;s/.*//};p' /etc/nginx/nginx.conf service nginx reload -sudo -u nginx php81 /opt/nextcloud/occ db:convert-filecache-bigint -sudo -u nginx php81 /opt/nextcloud/occ db:add-missing-indices -#sudo -u nginx php81 /opt/nextcloud/occ app:disable firstrunwizard -sudo -u nginx php81 /opt/nextcloud/occ config:system:set default_language --value=nl -sudo -u nginx php81 /opt/nextcloud/occ config:system:set default_locale --value=nl -sudo -u nginx php81 /opt/nextcloud/occ config:system:set default_phone_region --value=nl -sudo -u nginx php81 /opt/nextcloud/occ config:system:set skeletondirectory --value= -sudo -u nginx php81 /opt/nextcloud/occ config:system:set memcache.local --value='\OC\Memcache\APCu' -sudo -u nginx php81 /opt/nextcloud/occ config:system:set trashbin_retention_obligation --value=30,30 -sudo -u nginx php81 /opt/nextcloud/occ config:system:set memcache.distributed --value='\OC\Memcache\Redis' -sudo -u nginx php81 /opt/nextcloud/occ config:system:set memcache.locking --value='\OC\Memcache\Redis' -sudo -u nginx php81 /opt/nextcloud/occ config:system:set redis host --value=localhost -sudo -u nginx php81 /opt/nextcloud/occ config:system:set redis port --value=6379 -sudo -u nginx php81 /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 php81 /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 php81 /opt/nextcloud/occ config:system:set overwriteprotocol --value="$NextcloudWebProto" \ No newline at end of file +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 diff --git a/CT-Files/nextcloud/Scripts/Init.sh b/CT-Files/nextcloud/Scripts/Init.sh index 672e84f..375173d 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/php81/php.ini +sed -i '/memory_limit =/c\memory_limit = 512M' /etc/php82/php.ini #Configure Php-Fpm -rm -rf /etc/php81/php-fpm.d/* -mv /opt/Setup/Configs/php.conf /etc/php81/php-fpm.d/nextcloud.conf -mv /opt/Setup/Configs/phpTimezone.ini /etc/php81/conf.d/04_date_timezone.ini +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 #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 * * * * php81 -f /opt/nextcloud/cron.php > /dev/null 2>&1" >> /etc/crontabs/nginx -echo "apc.enable_cli=1" >> /etc/php81/php.ini +echo "*/5 * * * * php82 -f /opt/nextcloud/cron.php > /dev/null 2>&1" >> /etc/crontabs/nginx +echo "apc.enable_cli=1" >> /etc/php82/php.ini #Enable services on boot rc-update add nginx -rc-update add php-fpm81 +rc-update add php-fpm82 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 2ee193b..34d8130 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 php81 /opt/nextcloud/updater/updater.phar --no-interaction \ No newline at end of file +sudo -u nginx php82 /opt/nextcloud/updater/updater.phar --no-interaction \ No newline at end of file