diff --git a/conf/cops-deps.control b/conf/cops-deps.control index bf289c4..327a037 100644 --- a/conf/cops-deps.control +++ b/conf/cops-deps.control @@ -5,7 +5,7 @@ Standards-Version: 1.0.1 Package: cops-deps Version: 1.2-1 -Depends: php5-gd, php5-sqlite, php5-json, php5-intl +Depends: php7.0-gd, php7.0-sqlite3, php7.0-json, php7.0-intl Architecture: all Description: meta package for cops dependencies COPS stands for Calibre OPDS (and HTML) Php Server. diff --git a/conf/nginx.conf b/conf/nginx.conf index 90e0d31..722e69e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -14,7 +14,7 @@ location PATHTOCHANGE { try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php5-fpm-NAMETOCHANGE.sock; + fastcgi_pass unix:/var/run/php7.0-fpm-NAMETOCHANGE.sock; fastcgi_index index.php; include fastcgi_params; fastcgi_param REMOTE_USER $remote_user; diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 336c925..c9e17e5 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -24,7 +24,7 @@ ; specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. -listen = /var/run/php5-fpm-NAMETOCHANGE.sock +listen = /var/run/php7.0-fpm-NAMETOCHANGE.sock ; Set listen(2) backlog. A value of '-1' means unlimited. ; Default Value: 128 (-1 on FreeBSD and OpenBSD) diff --git a/manifest.json b/manifest.json index 5317cc4..31dcbdd 100644 --- a/manifest.json +++ b/manifest.json @@ -15,7 +15,7 @@ "multi_instance": true, "services": [ "nginx", - "php5-fpm" + "php7.0-fpm" ], "requirements": { "yunohost": ">= 2.4.0" diff --git a/scripts/install b/scripts/install index 171c509..40febb2 100755 --- a/scripts/install +++ b/scripts/install @@ -54,7 +54,7 @@ ynh_app_setting_set "$app" basicauthcreate "$basicauthcreate" finalnginxconf="/etc/nginx/conf.d/${domain}.d/${app}.conf" ynh_app_setting_set "$app" finalnginxconf "$finalnginxconf" -finalphpconf="/etc/php5/fpm/pool.d/${app}.conf" +finalphpconf="/etc/php/7.0/fpm/pool.d/${app}.conf" ynh_app_setting_set "$app" finalphpconf "$finalphpconf" # Install dependencies using Helpers @@ -157,6 +157,6 @@ else fi # Reload Nginx and regenerate SSOwat conf -sudo service php5-fpm reload +sudo service php7.0-fpm reload sudo service nginx reload sudo yunohost app ssowatconf diff --git a/scripts/remove b/scripts/remove index c4ffe87..3cd6009 100755 --- a/scripts/remove +++ b/scripts/remove @@ -75,6 +75,6 @@ fi REMOVE_SYS_USER "$runninguser" # We reload the services -sudo service php5-fpm reload +sudo service php7.0-fpm reload sudo service nginx reload sudo yunohost app ssowatconf diff --git a/scripts/restore b/scripts/restore index 9eb4b07..9c48d50 100755 --- a/scripts/restore +++ b/scripts/restore @@ -15,7 +15,7 @@ basicauthcreate=$(ynh_app_setting_get $app basicauthcreate) # We install dependencies sudo apt-get update -y -sudo apt-get install php5-gd php5-sqlite php5-json php5-intl -y +sudo apt-get install php7.0-gd php7.0-sqlite3 php7.0-json php7.0-intl -y # Install dependencies using Helpers #ynh_package_install_from_equivs ../conf/cops-deps.control \ @@ -84,6 +84,6 @@ fi # Restart webserver sudo service nginx reload -sudo service php5-fpm reload +sudo service php7.0-fpm reload sudo yunohost app ssowatconf diff --git a/scripts/upgrade b/scripts/upgrade index 30015c9..a100df5 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -122,6 +122,6 @@ else fi # Reload Nginx and regenerate SSOwat conf -sudo service php5-fpm reload +sudo service php7.0-fpm reload sudo service nginx reload sudo yunohost app ssowatconf