diff --git a/CT-Files/nextcloud/Configs/php.pkglist b/CT-Files/nextcloud/Configs/php.pkglist index bdc493c..0196a3c 100644 --- a/CT-Files/nextcloud/Configs/php.pkglist +++ b/CT-Files/nextcloud/Configs/php.pkglist @@ -1 +1 @@ -phpPHPver-pdo_mysql phpPHPver-pecl-imagick phpPHPver-cli phpPHPver-pecl-apcu phpPHPver-pecl-redis phpPHPver-fpm phpPHPver-cgi phpPHPver-common phpPHPver-mbstring phpPHPver-curl phpPHPver-gd phpPHPver-intl phpPHPver-soap phpPHPver-xml phpPHPver-zip phpPHPver-pear phpPHPver-session phpPHPver-posix phpPHPver-pdo phpPHPver-dom phpPHPver-simplexml phpPHPver-xmlreader phpPHPver-xmlwriter phpPHPver-opcache phpPHPver-pcntl phpPHPver-fileinfo phpPHPver-bcmath phpPHPver-gmp phpPHPver-sysvsem phpPHPver-exif phpPHPver-bz2 phpPHPver-sodium phpPHPver-ctype \ No newline at end of file +phpPHPver-pdo_mysql phpPHPver-pecl-imagick phpPHPver-cli phpPHPver-pecl-apcu phpPHPver-pecl-redis phpPHPver-fpm phpPHPver-cgi phpPHPver-common phpPHPver-mbstring phpPHPver-curl phpPHPver-gd phpPHPver-intl phpPHPver-soap phpPHPver-xml phpPHPver-zip phpPHPver-pear phpPHPver-session phpPHPver-posix phpPHPver-pdo phpPHPver-dom phpPHPver-simplexml phpPHPver-xmlreader phpPHPver-xmlwriter phpPHPver-opcache phpPHPver-pcntl phpPHPver-fileinfo phpPHPver-bcmath phpPHPver-gmp phpPHPver-sysvsem phpPHPver-exif phpPHPver-bz2 phpPHPver-sodium phpPHPver-ctype phpPHPver-phar \ No newline at end of file diff --git a/CT-Files/nextcloud/Scripts/FirstRun.sh b/CT-Files/nextcloud/Scripts/FirstRun.sh index e290592..52fddbc 100644 --- a/CT-Files/nextcloud/Scripts/FirstRun.sh +++ b/CT-Files/nextcloud/Scripts/FirstRun.sh @@ -40,4 +40,4 @@ sudo -u nginx phpPHPver /opt/nextcloud/occ config:system:set trusted_domains 1 - sudo -u nginx phpPHPver /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 phpPHPver /opt/nextcloud/occ config:system:set overwriteprotocol --value="$NextcloudWebProto" sudo -u nginx phpPHPver /opt/nextcloud/occ config:system:set maintenance_window_start --type=integer --value=2 -sudo -u nginx phpPHPver /opt/nextcloud/occ occ maintenance:repair --include-expensive \ No newline at end of file +sudo -u nginx phpPHPver /opt/nextcloud/occ maintenance:repair --include-expensive \ No newline at end of file diff --git a/Scripts/AlpinePHPTool.sh b/Scripts/AlpinePHPTool.sh index 1f382ec..b4903d8 100644 --- a/Scripts/AlpinePHPTool.sh +++ b/Scripts/AlpinePHPTool.sh @@ -98,17 +98,22 @@ run_Purge() { #Get current PHP Version OldPHPVer=$(grep php /etc/apk/world -m 1|sed -e "s/\-.*//" -e "s/php//") #Check if PHP is installed - if ! command -v php$OldPHPVer &> /dev/null; then printf "ERROR: PHP is not installed\n\n"; exit 1;fi + PHPInstalled=false + if command -v php$OldPHPVer &> /dev/null; then PHPInstalled=true;fi + if command -v php-fpm$OldPHPVer &> /dev/null; then PHPInstalled=true;fi + if ! $PHPInstalled; then printf "ERROR: PHP is not installed\n\n"; exit 1;fi #Create Backup an its location if [[ ! -d "/opt/PHPCfgBackup/" ]];then mkdir -p "/opt/PHPCfgBackup"; fi if [[ -f /etc/crontabs/nginx ]]; then cp /etc/crontabs/nginx /opt/PHPCfgBackup/crontabs-nginx; fi + service php-fpm$OldPHPVer stop + rc-update del php-fpm$OldPHPVer tar -czf "/opt/PHPCfgBackup/PHP$OldPHPVer-Config.tar.gz" -C "/etc/php$OldPHPVer" ./ rm -rf "/etc/php$OldPHPVer" #Set placeholder in Nginx for PHP Socket sed -i "/fastcgi_pass unix:\/run\/php-/c\ \ fastcgi_pass unix:\/run\/php-fpmPHPver\/php-fpm.sock;" /etc/nginx/nginx.conf #Purge PHP packages - apk del php* + apk del "php*" } #(re)install PHP packages @@ -177,6 +182,11 @@ fetch_Config() { esac } +start_Services(){ + service php-fpm$NewPHPVer start + service nginx restart +} + case $mode in distrobuilder) #Set config location @@ -184,11 +194,12 @@ case $mode in run_DistrobuilderOnly run_Install ;; - fresh) - fetch_Config + fresh) #Set config location - configStore=/tmp + configStore=/tmp + fetch_Config run_Install + start_Services ;; purge) run_Purge @@ -200,6 +211,6 @@ case $mode in service nginx stop run_Purge run_Install - service nginx start + start_Services ;; esac \ No newline at end of file