From 07321b239712640a637ad062a06c099b876ba97e Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 22 Nov 2016 22:20:05 +0200 Subject: [PATCH] php location on ubuntu 16.04 --- bin/v-delete-web-domain-backend | 4 ++-- func/domain.sh | 4 ++-- install/ubuntu/16.04/{php5-fpm => php-fpm}/www.conf | 0 .../web/nginx/{php5-fpm => php-fpm}/cms_made_simple.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/cms_made_simple.tpl | 0 .../web/nginx/{php5-fpm => php-fpm}/codeigniter2.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/codeigniter2.tpl | 0 .../web/nginx/{php5-fpm => php-fpm}/codeigniter3.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/codeigniter3.tpl | 0 .../web/nginx/{php5-fpm => php-fpm}/datalife_engine.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/datalife_engine.tpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/default.stpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/default.tpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.stpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.tpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/drupal6.stpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/drupal6.tpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/drupal7.stpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/drupal7.tpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/drupal8.stpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/drupal8.tpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/joomla.stpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/joomla.tpl | 0 .../16.04/templates/web/nginx/{php5-fpm => php-fpm}/modx.stpl | 0 .../16.04/templates/web/nginx/{php5-fpm => php-fpm}/modx.tpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/moodle.stpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/moodle.tpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/no-php.stpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/no-php.tpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/owncloud.stpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/owncloud.tpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/piwik.stpl | 0 .../16.04/templates/web/nginx/{php5-fpm => php-fpm}/piwik.tpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.stpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.tpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/wordpress.stpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/wordpress.tpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.stpl | 0 .../templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.tpl | 0 .../16.04/templates/web/{php5-fpm => php-fpm}/default.tpl | 0 .../16.04/templates/web/{php5-fpm => php-fpm}/no-php.tpl | 0 .../16.04/templates/web/{php5-fpm => php-fpm}/socket.tpl | 2 +- 42 files changed, 5 insertions(+), 5 deletions(-) rename install/ubuntu/16.04/{php5-fpm => php-fpm}/www.conf (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.tpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.tpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.tpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.tpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/default.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.tpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.tpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.tpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.tpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/joomla.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/joomla.tpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/modx.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/modx.tpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/moodle.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/moodle.tpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/no-php.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.tpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/piwik.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/piwik.tpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.tpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.tpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.stpl (100%) rename install/ubuntu/16.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.tpl (100%) rename install/ubuntu/16.04/templates/web/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/16.04/templates/web/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/16.04/templates/web/{php5-fpm => php-fpm}/socket.tpl (90%) diff --git a/bin/v-delete-web-domain-backend b/bin/v-delete-web-domain-backend index 01dece06e..6b0114d3e 100755 --- a/bin/v-delete-web-domain-backend +++ b/bin/v-delete-web-domain-backend @@ -44,8 +44,8 @@ fi if [ -d "/etc/php5/fpm/pool.d" ]; then pool="/etc/php5/fpm/pool.d" fi -if [ -d "/etc/php/fpm/pool.d" ]; then - pool="/etc/php/fpm/pool.d" +if [ -d "/etc/php/7.0/fpm/pool.d" ]; then + pool="/etc/php/7.0/fpm/pool.d" fi if [ ! -e "$pool" ]; then pool=$(find /etc/php* -type d \( -name "pool.d" -o -name "*fpm.d" \)) diff --git a/func/domain.sh b/func/domain.sh index 20aa67131..e21a55754 100644 --- a/func/domain.sh +++ b/func/domain.sh @@ -90,8 +90,8 @@ prepare_web_backend() { if [ -d "/etc/php5/fpm/pool.d" ]; then pool="/etc/php5/fpm/pool.d" fi - if [ -d "/etc/php/fpm/pool.d" ]; then - pool="/etc/php/fpm/pool.d" + if [ -d "/etc/php/7.0/fpm/pool.d" ]; then + pool="/etc/php/7.0/fpm/pool.d" fi if [ ! -e "$pool" ]; then pool=$(find /etc/php* -type d \( -name "pool.d" -o -name "*fpm.d" \)) diff --git a/install/ubuntu/16.04/php5-fpm/www.conf b/install/ubuntu/16.04/php-fpm/www.conf similarity index 100% rename from install/ubuntu/16.04/php5-fpm/www.conf rename to install/ubuntu/16.04/php-fpm/www.conf diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/cms_made_simple.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/cms_made_simple.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/cms_made_simple.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/cms_made_simple.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter2.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/codeigniter2.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter2.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter2.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/codeigniter2.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter2.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter3.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/codeigniter3.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter3.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter3.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/codeigniter3.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter3.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/datalife_engine.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/datalife_engine.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/datalife_engine.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/datalife_engine.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/datalife_engine.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/datalife_engine.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/default.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/default.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/default.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/default.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/default.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/dokuwiki.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/dokuwiki.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/dokuwiki.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/dokuwiki.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/dokuwiki.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/dokuwiki.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/drupal6.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/drupal6.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/drupal7.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/drupal7.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/drupal8.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/drupal8.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/joomla.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/joomla.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/joomla.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/joomla.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/joomla.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/joomla.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/modx.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/modx.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/modx.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/modx.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/modx.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/modx.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/moodle.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/moodle.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/moodle.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/moodle.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/moodle.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/moodle.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/no-php.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/no-php.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/no-php.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/no-php.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/no-php.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/owncloud.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/owncloud.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/owncloud.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/owncloud.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/owncloud.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/owncloud.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/piwik.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/piwik.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/piwik.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/piwik.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/piwik.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/piwik.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/pyrocms.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/pyrocms.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/wordpress.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/wordpress.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2.stpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/wordpress2.stpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/nginx/php5-fpm/wordpress2.tpl rename to install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2.tpl diff --git a/install/ubuntu/16.04/templates/web/php5-fpm/default.tpl b/install/ubuntu/16.04/templates/web/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/php5-fpm/default.tpl rename to install/ubuntu/16.04/templates/web/php-fpm/default.tpl diff --git a/install/ubuntu/16.04/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/16.04/templates/web/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/16.04/templates/web/php5-fpm/no-php.tpl rename to install/ubuntu/16.04/templates/web/php-fpm/no-php.tpl diff --git a/install/ubuntu/16.04/templates/web/php5-fpm/socket.tpl b/install/ubuntu/16.04/templates/web/php-fpm/socket.tpl similarity index 90% rename from install/ubuntu/16.04/templates/web/php5-fpm/socket.tpl rename to install/ubuntu/16.04/templates/web/php-fpm/socket.tpl index 22cf6d8ec..d96b9a5e6 100644 --- a/install/ubuntu/16.04/templates/web/php5-fpm/socket.tpl +++ b/install/ubuntu/16.04/templates/web/php-fpm/socket.tpl @@ -1,5 +1,5 @@ [%backend%] -listen = /var/run/php5-%backend%.sock +listen = /var/run/php/php7.0-fpm.sock listen.allowed_clients = 127.0.0.1 user = %user%