From 92edd5dc1ff29aefe55ae6917b8b583d8efadb49 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 29 May 2017 14:40:34 +0100 Subject: [PATCH] Update php to version 7.0 --- src/freedombone-app-dokuwiki | 14 +++++++------- src/freedombone-app-friendica | 20 ++++++++++---------- src/freedombone-app-gnusocial | 10 +++++----- src/freedombone-app-gogs | 2 +- src/freedombone-app-htmly | 14 +++++++------- src/freedombone-app-hubzilla | 20 ++++++++++---------- src/freedombone-app-koel | 10 +++++----- src/freedombone-app-lychee | 16 ++++++++-------- src/freedombone-app-mediagoblin | 2 +- src/freedombone-app-movim | 10 +++++----- src/freedombone-app-nextcloud | 18 +++++++++--------- src/freedombone-app-postactiv | 10 +++++----- src/freedombone-app-rss | 12 ++++++------ src/freedombone-app-searx | 2 +- src/freedombone-image-customise | 2 +- src/freedombone-logging | 12 ++++++------ src/freedombone-utils-web | 28 ++++++++++++++-------------- 17 files changed, 101 insertions(+), 101 deletions(-) diff --git a/src/freedombone-app-dokuwiki b/src/freedombone-app-dokuwiki index 31cf4ca0..d23cc03c 100755 --- a/src/freedombone-app-dokuwiki +++ b/src/freedombone-app-dokuwiki @@ -379,10 +379,10 @@ function install_dokuwiki { echo ' try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME - echo ' # With php5-cgi alone:' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME + echo ' # With php-cgi alone:' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME - echo ' # With php5-fpm:' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME + echo ' # With php-fpm:' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' include fastcgi_params;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' fastcgi_index index.php;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME @@ -457,10 +457,10 @@ function install_dokuwiki { echo ' try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME - echo ' # With php5-cgi alone:' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME + echo ' # With php-cgi alone:' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME - echo ' # With php5-fpm:' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME + echo ' # With php-fpm:' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' include fastcgi_params;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' fastcgi_index index.php;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME echo ' fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME @@ -491,7 +491,7 @@ function install_dokuwiki { nginx_ensite $DOKUWIKI_DOMAIN_NAME - systemctl restart php5-fpm + systemctl restart php-fpm systemctl restart nginx function_check add_ddns_domain diff --git a/src/freedombone-app-friendica b/src/freedombone-app-friendica index eb4f7d0b..40e91ae1 100755 --- a/src/freedombone-app-friendica +++ b/src/freedombone-app-friendica @@ -327,9 +327,9 @@ function install_friendica { function_check repair_databases_script repair_databases_script - apt-get -yq install php5-common php5-cli php5-curl php5-gd php5-mysql php5-mcrypt git - apt-get -yq install php5-dev imagemagick php5-imagick - apt-get -yq install php5-memcached + apt-get -yq install php-common php-cli php-curl php-gd php-mysql php-mcrypt git + apt-get -yq install php-dev imagemagick php-imagick + apt-get -yq install php-memcached if [ ! -d /var/www/$FRIENDICA_DOMAIN_NAME ]; then mkdir /var/www/$FRIENDICA_DOMAIN_NAME @@ -425,10 +425,10 @@ function install_friendica { echo ' try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME echo ' # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME echo ' fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME - echo ' # With php5-cgi alone:' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME + echo ' # With php-cgi alone:' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME echo ' # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME - echo ' # With php5-fpm:' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME + echo ' # With php-fpm:' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME echo ' include fastcgi_params;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME echo ' fastcgi_index index.php;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME echo ' fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME @@ -493,10 +493,10 @@ function install_friendica { echo ' try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME echo ' # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME echo ' fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME - echo ' # With php5-cgi alone:' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME + echo ' # With php-cgi alone:' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME echo ' # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME - echo ' # With php5-fpm:' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME + echo ' # With php-fpm:' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME echo ' include fastcgi_params;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME echo ' fastcgi_index index.php;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME echo ' fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME @@ -588,7 +588,7 @@ function install_friendica { chown www-data:www-data $FRIENDICA_PATH/.htconfig.php chmod 755 $FRIENDICA_PATH/.htconfig.php - systemctl restart php5-fpm + systemctl restart php-fpm systemctl restart nginx systemctl restart cron diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial index 56f686b0..6c8569ce 100755 --- a/src/freedombone-app-gnusocial +++ b/src/freedombone-app-gnusocial @@ -537,8 +537,8 @@ function install_gnusocial_main { function_check repair_databases_script repair_databases_script - apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser - apt-get -yq install php5-memcached php5-intl exiftool + apt-get -yq install php-gettext php-curl php-gd php-mysql git curl + apt-get -yq install php-memcached php-intl exiftool if [ ! -d /var/www/$GNUSOCIAL_DOMAIN_NAME ]; then mkdir /var/www/$GNUSOCIAL_DOMAIN_NAME @@ -614,7 +614,7 @@ function install_gnusocial_main { echo ' # PHP' >> $gnusocial_nginx_site echo ' location ~ \.php {' >> $gnusocial_nginx_site echo ' include snippets/fastcgi-php.conf;' >> $gnusocial_nginx_site - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $gnusocial_nginx_site + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> $gnusocial_nginx_site echo ' }' >> $gnusocial_nginx_site echo '' >> $gnusocial_nginx_site echo ' # Location' >> $gnusocial_nginx_site @@ -662,7 +662,7 @@ function install_gnusocial_main { echo ' # PHP' >> $gnusocial_nginx_site echo ' location ~ \.php {' >> $gnusocial_nginx_site echo ' include snippets/fastcgi-php.conf;' >> $gnusocial_nginx_site - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $gnusocial_nginx_site + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> $gnusocial_nginx_site echo ' }' >> $gnusocial_nginx_site echo '' >> $gnusocial_nginx_site echo ' # Location' >> $gnusocial_nginx_site @@ -770,7 +770,7 @@ function install_gnusocial_main { # This improves performance sed -i "s|//\$config\['db'\]\['schemacheck'\].*|\$config\['db'\]\['schemacheck'\] = 'script';|g" $gnusocial_config_file - systemctl restart php5-fpm + systemctl restart php-fpm systemctl restart nginx ${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$GNUSOCIAL_DOMAIN_NAME" -g gnusocial --public no diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs index cacedf20..39d62db2 100755 --- a/src/freedombone-app-gogs +++ b/src/freedombone-app-gogs @@ -575,7 +575,7 @@ function install_gogs { GIT_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_gogs/hostname) - systemctl restart php5-fpm + systemctl restart php-fpm systemctl restart nginx set_completion_param "gogs domain" "$GIT_DOMAIN_NAME" diff --git a/src/freedombone-app-htmly b/src/freedombone-app-htmly index 14265b19..22fb8e9c 100755 --- a/src/freedombone-app-htmly +++ b/src/freedombone-app-htmly @@ -462,10 +462,10 @@ function install_htmly_website { echo ' try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME - echo ' # With php5-cgi alone:' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME + echo ' # With php-cgi alone:' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME - echo ' # With php5-fpm:' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME + echo ' # With php-fpm:' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' include fastcgi_params;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' fastcgi_index index.php;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME @@ -541,10 +541,10 @@ function install_htmly_website_onion { echo ' try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME - echo ' # With php5-cgi alone:' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME + echo ' # With php-cgi alone:' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME - echo ' # With php5-fpm:' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME + echo ' # With php-fpm:' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' include fastcgi_params;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' fastcgi_index index.php;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME echo ' fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME @@ -627,7 +627,7 @@ function install_htmly { function_check nginx_ensite nginx_ensite $HTMLY_DOMAIN_NAME - systemctl restart php5-fpm + systemctl restart php-fpm systemctl restart nginx ${PROJECT_NAME}-pass -u $MY_USERNAME -a htmly -p "$HTMLY_ADMIN_PASSWORD" diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla index f9ebb32a..fb115ba8 100755 --- a/src/freedombone-app-hubzilla +++ b/src/freedombone-app-hubzilla @@ -318,9 +318,9 @@ function install_hubzilla { function_check repair_databases_script repair_databases_script - apt-get -yq install php5-common php5-cli php5-curl php5-gd php5-mysql php5-mcrypt git - apt-get -yq install php5-dev imagemagick php5-imagick - apt-get -yq install php5-memcached + apt-get -yq install php-common php-cli php-curl php-gd php-mysql php-mcrypt git + apt-get -yq install php-dev imagemagick php-imagick + apt-get -yq install php-memcached if [ ! -d /var/www/$HUBZILLA_DOMAIN_NAME ]; then mkdir /var/www/$HUBZILLA_DOMAIN_NAME @@ -420,10 +420,10 @@ function install_hubzilla { echo ' try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME - echo ' # With php5-cgi alone:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME + echo ' # With php-cgi alone:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME - echo ' # With php5-fpm:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME + echo ' # With php-fpm:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' include fastcgi_params;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' fastcgi_index index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME @@ -488,10 +488,10 @@ function install_hubzilla { echo ' try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME - echo ' # With php5-cgi alone:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME + echo ' # With php-cgi alone:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME - echo ' # With php5-fpm:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME + echo ' # With php-fpm:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' include fastcgi_params;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' fastcgi_index index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME echo ' fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME @@ -583,7 +583,7 @@ function install_hubzilla { chown www-data:www-data $HUBZILLA_PATH/.htconfig.php chmod 755 $HUBZILLA_PATH/.htconfig.php - systemctl restart php5-fpm + systemctl restart php-fpm systemctl restart nginx systemctl restart cron diff --git a/src/freedombone-app-koel b/src/freedombone-app-koel index 527e945f..2de8c3c0 100755 --- a/src/freedombone-app-koel +++ b/src/freedombone-app-koel @@ -479,8 +479,8 @@ function install_koel_main { function_check repair_databases_script repair_databases_script - apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser - apt-get -yq install php5-memcached php5-intl exiftool + apt-get -yq install php-gettext php-curl php-gd php-mysql git curl + apt-get -yq install php-memcached php-intl exiftool if [ ! -d /var/www/$KOEL_DOMAIN_NAME ]; then mkdir /var/www/$KOEL_DOMAIN_NAME @@ -554,7 +554,7 @@ function install_koel_main { echo ' # PHP' >> $koel_nginx_site echo ' location ~ \.php {' >> $koel_nginx_site echo ' include snippets/fastcgi-php.conf;' >> $koel_nginx_site - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $koel_nginx_site + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> $koel_nginx_site echo ' }' >> $koel_nginx_site echo '' >> $koel_nginx_site echo ' # Location' >> $koel_nginx_site @@ -612,7 +612,7 @@ function install_koel_main { echo ' # PHP' >> $koel_nginx_site echo ' location ~ \.php {' >> $koel_nginx_site echo ' include snippets/fastcgi-php.conf;' >> $koel_nginx_site - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $koel_nginx_site + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> $koel_nginx_site echo ' }' >> $koel_nginx_site echo '' >> $koel_nginx_site echo ' # Location' >> $koel_nginx_site @@ -661,7 +661,7 @@ function install_koel_main { KOEL_SERVER=${KOEL_ONION_HOSTNAME} fi - systemctl restart php5-fpm + systemctl restart php-fpm systemctl restart nginx ${PROJECT_NAME}-pass -u $MY_USERNAME -a koel -p "$KOEL_ADMIN_PASSWORD" diff --git a/src/freedombone-app-lychee b/src/freedombone-app-lychee index e1b25cc1..ee39cda5 100755 --- a/src/freedombone-app-lychee +++ b/src/freedombone-app-lychee @@ -262,10 +262,10 @@ function install_lychee_website { echo ' try_files $uri $uri/ /index.html;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME - echo ' # With php5-cgi alone:' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME + echo ' # With php-cgi alone:' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME - echo ' # With php5-fpm:' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME + echo ' # With php-fpm:' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' include fastcgi_params;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' fastcgi_index index.html;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME @@ -331,10 +331,10 @@ function install_lychee_website_onion { echo ' try_files $uri $uri/ /index.html;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME - echo ' # With php5-cgi alone:' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME + echo ' # With php-cgi alone:' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME - echo ' # With php5-fpm:' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME + echo ' # With php-fpm:' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' include fastcgi_params;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' fastcgi_index index.html;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME echo ' fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME @@ -381,7 +381,7 @@ function install_lychee { fi # for the avatar changing command - apt-get -yq install imagemagick exif zip php5-mcrypt mcrypt + apt-get -yq install imagemagick exif zip php-mcrypt mcrypt function_check install_lychee_from_repo install_lychee_from_repo @@ -426,7 +426,7 @@ function install_lychee { function_check lychee_create_database lychee_create_database - systemctl restart php5-fpm + systemctl restart php-fpm systemctl restart nginx ${PROJECT_NAME}-pass -u $MY_USERNAME -a lychee -p "$LYCHEE_ADMIN_PASSWORD" diff --git a/src/freedombone-app-mediagoblin b/src/freedombone-app-mediagoblin index 8a072112..18905a96 100755 --- a/src/freedombone-app-mediagoblin +++ b/src/freedombone-app-mediagoblin @@ -496,7 +496,7 @@ function install_mediagoblin { nginx_ensite $MEDIAGOBLIN_DOMAIN_NAME - systemctl restart php5-fpm + systemctl restart php-fpm systemctl restart nginx function_check add_ddns_domain diff --git a/src/freedombone-app-movim b/src/freedombone-app-movim index fe73c52a..cfc00bee 100755 --- a/src/freedombone-app-movim +++ b/src/freedombone-app-movim @@ -319,8 +319,8 @@ function install_movim { function_check repair_databases_script repair_databases_script - apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser - apt-get -yq install php5-memcached php5-intl exiftool php5-imagick + apt-get -yq install php-gettext php-curl php-gd php-mysql git curl + apt-get -yq install php-memcached php-intl exiftool php-imagick if [ ! -d /var/www/$MOVIM_DOMAIN_NAME ]; then mkdir /var/www/$MOVIM_DOMAIN_NAME @@ -435,7 +435,7 @@ function install_movim { echo ' # PHP' >> $movim_nginx_site echo ' location ~ \.php {' >> $movim_nginx_site echo ' include snippets/fastcgi-php.conf;' >> $movim_nginx_site - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $movim_nginx_site + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> $movim_nginx_site echo ' }' >> $movim_nginx_site echo '' >> $movim_nginx_site echo ' # Location' >> $movim_nginx_site @@ -494,7 +494,7 @@ function install_movim { echo ' # PHP' >> $movim_nginx_site echo ' location ~ \.php {' >> $movim_nginx_site echo ' include snippets/fastcgi-php.conf;' >> $movim_nginx_site - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $movim_nginx_site + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> $movim_nginx_site echo ' }' >> $movim_nginx_site echo '' >> $movim_nginx_site echo ' # Location' >> $movim_nginx_site @@ -550,7 +550,7 @@ function install_movim { set_completion_param "movim domain" "$MOVIM_DOMAIN_NAME" systemctl start movim - systemctl restart php5-fpm + systemctl restart php-fpm systemctl restart nginx APP_INSTALLED=1 } diff --git a/src/freedombone-app-nextcloud b/src/freedombone-app-nextcloud index f6c567a0..ce22e661 100755 --- a/src/freedombone-app-nextcloud +++ b/src/freedombone-app-nextcloud @@ -339,7 +339,7 @@ function remove_nextcloud { function_check remove_nodejs remove_nodejs pleroma-nextcloud - sed -i 's|env[PATH]|;env[PATH]|g' /etc/php5/fpm/pool.d/www.conf + sed -i 's|env[PATH]|;env[PATH]|g' /etc/php7.0/fpm/pool.d/www.conf read_config_param "NEXTCLOUD_DOMAIN_NAME" read_config_param "MY_USERNAME" @@ -367,7 +367,7 @@ function remove_nextcloud { function_check remove_ddns_domain remove_ddns_domain $NEXTCLOUD_DOMAIN_NAME systemctl restart nginx - systemctl restart php5-fpm + systemctl restart php-fpm } function install_nextcloud_main { @@ -389,15 +389,15 @@ function install_nextcloud_main { function_check repair_databases_script repair_databases_script - apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser - apt-get -yq install php5-memcached php5-intl memcached php5-memcached + apt-get -yq install php-gettext php-curl php-gd php-mysql git curl + apt-get -yq install php-memcached php-intl memcached php-memcached # Ensure PATH is available to php - if [ ! -f /etc/php5/fpm/pool.d/www.conf ]; then + if [ ! -f /etc/php7.0/fpm/pool.d/www.conf ]; then echo $'No php www configuration file found' exit 628757 fi - sed -i 's|;env[PATH]|env[PATH]|g' /etc/php5/fpm/pool.d/www.conf + sed -i 's|;env[PATH]|env[PATH]|g' /etc/php7.0/fpm/pool.d/www.conf if [ ! -d /var/www/$NEXTCLOUD_DOMAIN_NAME ]; then mkdir /var/www/$NEXTCLOUD_DOMAIN_NAME @@ -463,7 +463,7 @@ function install_nextcloud_main { echo ' # PHP' >> $nextcloud_nginx_site echo ' location ~ \.php {' >> $nextcloud_nginx_site echo ' include snippets/fastcgi-php.conf;' >> $nextcloud_nginx_site - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $nextcloud_nginx_site + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> $nextcloud_nginx_site echo ' }' >> $nextcloud_nginx_site echo '' >> $nextcloud_nginx_site echo ' # Location' >> $nextcloud_nginx_site @@ -518,7 +518,7 @@ function install_nextcloud_main { echo ' # PHP' >> $nextcloud_nginx_site echo ' location ~ \.php {' >> $nextcloud_nginx_site echo ' include snippets/fastcgi-php.conf;' >> $nextcloud_nginx_site - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $nextcloud_nginx_site + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> $nextcloud_nginx_site echo ' }' >> $nextcloud_nginx_site echo '' >> $nextcloud_nginx_site echo ' # Location' >> $nextcloud_nginx_site @@ -592,7 +592,7 @@ function install_nextcloud_main { NEXTCLOUD_SERVER=${NEXTCLOUD_ONION_HOSTNAME} fi - systemctl restart php5-fpm + systemctl restart php-fpm systemctl restart nginx ${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$NEXTCLOUD_DOMAIN_NAME" -g nextcloud --public no diff --git a/src/freedombone-app-postactiv b/src/freedombone-app-postactiv index 4a79af9b..07c413ad 100755 --- a/src/freedombone-app-postactiv +++ b/src/freedombone-app-postactiv @@ -540,8 +540,8 @@ function install_postactiv_main { function_check repair_databases_script repair_databases_script - apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser - apt-get -yq install php5-memcached php5-intl exiftool + apt-get -yq install php-gettext php-curl php-gd php-mysql git curl + apt-get -yq install php-memcached php-intl exiftool if [ ! -d /var/www/$POSTACTIV_DOMAIN_NAME ]; then mkdir /var/www/$POSTACTIV_DOMAIN_NAME @@ -617,7 +617,7 @@ function install_postactiv_main { echo ' # PHP' >> $postactiv_nginx_site echo ' location ~ \.php {' >> $postactiv_nginx_site echo ' include snippets/fastcgi-php.conf;' >> $postactiv_nginx_site - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $postactiv_nginx_site + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> $postactiv_nginx_site echo ' }' >> $postactiv_nginx_site echo '' >> $postactiv_nginx_site echo ' # Location' >> $postactiv_nginx_site @@ -665,7 +665,7 @@ function install_postactiv_main { echo ' # PHP' >> $postactiv_nginx_site echo ' location ~ \.php {' >> $postactiv_nginx_site echo ' include snippets/fastcgi-php.conf;' >> $postactiv_nginx_site - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $postactiv_nginx_site + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> $postactiv_nginx_site echo ' }' >> $postactiv_nginx_site echo '' >> $postactiv_nginx_site echo ' # Location' >> $postactiv_nginx_site @@ -776,7 +776,7 @@ function install_postactiv_main { rm /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/install.php fi - systemctl restart php5-fpm + systemctl restart php-fpm systemctl restart nginx ${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$POSTACTIV_DOMAIN_NAME" -g postactiv --public no diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss index d9c6c7ff..2bc81587 100755 --- a/src/freedombone-app-rss +++ b/src/freedombone-app-rss @@ -294,8 +294,8 @@ function install_rss_main { function_check remove_onion_service remove_onion_service rss ${RSS_READER_ONION_PORT} ${RSS_MOBILE_READER_ONION_PORT} - apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git - apt-get -yq install curl php-xml-parser php5-mcrypt + apt-get -yq install php-gettext php-curl php-gd php-mysql git + apt-get -yq install curl php-xml-parser php-mcrypt if [ ! -d /etc/share ]; then mkdir /etc/share @@ -337,7 +337,7 @@ function install_rss_main { echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo ' location ~ \.php {' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo ' include snippets/fastcgi-php.conf;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo ' }' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo ' location / {' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME @@ -375,7 +375,7 @@ function install_rss_main { echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo ' location ~ \.php {' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo ' include snippets/fastcgi-php.conf;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo ' }' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo ' set $mobile_rewrite do_not_perform;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME @@ -396,7 +396,7 @@ function install_rss_main { echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo ' location ~ \.php {' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo ' include snippets/fastcgi-php.conf;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME - echo ' fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME + echo ' fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo ' }' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME echo ' location / {' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME @@ -482,7 +482,7 @@ function install_rss_main { configure_php nginx_ensite $RSS_READER_DOMAIN_NAME - systemctl restart php5-fpm + systemctl restart php-fpm systemctl restart nginx # daemon to update feeds diff --git a/src/freedombone-app-searx b/src/freedombone-app-searx index 5a8b16c3..429ec1c3 100755 --- a/src/freedombone-app-searx +++ b/src/freedombone-app-searx @@ -930,7 +930,7 @@ function install_searx { nginx_ensite searx # restart the web server - systemctl restart php5-fpm + systemctl restart php-fpm systemctl restart nginx # start the daemon diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index d3b8c6f3..35915ddc 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -1175,7 +1175,7 @@ function image_setup_utils { # web server chroot "$rootdir" apt-get -yq remove --purge apache2 - chroot "$rootdir" apt-get -yq install nginx php5-fpm + chroot "$rootdir" apt-get -yq install nginx php-fpm git clone $NGINX_ENSITE_REPO $rootdir/root/build/nginx_ensite cd $rootdir/root/build/nginx_ensite git checkout $NGINX_ENSITE_COMMIT -b $NGINX_ENSITE_COMMIT diff --git a/src/freedombone-logging b/src/freedombone-logging index 4e2f4bb4..f1084279 100755 --- a/src/freedombone-logging +++ b/src/freedombone-logging @@ -99,8 +99,8 @@ if [[ "$1" == "on" || "$1" == "On" || "$1" == "ON" ]]; then if [ -f /etc/mumble-server.ini ]; then sed -i 's|logfile=.*|logfile=/var/log/mumble-server.log|g' /etc/mumble-server.ini fi - if [ -f /etc/php5/fpm/php-fpm.conf ]; then - sed -i 's|error_log =.*|error_log = /var/log/php5-fpm.log|g' /etc/php5/fpm/php-fpm.conf + if [ -f /etc/php7.0/fpm/php-fpm.conf ]; then + sed -i 's|error_log =.*|error_log = /var/log/php-fpm.log|g' /etc/php7.0/fpm/php-fpm.conf fi if [ -d /etc/nginx ]; then if [ ! -d /var/log/nginx ]; then @@ -180,9 +180,9 @@ else shred -zu /var/log/radicale/* rm -rf /var/log/radicale fi - if [ -f /etc/php5/fpm/php-fpm.conf ]; then - sed -i 's|error_log =.*|error_log = /dev/null|g' /etc/php5/fpm/php-fpm.conf - shred -zu /var/log/php5-fpm.* + if [ -f /etc/php7.0/fpm/php-fpm.conf ]; then + sed -i 's|error_log =.*|error_log = /dev/null|g' /etc/php7.0/fpm/php-fpm.conf + shred -zu /var/log/php-fpm.* fi if [ -d /etc/nginx ]; then for filename in /etc/nginx/sites-available/* ; do @@ -246,7 +246,7 @@ if [ -d /etc/tor ]; then fi fi if [ -d /etc/nginx ]; then - systemctl restart php5-fpm + systemctl restart php-fpm systemctl restart nginx fi if [ -f /etc/init.d/spamassassin ]; then diff --git a/src/freedombone-utils-web b/src/freedombone-utils-web index 4fa7b516..5ce388b3 100755 --- a/src/freedombone-utils-web +++ b/src/freedombone-utils-web @@ -401,11 +401,11 @@ function letsencrypt_renewals { } function configure_php { - sed -i "s/memory_limit = 128M/memory_limit = ${MAX_PHP_MEMORY}M/g" /etc/php5/fpm/php.ini - sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php5/fpm/php.ini - sed -i "s/memory_limit = -1/memory_limit = ${MAX_PHP_MEMORY}M/g" /etc/php5/cli/php.ini - sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 50M/g" /etc/php5/fpm/php.ini - sed -i "s/post_max_size = 8M/post_max_size = 50M/g" /etc/php5/fpm/php.ini + sed -i "s/memory_limit = 128M/memory_limit = ${MAX_PHP_MEMORY}M/g" /etc/php7.0/fpm/php.ini + sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php7.0/fpm/php.ini + sed -i "s/memory_limit = -1/memory_limit = ${MAX_PHP_MEMORY}M/g" /etc/php7.0/cli/php.ini + sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 50M/g" /etc/php7.0/fpm/php.ini + sed -i "s/post_max_size = 8M/post_max_size = 50M/g" /etc/php7.0/fpm/php.ini } function install_web_server_access_control { @@ -552,22 +552,22 @@ function install_web_server { fi # install nginx apt-get -yq install nginx - apt-get -yq install php5-fpm git + apt-get -yq install php-fpm git # Turn off logs by default sed -i 's|access_log.*|access_log = /dev/null;|g' /etc/nginx/nginx.conf sed -i 's|error_log.*|error_log = /dev/null;|g' /etc/nginx/nginx.conf # limit the number of php processes - sed -i 's/; process.max =.*/process.max = 32/g' /etc/php5/fpm/php-fpm.conf - #sed -i 's/;process_control_timeout =.*/process_control_timeout = 300/g' /etc/php5/fpm/php-fpm.conf + sed -i 's/; process.max =.*/process.max = 32/g' /etc/php7.0/fpm/php-fpm.conf + #sed -i 's/;process_control_timeout =.*/process_control_timeout = 300/g' /etc/php7.0/fpm/php-fpm.conf - if ! grep -q "pm.max_children" /etc/php5/fpm/php-fpm.conf; then - echo 'pm.max_children = 10' >> /etc/php5/fpm/php-fpm.conf - echo 'pm.start_servers = 2' >> /etc/php5/fpm/php-fpm.conf - echo 'pm.min_spare_servers = 2' >> /etc/php5/fpm/php-fpm.conf - echo 'pm.max_spare_servers = 5' >> /etc/php5/fpm/php-fpm.conf - echo 'pm.max_requests = 50' >> /etc/php5/fpm/php-fpm.conf + if ! grep -q "pm.max_children" /etc/php7.0/fpm/php-fpm.conf; then + echo 'pm.max_children = 10' >> /etc/php7.0/fpm/php-fpm.conf + echo 'pm.start_servers = 2' >> /etc/php7.0/fpm/php-fpm.conf + echo 'pm.min_spare_servers = 2' >> /etc/php7.0/fpm/php-fpm.conf + echo 'pm.max_spare_servers = 5' >> /etc/php7.0/fpm/php-fpm.conf + echo 'pm.max_requests = 50' >> /etc/php7.0/fpm/php-fpm.conf fi if [ ! -d /etc/nginx ]; then