From b54b96228a1af89957ad93d5b1f608b5f1053f08 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 23 Nov 2016 18:11:38 +0200 Subject: [PATCH] new installer for ubuntu --- .../12.04/{php5-fpm => php-fpm}/www.conf | 0 .../cms_made_simple.stpl | 0 .../{php5-fpm => php-fpm}/cms_made_simple.tpl | 0 .../{php5-fpm => php-fpm}/codeigniter2.stpl | 0 .../{php5-fpm => php-fpm}/codeigniter2.tpl | 0 .../{php5-fpm => php-fpm}/codeigniter3.stpl | 0 .../{php5-fpm => php-fpm}/codeigniter3.tpl | 0 .../datalife_engine.stpl | 0 .../{php5-fpm => php-fpm}/datalife_engine.tpl | 0 .../nginx/{php5-fpm => php-fpm}/default.stpl | 0 .../nginx/{php5-fpm => php-fpm}/default.tpl | 0 .../nginx/{php5-fpm => php-fpm}/dokuwiki.stpl | 0 .../nginx/{php5-fpm => php-fpm}/dokuwiki.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal6.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal6.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal7.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal7.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal8.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal8.tpl | 0 .../nginx/{php5-fpm => php-fpm}/joomla.stpl | 0 .../nginx/{php5-fpm => php-fpm}/joomla.tpl | 0 .../web/nginx/{php5-fpm => php-fpm}/modx.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/modx.tpl | 0 .../nginx/{php5-fpm => php-fpm}/moodle.stpl | 0 .../nginx/{php5-fpm => php-fpm}/moodle.tpl | 0 .../nginx/{php5-fpm => php-fpm}/no-php.stpl | 0 .../nginx/{php5-fpm => php-fpm}/no-php.tpl | 0 .../nginx/{php5-fpm => php-fpm}/owncloud.stpl | 0 .../nginx/{php5-fpm => php-fpm}/owncloud.tpl | 0 .../nginx/{php5-fpm => php-fpm}/piwik.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/piwik.tpl | 0 .../nginx/{php5-fpm => php-fpm}/pyrocms.stpl | 0 .../nginx/{php5-fpm => php-fpm}/pyrocms.tpl | 0 .../{php5-fpm => php-fpm}/wordpress.stpl | 0 .../nginx/{php5-fpm => php-fpm}/wordpress.tpl | 0 .../{php5-fpm => php-fpm}/wordpress2.stpl | 0 .../{php5-fpm => php-fpm}/wordpress2.tpl | 0 .../web/{php5-fpm => php-fpm}/default.tpl | 0 .../web/{php5-fpm => php-fpm}/no-php.tpl | 0 .../web/{php5-fpm => php-fpm}/socket.tpl | 0 .../12.10/{php5-fpm => php-fpm}/www.conf | 0 .../cms_made_simple.stpl | 0 .../{php5-fpm => php-fpm}/cms_made_simple.tpl | 0 .../{php5-fpm => php-fpm}/codeigniter2.stpl | 0 .../{php5-fpm => php-fpm}/codeigniter2.tpl | 0 .../{php5-fpm => php-fpm}/codeigniter3.stpl | 0 .../{php5-fpm => php-fpm}/codeigniter3.tpl | 0 .../datalife_engine.stpl | 0 .../{php5-fpm => php-fpm}/datalife_engine.tpl | 0 .../nginx/{php5-fpm => php-fpm}/default.stpl | 0 .../nginx/{php5-fpm => php-fpm}/default.tpl | 0 .../nginx/{php5-fpm => php-fpm}/dokuwiki.stpl | 0 .../nginx/{php5-fpm => php-fpm}/dokuwiki.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal6.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal6.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal7.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal7.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal8.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal8.tpl | 0 .../nginx/{php5-fpm => php-fpm}/joomla.stpl | 0 .../nginx/{php5-fpm => php-fpm}/joomla.tpl | 0 .../web/nginx/{php5-fpm => php-fpm}/modx.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/modx.tpl | 0 .../nginx/{php5-fpm => php-fpm}/moodle.stpl | 0 .../nginx/{php5-fpm => php-fpm}/moodle.tpl | 0 .../nginx/{php5-fpm => php-fpm}/no-php.stpl | 0 .../nginx/{php5-fpm => php-fpm}/no-php.tpl | 0 .../nginx/{php5-fpm => php-fpm}/owncloud.stpl | 0 .../nginx/{php5-fpm => php-fpm}/owncloud.tpl | 0 .../nginx/{php5-fpm => php-fpm}/piwik.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/piwik.tpl | 0 .../nginx/{php5-fpm => php-fpm}/pyrocms.stpl | 0 .../nginx/{php5-fpm => php-fpm}/pyrocms.tpl | 0 .../{php5-fpm => php-fpm}/wordpress.stpl | 0 .../nginx/{php5-fpm => php-fpm}/wordpress.tpl | 0 .../{php5-fpm => php-fpm}/wordpress2.stpl | 0 .../{php5-fpm => php-fpm}/wordpress2.tpl | 0 .../web/{php5-fpm => php-fpm}/default.tpl | 0 .../web/{php5-fpm => php-fpm}/no-php.tpl | 0 .../web/{php5-fpm => php-fpm}/socket.tpl | 0 .../13.04/{php5-fpm => php-fpm}/www.conf | 0 .../cms_made_simple.stpl | 0 .../{php5-fpm => php-fpm}/cms_made_simple.tpl | 0 .../{php5-fpm => php-fpm}/codeigniter2.stpl | 0 .../{php5-fpm => php-fpm}/codeigniter2.tpl | 0 .../{php5-fpm => php-fpm}/codeigniter3.stpl | 0 .../{php5-fpm => php-fpm}/codeigniter3.tpl | 0 .../datalife_engine.stpl | 0 .../{php5-fpm => php-fpm}/datalife_engine.tpl | 0 .../nginx/{php5-fpm => php-fpm}/default.stpl | 0 .../nginx/{php5-fpm => php-fpm}/default.tpl | 0 .../nginx/{php5-fpm => php-fpm}/dokuwiki.stpl | 0 .../nginx/{php5-fpm => php-fpm}/dokuwiki.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal6.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal6.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal7.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal7.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal8.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal8.tpl | 0 .../nginx/{php5-fpm => php-fpm}/joomla.stpl | 0 .../nginx/{php5-fpm => php-fpm}/joomla.tpl | 0 .../web/nginx/{php5-fpm => php-fpm}/modx.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/modx.tpl | 0 .../nginx/{php5-fpm => php-fpm}/moodle.stpl | 0 .../nginx/{php5-fpm => php-fpm}/moodle.tpl | 0 .../nginx/{php5-fpm => php-fpm}/no-php.stpl | 0 .../nginx/{php5-fpm => php-fpm}/no-php.tpl | 0 .../nginx/{php5-fpm => php-fpm}/owncloud.stpl | 0 .../nginx/{php5-fpm => php-fpm}/owncloud.tpl | 0 .../nginx/{php5-fpm => php-fpm}/piwik.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/piwik.tpl | 0 .../nginx/{php5-fpm => php-fpm}/pyrocms.stpl | 0 .../nginx/{php5-fpm => php-fpm}/pyrocms.tpl | 0 .../{php5-fpm => php-fpm}/wordpress.stpl | 0 .../nginx/{php5-fpm => php-fpm}/wordpress.tpl | 0 .../{php5-fpm => php-fpm}/wordpress2.stpl | 0 .../{php5-fpm => php-fpm}/wordpress2.tpl | 0 .../web/{php5-fpm => php-fpm}/default.tpl | 0 .../web/{php5-fpm => php-fpm}/no-php.tpl | 0 .../web/{php5-fpm => php-fpm}/socket.tpl | 0 .../13.10/{php5-fpm => php-fpm}/www.conf | 0 .../cms_made_simple.stpl | 0 .../{php5-fpm => php-fpm}/cms_made_simple.tpl | 0 .../{php5-fpm => php-fpm}/codeigniter2.stpl | 0 .../{php5-fpm => php-fpm}/codeigniter2.tpl | 0 .../{php5-fpm => php-fpm}/codeigniter3.stpl | 0 .../{php5-fpm => php-fpm}/codeigniter3.tpl | 0 .../datalife_engine.stpl | 0 .../{php5-fpm => php-fpm}/datalife_engine.tpl | 0 .../nginx/{php5-fpm => php-fpm}/default.stpl | 0 .../nginx/{php5-fpm => php-fpm}/default.tpl | 0 .../nginx/{php5-fpm => php-fpm}/dokuwiki.stpl | 0 .../nginx/{php5-fpm => php-fpm}/dokuwiki.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal6.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal6.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal7.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal7.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal8.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal8.tpl | 0 .../nginx/{php5-fpm => php-fpm}/joomla.stpl | 0 .../nginx/{php5-fpm => php-fpm}/joomla.tpl | 0 .../web/nginx/{php5-fpm => php-fpm}/modx.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/modx.tpl | 0 .../nginx/{php5-fpm => php-fpm}/moodle.stpl | 0 .../nginx/{php5-fpm => php-fpm}/moodle.tpl | 0 .../nginx/{php5-fpm => php-fpm}/no-php.stpl | 0 .../nginx/{php5-fpm => php-fpm}/no-php.tpl | 0 .../nginx/{php5-fpm => php-fpm}/owncloud.stpl | 0 .../nginx/{php5-fpm => php-fpm}/owncloud.tpl | 0 .../nginx/{php5-fpm => php-fpm}/piwik.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/piwik.tpl | 0 .../nginx/{php5-fpm => php-fpm}/pyrocms.stpl | 0 .../nginx/{php5-fpm => php-fpm}/pyrocms.tpl | 0 .../{php5-fpm => php-fpm}/wordpress.stpl | 0 .../nginx/{php5-fpm => php-fpm}/wordpress.tpl | 0 .../{php5-fpm => php-fpm}/wordpress2.stpl | 0 .../{php5-fpm => php-fpm}/wordpress2.tpl | 0 .../web/{php5-fpm => php-fpm}/default.tpl | 0 .../web/{php5-fpm => php-fpm}/no-php.tpl | 0 .../web/{php5-fpm => php-fpm}/socket.tpl | 0 .../14.04/{php5-fpm => php-fpm}/www.conf | 0 .../cms_made_simple.stpl | 0 .../{php5-fpm => php-fpm}/cms_made_simple.tpl | 0 .../{php5-fpm => php-fpm}/codeigniter2.stpl | 0 .../{php5-fpm => php-fpm}/codeigniter2.tpl | 0 .../{php5-fpm => php-fpm}/codeigniter3.stpl | 0 .../{php5-fpm => php-fpm}/codeigniter3.tpl | 0 .../datalife_engine.stpl | 0 .../{php5-fpm => php-fpm}/datalife_engine.tpl | 0 .../nginx/{php5-fpm => php-fpm}/default.stpl | 0 .../nginx/{php5-fpm => php-fpm}/default.tpl | 0 .../nginx/{php5-fpm => php-fpm}/dokuwiki.stpl | 0 .../nginx/{php5-fpm => php-fpm}/dokuwiki.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal6.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal6.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal7.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal7.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal8.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal8.tpl | 0 .../nginx/{php5-fpm => php-fpm}/joomla.stpl | 0 .../nginx/{php5-fpm => php-fpm}/joomla.tpl | 0 .../web/nginx/{php5-fpm => php-fpm}/modx.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/modx.tpl | 0 .../nginx/{php5-fpm => php-fpm}/moodle.stpl | 0 .../nginx/{php5-fpm => php-fpm}/moodle.tpl | 0 .../nginx/{php5-fpm => php-fpm}/no-php.stpl | 0 .../nginx/{php5-fpm => php-fpm}/no-php.tpl | 0 .../nginx/{php5-fpm => php-fpm}/opencart.tpl | 0 .../nginx/{php5-fpm => php-fpm}/owncloud.stpl | 0 .../nginx/{php5-fpm => php-fpm}/owncloud.tpl | 0 .../nginx/{php5-fpm => php-fpm}/piwik.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/piwik.tpl | 0 .../nginx/{php5-fpm => php-fpm}/pyrocms.stpl | 0 .../nginx/{php5-fpm => php-fpm}/pyrocms.tpl | 0 .../{php5-fpm => php-fpm}/wordpress.stpl | 0 .../nginx/{php5-fpm => php-fpm}/wordpress.tpl | 0 .../{php5-fpm => php-fpm}/wordpress2.stpl | 0 .../{php5-fpm => php-fpm}/wordpress2.tpl | 0 .../web/{php5-fpm => php-fpm}/default.tpl | 0 .../web/{php5-fpm => php-fpm}/no-php.tpl | 0 .../web/{php5-fpm => php-fpm}/socket.tpl | 0 .../14.10/{php5-fpm => php-fpm}/www.conf | 0 .../cms_made_simple.stpl | 0 .../{php5-fpm => php-fpm}/cms_made_simple.tpl | 0 .../{php5-fpm => php-fpm}/codeigniter2.stpl | 0 .../{php5-fpm => php-fpm}/codeigniter2.tpl | 0 .../{php5-fpm => php-fpm}/codeigniter3.stpl | 0 .../{php5-fpm => php-fpm}/codeigniter3.tpl | 0 .../datalife_engine.stpl | 0 .../{php5-fpm => php-fpm}/datalife_engine.tpl | 0 .../nginx/{php5-fpm => php-fpm}/default.stpl | 0 .../nginx/{php5-fpm => php-fpm}/default.tpl | 0 .../nginx/{php5-fpm => php-fpm}/dokuwiki.stpl | 0 .../nginx/{php5-fpm => php-fpm}/dokuwiki.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal6.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal6.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal7.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal7.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal8.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal8.tpl | 0 .../nginx/{php5-fpm => php-fpm}/joomla.stpl | 0 .../nginx/{php5-fpm => php-fpm}/joomla.tpl | 0 .../web/nginx/{php5-fpm => php-fpm}/modx.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/modx.tpl | 0 .../nginx/{php5-fpm => php-fpm}/moodle.stpl | 0 .../nginx/{php5-fpm => php-fpm}/moodle.tpl | 0 .../nginx/{php5-fpm => php-fpm}/no-php.stpl | 0 .../nginx/{php5-fpm => php-fpm}/no-php.tpl | 0 .../nginx/{php5-fpm => php-fpm}/owncloud.stpl | 0 .../nginx/{php5-fpm => php-fpm}/owncloud.tpl | 0 .../nginx/{php5-fpm => php-fpm}/piwik.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/piwik.tpl | 0 .../nginx/{php5-fpm => php-fpm}/pyrocms.stpl | 0 .../nginx/{php5-fpm => php-fpm}/pyrocms.tpl | 0 .../{php5-fpm => php-fpm}/wordpress.stpl | 0 .../nginx/{php5-fpm => php-fpm}/wordpress.tpl | 0 .../{php5-fpm => php-fpm}/wordpress2.stpl | 0 .../{php5-fpm => php-fpm}/wordpress2.tpl | 0 .../web/{php5-fpm => php-fpm}/default.tpl | 0 .../web/{php5-fpm => php-fpm}/no-php.tpl | 0 .../web/{php5-fpm => php-fpm}/socket.tpl | 0 .../15.04/{php5-fpm => php-fpm}/www.conf | 0 .../cms_made_simple.stpl | 0 .../{php5-fpm => php-fpm}/cms_made_simple.tpl | 0 .../{php5-fpm => php-fpm}/codeigniter2.stpl | 0 .../{php5-fpm => php-fpm}/codeigniter2.tpl | 0 .../{php5-fpm => php-fpm}/codeigniter3.stpl | 0 .../{php5-fpm => php-fpm}/codeigniter3.tpl | 0 .../datalife_engine.stpl | 0 .../{php5-fpm => php-fpm}/datalife_engine.tpl | 0 .../nginx/{php5-fpm => php-fpm}/default.stpl | 0 .../nginx/{php5-fpm => php-fpm}/default.tpl | 0 .../nginx/{php5-fpm => php-fpm}/dokuwiki.stpl | 0 .../nginx/{php5-fpm => php-fpm}/dokuwiki.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal6.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal6.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal7.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal7.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal8.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal8.tpl | 0 .../nginx/{php5-fpm => php-fpm}/joomla.stpl | 0 .../nginx/{php5-fpm => php-fpm}/joomla.tpl | 0 .../web/nginx/{php5-fpm => php-fpm}/modx.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/modx.tpl | 0 .../nginx/{php5-fpm => php-fpm}/moodle.stpl | 0 .../nginx/{php5-fpm => php-fpm}/moodle.tpl | 0 .../nginx/{php5-fpm => php-fpm}/no-php.stpl | 0 .../nginx/{php5-fpm => php-fpm}/no-php.tpl | 0 .../nginx/{php5-fpm => php-fpm}/owncloud.stpl | 0 .../nginx/{php5-fpm => php-fpm}/owncloud.tpl | 0 .../nginx/{php5-fpm => php-fpm}/piwik.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/piwik.tpl | 0 .../nginx/{php5-fpm => php-fpm}/pyrocms.stpl | 0 .../nginx/{php5-fpm => php-fpm}/pyrocms.tpl | 0 .../{php5-fpm => php-fpm}/wordpress.stpl | 0 .../nginx/{php5-fpm => php-fpm}/wordpress.tpl | 0 .../{php5-fpm => php-fpm}/wordpress2.stpl | 0 .../{php5-fpm => php-fpm}/wordpress2.tpl | 0 .../web/{php5-fpm => php-fpm}/default.tpl | 0 .../web/{php5-fpm => php-fpm}/no-php.tpl | 0 .../web/{php5-fpm => php-fpm}/socket.tpl | 0 .../15.10/{php5-fpm => php-fpm}/www.conf | 0 .../cms_made_simple.stpl | 0 .../{php5-fpm => php-fpm}/cms_made_simple.tpl | 0 .../{php5-fpm => php-fpm}/codeigniter2.stpl | 0 .../{php5-fpm => php-fpm}/codeigniter2.tpl | 0 .../{php5-fpm => php-fpm}/codeigniter3.stpl | 0 .../{php5-fpm => php-fpm}/codeigniter3.tpl | 0 .../datalife_engine.stpl | 0 .../{php5-fpm => php-fpm}/datalife_engine.tpl | 0 .../nginx/{php5-fpm => php-fpm}/default.stpl | 0 .../nginx/{php5-fpm => php-fpm}/default.tpl | 0 .../nginx/{php5-fpm => php-fpm}/dokuwiki.stpl | 0 .../nginx/{php5-fpm => php-fpm}/dokuwiki.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal6.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal6.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal7.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal7.tpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal8.stpl | 0 .../nginx/{php5-fpm => php-fpm}/drupal8.tpl | 0 .../nginx/{php5-fpm => php-fpm}/joomla.stpl | 0 .../nginx/{php5-fpm => php-fpm}/joomla.tpl | 0 .../web/nginx/{php5-fpm => php-fpm}/modx.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/modx.tpl | 0 .../nginx/{php5-fpm => php-fpm}/moodle.stpl | 0 .../nginx/{php5-fpm => php-fpm}/moodle.tpl | 0 .../nginx/{php5-fpm => php-fpm}/no-php.stpl | 0 .../nginx/{php5-fpm => php-fpm}/no-php.tpl | 0 .../nginx/{php5-fpm => php-fpm}/owncloud.stpl | 0 .../nginx/{php5-fpm => php-fpm}/owncloud.tpl | 0 .../nginx/{php5-fpm => php-fpm}/piwik.stpl | 0 .../web/nginx/{php5-fpm => php-fpm}/piwik.tpl | 0 .../nginx/{php5-fpm => php-fpm}/pyrocms.stpl | 0 .../nginx/{php5-fpm => php-fpm}/pyrocms.tpl | 0 .../{php5-fpm => php-fpm}/wordpress.stpl | 0 .../nginx/{php5-fpm => php-fpm}/wordpress.tpl | 0 .../{php5-fpm => php-fpm}/wordpress2.stpl | 0 .../{php5-fpm => php-fpm}/wordpress2.tpl | 0 .../web/{php5-fpm => php-fpm}/default.tpl | 0 .../web/{php5-fpm => php-fpm}/no-php.tpl | 0 .../web/{php5-fpm => php-fpm}/socket.tpl | 0 install/vst-install-ubuntu.sh | 56 +++++++++++++++---- 322 files changed, 44 insertions(+), 12 deletions(-) rename install/ubuntu/12.04/{php5-fpm => php-fpm}/www.conf (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.tpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.tpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.tpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.tpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/default.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.tpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.tpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.tpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.tpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/joomla.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/joomla.tpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/modx.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/modx.tpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/moodle.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/moodle.tpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/no-php.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.tpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/piwik.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/piwik.tpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.tpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.tpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.stpl (100%) rename install/ubuntu/12.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.tpl (100%) rename install/ubuntu/12.04/templates/web/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/12.04/templates/web/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/12.04/templates/web/{php5-fpm => php-fpm}/socket.tpl (100%) rename install/ubuntu/12.10/{php5-fpm => php-fpm}/www.conf (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.tpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.tpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.tpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.tpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/default.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.tpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.tpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.tpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.tpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/joomla.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/joomla.tpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/modx.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/modx.tpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/moodle.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/moodle.tpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/no-php.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.tpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/piwik.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/piwik.tpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.tpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.tpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.stpl (100%) rename install/ubuntu/12.10/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.tpl (100%) rename install/ubuntu/12.10/templates/web/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/12.10/templates/web/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/12.10/templates/web/{php5-fpm => php-fpm}/socket.tpl (100%) rename install/ubuntu/13.04/{php5-fpm => php-fpm}/www.conf (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.tpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.tpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.tpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.tpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/default.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.tpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.tpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.tpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.tpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/joomla.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/joomla.tpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/modx.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/modx.tpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/moodle.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/moodle.tpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/no-php.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.tpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/piwik.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/piwik.tpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.tpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.tpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.stpl (100%) rename install/ubuntu/13.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.tpl (100%) rename install/ubuntu/13.04/templates/web/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/13.04/templates/web/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/13.04/templates/web/{php5-fpm => php-fpm}/socket.tpl (100%) rename install/ubuntu/13.10/{php5-fpm => php-fpm}/www.conf (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.tpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.tpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.tpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.tpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/default.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.tpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.tpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.tpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.tpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/joomla.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/joomla.tpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/modx.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/modx.tpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/moodle.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/moodle.tpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/no-php.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.tpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/piwik.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/piwik.tpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.tpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.tpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.stpl (100%) rename install/ubuntu/13.10/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.tpl (100%) rename install/ubuntu/13.10/templates/web/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/13.10/templates/web/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/13.10/templates/web/{php5-fpm => php-fpm}/socket.tpl (100%) rename install/ubuntu/14.04/{php5-fpm => php-fpm}/www.conf (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/default.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/joomla.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/joomla.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/modx.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/modx.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/moodle.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/moodle.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/no-php.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/opencart.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/piwik.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/piwik.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.tpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.stpl (100%) rename install/ubuntu/14.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.tpl (100%) rename install/ubuntu/14.04/templates/web/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/14.04/templates/web/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/14.04/templates/web/{php5-fpm => php-fpm}/socket.tpl (100%) rename install/ubuntu/14.10/{php5-fpm => php-fpm}/www.conf (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.tpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.tpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.tpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.tpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/default.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.tpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.tpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.tpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.tpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/joomla.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/joomla.tpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/modx.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/modx.tpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/moodle.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/moodle.tpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/no-php.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.tpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/piwik.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/piwik.tpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.tpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.tpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.stpl (100%) rename install/ubuntu/14.10/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.tpl (100%) rename install/ubuntu/14.10/templates/web/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/14.10/templates/web/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/14.10/templates/web/{php5-fpm => php-fpm}/socket.tpl (100%) rename install/ubuntu/15.04/{php5-fpm => php-fpm}/www.conf (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.tpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.tpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.tpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.tpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/default.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.tpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.tpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.tpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.tpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/joomla.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/joomla.tpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/modx.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/modx.tpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/moodle.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/moodle.tpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/no-php.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.tpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/piwik.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/piwik.tpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.tpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.tpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.stpl (100%) rename install/ubuntu/15.04/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.tpl (100%) rename install/ubuntu/15.04/templates/web/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/15.04/templates/web/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/15.04/templates/web/{php5-fpm => php-fpm}/socket.tpl (100%) rename install/ubuntu/15.10/{php5-fpm => php-fpm}/www.conf (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/cms_made_simple.tpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter2.tpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/codeigniter3.tpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/datalife_engine.tpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/default.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/dokuwiki.tpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal6.tpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal7.tpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/drupal8.tpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/joomla.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/joomla.tpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/modx.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/modx.tpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/moodle.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/moodle.tpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/no-php.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/owncloud.tpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/piwik.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/piwik.tpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/pyrocms.tpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/wordpress.tpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.stpl (100%) rename install/ubuntu/15.10/templates/web/nginx/{php5-fpm => php-fpm}/wordpress2.tpl (100%) rename install/ubuntu/15.10/templates/web/{php5-fpm => php-fpm}/default.tpl (100%) rename install/ubuntu/15.10/templates/web/{php5-fpm => php-fpm}/no-php.tpl (100%) rename install/ubuntu/15.10/templates/web/{php5-fpm => php-fpm}/socket.tpl (100%) diff --git a/install/ubuntu/12.04/php5-fpm/www.conf b/install/ubuntu/12.04/php-fpm/www.conf similarity index 100% rename from install/ubuntu/12.04/php5-fpm/www.conf rename to install/ubuntu/12.04/php-fpm/www.conf diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/default.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/default.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.stpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.tpl rename to install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.tpl diff --git a/install/ubuntu/12.04/templates/web/php5-fpm/default.tpl b/install/ubuntu/12.04/templates/web/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/php5-fpm/default.tpl rename to install/ubuntu/12.04/templates/web/php-fpm/default.tpl diff --git a/install/ubuntu/12.04/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/12.04/templates/web/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/php5-fpm/no-php.tpl rename to install/ubuntu/12.04/templates/web/php-fpm/no-php.tpl diff --git a/install/ubuntu/12.04/templates/web/php5-fpm/socket.tpl b/install/ubuntu/12.04/templates/web/php-fpm/socket.tpl similarity index 100% rename from install/ubuntu/12.04/templates/web/php5-fpm/socket.tpl rename to install/ubuntu/12.04/templates/web/php-fpm/socket.tpl diff --git a/install/ubuntu/12.10/php5-fpm/www.conf b/install/ubuntu/12.10/php-fpm/www.conf similarity index 100% rename from install/ubuntu/12.10/php5-fpm/www.conf rename to install/ubuntu/12.10/php-fpm/www.conf diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/default.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/default.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.stpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.stpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.tpl rename to install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.tpl diff --git a/install/ubuntu/12.10/templates/web/php5-fpm/default.tpl b/install/ubuntu/12.10/templates/web/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/php5-fpm/default.tpl rename to install/ubuntu/12.10/templates/web/php-fpm/default.tpl diff --git a/install/ubuntu/12.10/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/12.10/templates/web/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/php5-fpm/no-php.tpl rename to install/ubuntu/12.10/templates/web/php-fpm/no-php.tpl diff --git a/install/ubuntu/12.10/templates/web/php5-fpm/socket.tpl b/install/ubuntu/12.10/templates/web/php-fpm/socket.tpl similarity index 100% rename from install/ubuntu/12.10/templates/web/php5-fpm/socket.tpl rename to install/ubuntu/12.10/templates/web/php-fpm/socket.tpl diff --git a/install/ubuntu/13.04/php5-fpm/www.conf b/install/ubuntu/13.04/php-fpm/www.conf similarity index 100% rename from install/ubuntu/13.04/php5-fpm/www.conf rename to install/ubuntu/13.04/php-fpm/www.conf diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/default.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/default.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.stpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.stpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.tpl rename to install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.tpl diff --git a/install/ubuntu/13.04/templates/web/php5-fpm/default.tpl b/install/ubuntu/13.04/templates/web/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/php5-fpm/default.tpl rename to install/ubuntu/13.04/templates/web/php-fpm/default.tpl diff --git a/install/ubuntu/13.04/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/13.04/templates/web/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/php5-fpm/no-php.tpl rename to install/ubuntu/13.04/templates/web/php-fpm/no-php.tpl diff --git a/install/ubuntu/13.04/templates/web/php5-fpm/socket.tpl b/install/ubuntu/13.04/templates/web/php-fpm/socket.tpl similarity index 100% rename from install/ubuntu/13.04/templates/web/php5-fpm/socket.tpl rename to install/ubuntu/13.04/templates/web/php-fpm/socket.tpl diff --git a/install/ubuntu/13.10/php5-fpm/www.conf b/install/ubuntu/13.10/php-fpm/www.conf similarity index 100% rename from install/ubuntu/13.10/php5-fpm/www.conf rename to install/ubuntu/13.10/php-fpm/www.conf diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/default.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/default.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.stpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.stpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.tpl rename to install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.tpl diff --git a/install/ubuntu/13.10/templates/web/php5-fpm/default.tpl b/install/ubuntu/13.10/templates/web/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/php5-fpm/default.tpl rename to install/ubuntu/13.10/templates/web/php-fpm/default.tpl diff --git a/install/ubuntu/13.10/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/13.10/templates/web/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/php5-fpm/no-php.tpl rename to install/ubuntu/13.10/templates/web/php-fpm/no-php.tpl diff --git a/install/ubuntu/13.10/templates/web/php5-fpm/socket.tpl b/install/ubuntu/13.10/templates/web/php-fpm/socket.tpl similarity index 100% rename from install/ubuntu/13.10/templates/web/php5-fpm/socket.tpl rename to install/ubuntu/13.10/templates/web/php-fpm/socket.tpl diff --git a/install/ubuntu/14.04/php5-fpm/www.conf b/install/ubuntu/14.04/php-fpm/www.conf similarity index 100% rename from install/ubuntu/14.04/php5-fpm/www.conf rename to install/ubuntu/14.04/php-fpm/www.conf diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/default.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/default.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/opencart.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/opencart.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/opencart.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/opencart.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.stpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.stpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.tpl rename to install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.tpl diff --git a/install/ubuntu/14.04/templates/web/php5-fpm/default.tpl b/install/ubuntu/14.04/templates/web/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/php5-fpm/default.tpl rename to install/ubuntu/14.04/templates/web/php-fpm/default.tpl diff --git a/install/ubuntu/14.04/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/14.04/templates/web/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/php5-fpm/no-php.tpl rename to install/ubuntu/14.04/templates/web/php-fpm/no-php.tpl diff --git a/install/ubuntu/14.04/templates/web/php5-fpm/socket.tpl b/install/ubuntu/14.04/templates/web/php-fpm/socket.tpl similarity index 100% rename from install/ubuntu/14.04/templates/web/php5-fpm/socket.tpl rename to install/ubuntu/14.04/templates/web/php-fpm/socket.tpl diff --git a/install/ubuntu/14.10/php5-fpm/www.conf b/install/ubuntu/14.10/php-fpm/www.conf similarity index 100% rename from install/ubuntu/14.10/php5-fpm/www.conf rename to install/ubuntu/14.10/php-fpm/www.conf diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/default.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/default.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.stpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.tpl rename to install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.tpl diff --git a/install/ubuntu/14.10/templates/web/php5-fpm/default.tpl b/install/ubuntu/14.10/templates/web/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/php5-fpm/default.tpl rename to install/ubuntu/14.10/templates/web/php-fpm/default.tpl diff --git a/install/ubuntu/14.10/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/14.10/templates/web/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/php5-fpm/no-php.tpl rename to install/ubuntu/14.10/templates/web/php-fpm/no-php.tpl diff --git a/install/ubuntu/14.10/templates/web/php5-fpm/socket.tpl b/install/ubuntu/14.10/templates/web/php-fpm/socket.tpl similarity index 100% rename from install/ubuntu/14.10/templates/web/php5-fpm/socket.tpl rename to install/ubuntu/14.10/templates/web/php-fpm/socket.tpl diff --git a/install/ubuntu/15.04/php5-fpm/www.conf b/install/ubuntu/15.04/php-fpm/www.conf similarity index 100% rename from install/ubuntu/15.04/php5-fpm/www.conf rename to install/ubuntu/15.04/php-fpm/www.conf diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/default.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/default.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.stpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.stpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.tpl rename to install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.tpl diff --git a/install/ubuntu/15.04/templates/web/php5-fpm/default.tpl b/install/ubuntu/15.04/templates/web/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/php5-fpm/default.tpl rename to install/ubuntu/15.04/templates/web/php-fpm/default.tpl diff --git a/install/ubuntu/15.04/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/15.04/templates/web/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/php5-fpm/no-php.tpl rename to install/ubuntu/15.04/templates/web/php-fpm/no-php.tpl diff --git a/install/ubuntu/15.04/templates/web/php5-fpm/socket.tpl b/install/ubuntu/15.04/templates/web/php-fpm/socket.tpl similarity index 100% rename from install/ubuntu/15.04/templates/web/php5-fpm/socket.tpl rename to install/ubuntu/15.04/templates/web/php-fpm/socket.tpl diff --git a/install/ubuntu/15.10/php5-fpm/www.conf b/install/ubuntu/15.10/php-fpm/www.conf similarity index 100% rename from install/ubuntu/15.10/php5-fpm/www.conf rename to install/ubuntu/15.10/php-fpm/www.conf diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/default.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/default.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.stpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.stpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.tpl rename to install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.tpl diff --git a/install/ubuntu/15.10/templates/web/php5-fpm/default.tpl b/install/ubuntu/15.10/templates/web/php-fpm/default.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/php5-fpm/default.tpl rename to install/ubuntu/15.10/templates/web/php-fpm/default.tpl diff --git a/install/ubuntu/15.10/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/15.10/templates/web/php-fpm/no-php.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/php5-fpm/no-php.tpl rename to install/ubuntu/15.10/templates/web/php-fpm/no-php.tpl diff --git a/install/ubuntu/15.10/templates/web/php5-fpm/socket.tpl b/install/ubuntu/15.10/templates/web/php-fpm/socket.tpl similarity index 100% rename from install/ubuntu/15.10/templates/web/php5-fpm/socket.tpl rename to install/ubuntu/15.10/templates/web/php-fpm/socket.tpl diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh index b5ac1aa7b..24ee6951e 100755 --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -17,7 +17,21 @@ os='ubuntu' release="$(lsb_release -r|awk '{print $2}')" codename="$(lsb_release -c|awk '{print $2}')" vestacp="http://$CHOST/$VERSION/$release" -software="nginx apache2 apache2-utils apache2.2-common + +if [ "$release" = '16.04' ]; then + software="nginx apache2 apache2-utils apache2.2-common + apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-rpaf + libapache2-mod-fcgid libapache2-mod-php php php-common php-cgi + php-mysql php-curl php-fpm php-pgsql awstats webalizer vsftpd + proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon + spamassassin dovecot-imapd dovecot-pop3d roundcube-core + roundcube-mysql roundcube-plugins mysql-server mysql-common + mysql-client postgresql postgresql-contrib phppgadmin phpmyadmin mc + flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota + e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils + bsdmainutils cron vesta vesta-nginx vesta-php expect" +else + software="nginx apache2 apache2-utils apache2.2-common apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-rpaf libapache2-mod-fcgid libapache2-mod-php5 php5 php5-common php5-cgi php5-mysql php5-curl php5-fpm php5-pgsql awstats webalizer vsftpd @@ -28,6 +42,7 @@ software="nginx apache2 apache2-utils apache2.2-common flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils bsdmainutils cron vesta vesta-nginx vesta-php expect" +fi # Defining help function help() { @@ -433,7 +448,7 @@ apt-key add deb_signing.key # Creating backup directory tree mkdir -p $vst_backups cd $vst_backups -mkdir nginx apache2 php5 php5-fpm vsftpd proftpd bind exim4 dovecot clamd +mkdir nginx apache2 php vsftpd proftpd bind exim4 dovecot clamd mkdir spamassassin mysql postgresql mongodb vesta # Backing up nginx configuration @@ -446,13 +461,10 @@ cp -r /etc/apache2/* $vst_backups/apache2 > /dev/null 2>&1 rm -f /etc/apache2/conf.d/* > /dev/null 2>&1 # Backing up PHP configuration -cp /etc/php.ini $vst_backups/php > /dev/null 2>&1 -cp -r /etc/php.d $vst_backups/php > /dev/null 2>&1 - -# Backing up PHP configuration +service php7.0-fpm stop >/dev/null 2>&1 service php5-fpm stop >/dev/null 2>&1 -cp /etc/php5/* $vst_backups/php5 > /dev/null 2>&1 -rm -f /etc/php5/fpm/pool.d/* >/dev/null 2>&1 +cp -r /etc/php5/* $vst_backups/php/ > /dev/null 2>&1 +cp -r /etc/php/* $vst_backups/php/ > /dev/null 2>&1 # Backing up Bind configuration service bind9 stop > /dev/null 2>&1 @@ -489,6 +501,12 @@ killall -9 mysqld > /dev/null 2>&1 mv /var/lib/mysql $vst_backups/mysql/mysql_datadir > /dev/null 2>&1 cp -r /etc/mysql/* $vst_backups/mysql > /dev/null 2>&1 mv -f /root/.my.cnf $vst_backups/mysql > /dev/null 2>&1 +if [ "$release" = '16.04' ] && [ -e '/etc/init.d/mysql' ]; then + mkdir -p /var/lib/mysql > /dev/null 2>&1 + chown mysql:mysql /var/lib/mysql + mysqld --initialize-insecure +fi + # Backup vesta service vesta stop > /dev/null 2>&1 @@ -519,9 +537,11 @@ if [ "$apache" = 'no' ]; then software=$(echo "$software" | sed -e "s/libapache2-mod-rpaf//") software=$(echo "$software" | sed -e "s/libapache2-mod-fcgid//") software=$(echo "$software" | sed -e "s/libapache2-mod-php5//") + software=$(echo "$software" | sed -e "s/libapache2-mod-php//") fi if [ "$phpfpm" = 'no' ]; then software=$(echo "$software" | sed -e "s/php5-fpm//") + software=$(echo "$software" | sed -e "s/php-fpm//") fi if [ "$vsftpd" = 'no' ]; then software=$(echo "$software" | sed -e "s/vsftpd//") @@ -557,11 +577,14 @@ if [ "$mysql" = 'no' ]; then software=$(echo "$software" | sed -e 's/mysql-common//') software=$(echo "$software" | sed -e 's/php5-mysql//') software=$(echo "$software" | sed -e 's/phpMyAdmin//') + software=$(echo "$software" | sed -e 's/php-mysql//') + software=$(echo "$software" | sed -e 's/phpmyadmin//') fi if [ "$postgresql" = 'no' ]; then software=$(echo "$software" | sed -e 's/postgresql-contrib//') software=$(echo "$software" | sed -e 's/postgresql//') software=$(echo "$software" | sed -e 's/php5-pgsql//') + software=$(echo "$software" | sed -e 's/php-pgsql//') software=$(echo "$software" | sed -e 's/phppgadmin//') fi if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then @@ -689,7 +712,7 @@ if [ "$apache" = 'no' ] && [ "$nginx" = 'yes' ]; then echo "WEB_SSL_PORT='443'" >> $VESTA/conf/vesta.conf echo "WEB_SSL='openssl'" >> $VESTA/conf/vesta.conf if [ "$phpfpm" = 'yes' ]; then - echo "WEB_BACKEND='php5-fpm'" >> $VESTA/conf/vesta.conf + echo "WEB_BACKEND='php-fpm'" >> $VESTA/conf/vesta.conf fi echo "STATS_SYSTEM='webalizer,awstats'" >> $VESTA/conf/vesta.conf fi @@ -845,9 +868,11 @@ fi #----------------------------------------------------------# if [ "$phpfpm" = 'yes' ]; then - wget $vestacp/php5-fpm/www.conf -O /etc/php5/fpm/pool.d/www.conf - update-rc.d php5-fpm defaults - service php5-fpm start + pool=$(find /etc/php* -type d \( -name "pool.d" -o -name "*fpm.d" \)) + wget $vestacp/php-fpm/www.conf -O $pool/www.conf + php_fpm=$(ls /usr/sbin/php*fpm* |cut -f 4 -d /) + update-rc.d $php_fpm defaults + service $php_fpm start check_result $? "php-fpm start failed" fi @@ -1067,8 +1092,15 @@ if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then mysql -e "CREATE DATABASE roundcube" mysql -e "GRANT ALL ON roundcube.* TO roundcube@localhost IDENTIFIED BY '$r'" sed -i "s/%password%/$r/g" /etc/roundcube/db.inc.php + + if [ "$release" = '16.04' ]; then + mv /etc/roundcube/db.inc.php /etc/roundcube/debian-db-roundcube.php + mv /etc/roundcube/main.inc.php /etc/roundcube/config.inc.php + fi + mysql roundcube < /usr/share/dbconfig-common/data/roundcube/install/mysql php5enmod mcrypt 2>/dev/null + phpenmod mcrypt 2>/dev/null service apache2 restart fi