From 757e06560266b99a7b09fe0b385a79fc544d6f16 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 21 Nov 2017 17:58:16 +0200 Subject: [PATCH] security fix / thanks to Christopher Tarquini --- bin/v-add-web-domain-stats-user | 16 ++++++++++++---- bin/v-delete-web-domain-stats-user | 13 +++++++++++-- bin/v-rebuild-web-domains | 2 +- .../web/nginx/php5-fpm/cms_made_simple.stpl | 2 +- .../web/nginx/php5-fpm/cms_made_simple.tpl | 2 +- .../web/nginx/php5-fpm/codeigniter2.stpl | 2 +- .../web/nginx/php5-fpm/codeigniter2.tpl | 2 +- .../web/nginx/php5-fpm/codeigniter3.stpl | 2 +- .../web/nginx/php5-fpm/codeigniter3.tpl | 2 +- .../web/nginx/php5-fpm/datalife_engine.stpl | 2 +- .../web/nginx/php5-fpm/datalife_engine.tpl | 2 +- .../templates/web/nginx/php5-fpm/default.stpl | 2 +- .../templates/web/nginx/php5-fpm/default.tpl | 2 +- .../web/nginx/php5-fpm/dokuwiki.stpl | 2 +- .../templates/web/nginx/php5-fpm/dokuwiki.tpl | 2 +- .../templates/web/nginx/php5-fpm/drupal6.stpl | 2 +- .../templates/web/nginx/php5-fpm/drupal6.tpl | 2 +- .../templates/web/nginx/php5-fpm/drupal7.stpl | 2 +- .../templates/web/nginx/php5-fpm/drupal7.tpl | 2 +- .../templates/web/nginx/php5-fpm/drupal8.stpl | 2 +- .../templates/web/nginx/php5-fpm/drupal8.tpl | 2 +- .../templates/web/nginx/php5-fpm/joomla.stpl | 2 +- .../7/templates/web/nginx/php5-fpm/joomla.tpl | 2 +- .../templates/web/nginx/php5-fpm/laravel.stpl | 2 +- .../templates/web/nginx/php5-fpm/laravel.tpl | 2 +- .../templates/web/nginx/php5-fpm/magento.stpl | 2 +- .../templates/web/nginx/php5-fpm/magento.tpl | 2 +- .../7/templates/web/nginx/php5-fpm/modx.stpl | 2 +- .../7/templates/web/nginx/php5-fpm/modx.tpl | 2 +- .../templates/web/nginx/php5-fpm/moodle.stpl | 2 +- .../7/templates/web/nginx/php5-fpm/moodle.tpl | 2 +- .../templates/web/nginx/php5-fpm/no-php.stpl | 2 +- .../7/templates/web/nginx/php5-fpm/no-php.tpl | 2 +- .../7/templates/web/nginx/php5-fpm/odoo.stpl | 2 +- .../7/templates/web/nginx/php5-fpm/odoo.tpl | 2 +- .../web/nginx/php5-fpm/owncloud.stpl | 2 +- .../templates/web/nginx/php5-fpm/owncloud.tpl | 2 +- .../7/templates/web/nginx/php5-fpm/piwik.stpl | 2 +- .../7/templates/web/nginx/php5-fpm/piwik.tpl | 2 +- .../templates/web/nginx/php5-fpm/pyrocms.stpl | 2 +- .../templates/web/nginx/php5-fpm/pyrocms.tpl | 2 +- .../web/nginx/php5-fpm/wordpress.stpl | 2 +- .../web/nginx/php5-fpm/wordpress.tpl | 2 +- .../web/nginx/php5-fpm/wordpress2.stpl | 2 +- .../web/nginx/php5-fpm/wordpress2.tpl | 2 +- .../web/nginx/php5-fpm/cms_made_simple.stpl | 2 +- .../web/nginx/php5-fpm/cms_made_simple.tpl | 2 +- .../web/nginx/php5-fpm/codeigniter2.stpl | 2 +- .../web/nginx/php5-fpm/codeigniter2.tpl | 2 +- .../web/nginx/php5-fpm/codeigniter3.stpl | 2 +- .../web/nginx/php5-fpm/codeigniter3.tpl | 2 +- .../web/nginx/php5-fpm/datalife_engine.stpl | 2 +- .../web/nginx/php5-fpm/datalife_engine.tpl | 2 +- .../templates/web/nginx/php5-fpm/default.stpl | 2 +- .../templates/web/nginx/php5-fpm/default.tpl | 2 +- .../web/nginx/php5-fpm/dokuwiki.stpl | 2 +- .../templates/web/nginx/php5-fpm/dokuwiki.tpl | 2 +- .../templates/web/nginx/php5-fpm/drupal6.stpl | 2 +- .../templates/web/nginx/php5-fpm/drupal6.tpl | 2 +- .../templates/web/nginx/php5-fpm/drupal7.stpl | 2 +- .../templates/web/nginx/php5-fpm/drupal7.tpl | 2 +- .../templates/web/nginx/php5-fpm/drupal8.stpl | 2 +- .../templates/web/nginx/php5-fpm/drupal8.tpl | 2 +- .../templates/web/nginx/php5-fpm/joomla.stpl | 2 +- .../8/templates/web/nginx/php5-fpm/joomla.tpl | 2 +- .../templates/web/nginx/php5-fpm/laravel.stpl | 2 +- .../templates/web/nginx/php5-fpm/laravel.tpl | 2 +- .../templates/web/nginx/php5-fpm/magento.stpl | 2 +- .../templates/web/nginx/php5-fpm/magento.tpl | 2 +- .../8/templates/web/nginx/php5-fpm/modx.stpl | 2 +- .../8/templates/web/nginx/php5-fpm/modx.tpl | 2 +- .../templates/web/nginx/php5-fpm/moodle.stpl | 2 +- .../8/templates/web/nginx/php5-fpm/moodle.tpl | 2 +- .../templates/web/nginx/php5-fpm/no-php.stpl | 2 +- .../8/templates/web/nginx/php5-fpm/no-php.tpl | 2 +- .../8/templates/web/nginx/php5-fpm/odoo.stpl | 2 +- .../8/templates/web/nginx/php5-fpm/odoo.tpl | 2 +- .../web/nginx/php5-fpm/owncloud.stpl | 2 +- .../templates/web/nginx/php5-fpm/owncloud.tpl | 2 +- .../8/templates/web/nginx/php5-fpm/piwik.stpl | 2 +- .../8/templates/web/nginx/php5-fpm/piwik.tpl | 2 +- .../templates/web/nginx/php5-fpm/pyrocms.stpl | 2 +- .../templates/web/nginx/php5-fpm/pyrocms.tpl | 2 +- .../web/nginx/php5-fpm/wordpress.stpl | 2 +- .../web/nginx/php5-fpm/wordpress.tpl | 2 +- .../web/nginx/php5-fpm/wordpress2.stpl | 2 +- .../web/nginx/php5-fpm/wordpress2.tpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.stpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.tpl | 2 +- .../web/nginx/php-fpm/codeigniter2.stpl | 2 +- .../web/nginx/php-fpm/codeigniter2.tpl | 2 +- .../web/nginx/php-fpm/codeigniter3.stpl | 2 +- .../web/nginx/php-fpm/codeigniter3.tpl | 2 +- .../web/nginx/php-fpm/datalife_engine.stpl | 2 +- .../web/nginx/php-fpm/datalife_engine.tpl | 2 +- .../templates/web/nginx/php-fpm/default.stpl | 2 +- .../5/templates/web/nginx/php-fpm/default.tpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.stpl | 2 +- .../5/templates/web/nginx/php-fpm/drupal6.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.stpl | 2 +- .../5/templates/web/nginx/php-fpm/drupal7.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.stpl | 2 +- .../5/templates/web/nginx/php-fpm/drupal8.tpl | 2 +- .../5/templates/web/nginx/php-fpm/joomla.stpl | 2 +- .../5/templates/web/nginx/php-fpm/joomla.tpl | 2 +- .../templates/web/nginx/php-fpm/laravel.stpl | 2 +- .../5/templates/web/nginx/php-fpm/laravel.tpl | 2 +- .../templates/web/nginx/php-fpm/magento.stpl | 2 +- .../5/templates/web/nginx/php-fpm/magento.tpl | 2 +- .../5/templates/web/nginx/php-fpm/modx.stpl | 2 +- .../5/templates/web/nginx/php-fpm/modx.tpl | 2 +- .../5/templates/web/nginx/php-fpm/moodle.stpl | 2 +- .../5/templates/web/nginx/php-fpm/moodle.tpl | 2 +- .../5/templates/web/nginx/php-fpm/no-php.stpl | 2 +- .../5/templates/web/nginx/php-fpm/no-php.tpl | 2 +- .../5/templates/web/nginx/php-fpm/odoo.stpl | 2 +- .../5/templates/web/nginx/php-fpm/odoo.tpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.stpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.tpl | 2 +- .../5/templates/web/nginx/php-fpm/piwik.stpl | 2 +- .../5/templates/web/nginx/php-fpm/piwik.tpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- .../5/templates/web/nginx/php-fpm/pyrocms.tpl | 2 +- .../web/nginx/php-fpm/wordpress.stpl | 2 +- .../templates/web/nginx/php-fpm/wordpress.tpl | 2 +- .../web/nginx/php-fpm/wordpress2.stpl | 2 +- .../web/nginx/php-fpm/wordpress2.tpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.stpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.tpl | 2 +- .../web/nginx/php-fpm/codeigniter2.stpl | 2 +- .../web/nginx/php-fpm/codeigniter2.tpl | 2 +- .../web/nginx/php-fpm/codeigniter3.stpl | 2 +- .../web/nginx/php-fpm/codeigniter3.tpl | 2 +- .../web/nginx/php-fpm/datalife_engine.stpl | 2 +- .../web/nginx/php-fpm/datalife_engine.tpl | 2 +- .../templates/web/nginx/php-fpm/default.stpl | 2 +- .../6/templates/web/nginx/php-fpm/default.tpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.stpl | 2 +- .../6/templates/web/nginx/php-fpm/drupal6.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.stpl | 2 +- .../6/templates/web/nginx/php-fpm/drupal7.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.stpl | 2 +- .../6/templates/web/nginx/php-fpm/drupal8.tpl | 2 +- .../6/templates/web/nginx/php-fpm/joomla.stpl | 2 +- .../6/templates/web/nginx/php-fpm/joomla.tpl | 2 +- .../templates/web/nginx/php-fpm/laravel.stpl | 2 +- .../6/templates/web/nginx/php-fpm/laravel.tpl | 2 +- .../templates/web/nginx/php-fpm/magento.stpl | 2 +- .../6/templates/web/nginx/php-fpm/magento.tpl | 2 +- .../6/templates/web/nginx/php-fpm/modx.stpl | 2 +- .../6/templates/web/nginx/php-fpm/modx.tpl | 2 +- .../6/templates/web/nginx/php-fpm/moodle.stpl | 2 +- .../6/templates/web/nginx/php-fpm/moodle.tpl | 2 +- .../6/templates/web/nginx/php-fpm/no-php.stpl | 2 +- .../6/templates/web/nginx/php-fpm/no-php.tpl | 2 +- .../6/templates/web/nginx/php-fpm/odoo.stpl | 2 +- .../6/templates/web/nginx/php-fpm/odoo.tpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.stpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.tpl | 2 +- .../6/templates/web/nginx/php-fpm/piwik.stpl | 2 +- .../6/templates/web/nginx/php-fpm/piwik.tpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- .../6/templates/web/nginx/php-fpm/pyrocms.tpl | 2 +- .../web/nginx/php-fpm/wordpress.stpl | 2 +- .../templates/web/nginx/php-fpm/wordpress.tpl | 2 +- .../web/nginx/php-fpm/wordpress2.stpl | 2 +- .../web/nginx/php-fpm/wordpress2.tpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.stpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.tpl | 2 +- .../web/nginx/php-fpm/codeigniter2.stpl | 2 +- .../web/nginx/php-fpm/codeigniter2.tpl | 2 +- .../web/nginx/php-fpm/codeigniter3.stpl | 2 +- .../web/nginx/php-fpm/codeigniter3.tpl | 2 +- .../web/nginx/php-fpm/datalife_engine.stpl | 2 +- .../web/nginx/php-fpm/datalife_engine.tpl | 2 +- .../templates/web/nginx/php-fpm/default.stpl | 2 +- .../7/templates/web/nginx/php-fpm/default.tpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.stpl | 2 +- .../7/templates/web/nginx/php-fpm/drupal6.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.stpl | 2 +- .../7/templates/web/nginx/php-fpm/drupal7.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.stpl | 2 +- .../7/templates/web/nginx/php-fpm/drupal8.tpl | 2 +- .../7/templates/web/nginx/php-fpm/joomla.stpl | 2 +- .../7/templates/web/nginx/php-fpm/joomla.tpl | 2 +- .../templates/web/nginx/php-fpm/laravel.stpl | 2 +- .../7/templates/web/nginx/php-fpm/laravel.tpl | 2 +- .../templates/web/nginx/php-fpm/magento.stpl | 2 +- .../7/templates/web/nginx/php-fpm/magento.tpl | 2 +- .../7/templates/web/nginx/php-fpm/modx.stpl | 2 +- .../7/templates/web/nginx/php-fpm/modx.tpl | 2 +- .../7/templates/web/nginx/php-fpm/moodle.stpl | 2 +- .../7/templates/web/nginx/php-fpm/moodle.tpl | 2 +- .../7/templates/web/nginx/php-fpm/no-php.stpl | 2 +- .../7/templates/web/nginx/php-fpm/no-php.tpl | 2 +- .../7/templates/web/nginx/php-fpm/odoo.stpl | 2 +- .../7/templates/web/nginx/php-fpm/odoo.tpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.stpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.tpl | 2 +- .../7/templates/web/nginx/php-fpm/piwik.stpl | 2 +- .../7/templates/web/nginx/php-fpm/piwik.tpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- .../7/templates/web/nginx/php-fpm/pyrocms.tpl | 2 +- .../web/nginx/php-fpm/wordpress.stpl | 2 +- .../templates/web/nginx/php-fpm/wordpress.tpl | 2 +- .../web/nginx/php-fpm/wordpress2.stpl | 2 +- .../web/nginx/php-fpm/wordpress2.tpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.stpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.tpl | 2 +- .../web/nginx/php-fpm/codeigniter2.stpl | 2 +- .../web/nginx/php-fpm/codeigniter2.tpl | 2 +- .../web/nginx/php-fpm/codeigniter3.stpl | 2 +- .../web/nginx/php-fpm/codeigniter3.tpl | 2 +- .../web/nginx/php-fpm/datalife_engine.stpl | 2 +- .../web/nginx/php-fpm/datalife_engine.tpl | 2 +- .../templates/web/nginx/php-fpm/default.stpl | 2 +- .../templates/web/nginx/php-fpm/default.tpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.tpl | 2 +- .../templates/web/nginx/php-fpm/joomla.stpl | 2 +- .../templates/web/nginx/php-fpm/joomla.tpl | 2 +- .../templates/web/nginx/php-fpm/laravel.stpl | 2 +- .../templates/web/nginx/php-fpm/laravel.tpl | 2 +- .../templates/web/nginx/php-fpm/magento.stpl | 2 +- .../templates/web/nginx/php-fpm/magento.tpl | 2 +- .../templates/web/nginx/php-fpm/modx.stpl | 2 +- .../templates/web/nginx/php-fpm/modx.tpl | 2 +- .../templates/web/nginx/php-fpm/moodle.stpl | 2 +- .../templates/web/nginx/php-fpm/moodle.tpl | 2 +- .../templates/web/nginx/php-fpm/no-php.stpl | 2 +- .../templates/web/nginx/php-fpm/no-php.tpl | 2 +- .../templates/web/nginx/php-fpm/odoo.stpl | 2 +- .../templates/web/nginx/php-fpm/odoo.tpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.stpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.tpl | 2 +- .../templates/web/nginx/php-fpm/piwik.stpl | 2 +- .../templates/web/nginx/php-fpm/piwik.tpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.tpl | 2 +- .../web/nginx/php-fpm/wordpress.stpl | 2 +- .../templates/web/nginx/php-fpm/wordpress.tpl | 2 +- .../web/nginx/php-fpm/wordpress2.stpl | 2 +- .../web/nginx/php-fpm/wordpress2.tpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.stpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.tpl | 2 +- .../web/nginx/php-fpm/codeigniter2.stpl | 2 +- .../web/nginx/php-fpm/codeigniter2.tpl | 2 +- .../web/nginx/php-fpm/codeigniter3.stpl | 2 +- .../web/nginx/php-fpm/codeigniter3.tpl | 2 +- .../web/nginx/php-fpm/datalife_engine.stpl | 2 +- .../web/nginx/php-fpm/datalife_engine.tpl | 2 +- .../templates/web/nginx/php-fpm/default.stpl | 2 +- .../templates/web/nginx/php-fpm/default.tpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.tpl | 2 +- .../templates/web/nginx/php-fpm/joomla.stpl | 2 +- .../templates/web/nginx/php-fpm/joomla.tpl | 2 +- .../templates/web/nginx/php-fpm/laravel.stpl | 2 +- .../templates/web/nginx/php-fpm/laravel.tpl | 2 +- .../templates/web/nginx/php-fpm/magento.stpl | 2 +- .../templates/web/nginx/php-fpm/magento.tpl | 2 +- .../templates/web/nginx/php-fpm/modx.stpl | 2 +- .../templates/web/nginx/php-fpm/modx.tpl | 2 +- .../templates/web/nginx/php-fpm/moodle.stpl | 2 +- .../templates/web/nginx/php-fpm/moodle.tpl | 2 +- .../templates/web/nginx/php-fpm/no-php.stpl | 2 +- .../templates/web/nginx/php-fpm/no-php.tpl | 2 +- .../templates/web/nginx/php-fpm/odoo.stpl | 2 +- .../templates/web/nginx/php-fpm/odoo.tpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.stpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.tpl | 2 +- .../templates/web/nginx/php-fpm/piwik.stpl | 2 +- .../templates/web/nginx/php-fpm/piwik.tpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.tpl | 2 +- .../web/nginx/php-fpm/wordpress.stpl | 2 +- .../templates/web/nginx/php-fpm/wordpress.tpl | 2 +- .../web/nginx/php-fpm/wordpress2.stpl | 2 +- .../web/nginx/php-fpm/wordpress2.tpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.stpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.tpl | 2 +- .../web/nginx/php-fpm/codeigniter2.stpl | 2 +- .../web/nginx/php-fpm/codeigniter2.tpl | 2 +- .../web/nginx/php-fpm/codeigniter3.stpl | 2 +- .../web/nginx/php-fpm/codeigniter3.tpl | 2 +- .../web/nginx/php-fpm/datalife_engine.stpl | 2 +- .../web/nginx/php-fpm/datalife_engine.tpl | 2 +- .../templates/web/nginx/php-fpm/default.stpl | 2 +- .../templates/web/nginx/php-fpm/default.tpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.tpl | 2 +- .../templates/web/nginx/php-fpm/joomla.stpl | 2 +- .../templates/web/nginx/php-fpm/joomla.tpl | 2 +- .../templates/web/nginx/php-fpm/laravel.stpl | 2 +- .../templates/web/nginx/php-fpm/laravel.tpl | 2 +- .../templates/web/nginx/php-fpm/magento.stpl | 2 +- .../templates/web/nginx/php-fpm/magento.tpl | 2 +- .../templates/web/nginx/php-fpm/modx.stpl | 2 +- .../templates/web/nginx/php-fpm/modx.tpl | 2 +- .../templates/web/nginx/php-fpm/moodle.stpl | 2 +- .../templates/web/nginx/php-fpm/moodle.tpl | 2 +- .../templates/web/nginx/php-fpm/no-php.stpl | 2 +- .../templates/web/nginx/php-fpm/no-php.tpl | 2 +- .../templates/web/nginx/php-fpm/odoo.stpl | 2 +- .../templates/web/nginx/php-fpm/odoo.tpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.stpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.tpl | 2 +- .../templates/web/nginx/php-fpm/piwik.stpl | 2 +- .../templates/web/nginx/php-fpm/piwik.tpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.tpl | 2 +- .../web/nginx/php-fpm/wordpress.stpl | 2 +- .../templates/web/nginx/php-fpm/wordpress.tpl | 2 +- .../web/nginx/php-fpm/wordpress2.stpl | 2 +- .../web/nginx/php-fpm/wordpress2.tpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.stpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.tpl | 2 +- .../web/nginx/php-fpm/codeigniter2.stpl | 2 +- .../web/nginx/php-fpm/codeigniter2.tpl | 2 +- .../web/nginx/php-fpm/codeigniter3.stpl | 2 +- .../web/nginx/php-fpm/codeigniter3.tpl | 2 +- .../web/nginx/php-fpm/datalife_engine.stpl | 2 +- .../web/nginx/php-fpm/datalife_engine.tpl | 2 +- .../templates/web/nginx/php-fpm/default.stpl | 2 +- .../templates/web/nginx/php-fpm/default.tpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.tpl | 2 +- .../templates/web/nginx/php-fpm/joomla.stpl | 2 +- .../templates/web/nginx/php-fpm/joomla.tpl | 2 +- .../templates/web/nginx/php-fpm/laravel.stpl | 2 +- .../templates/web/nginx/php-fpm/laravel.tpl | 2 +- .../templates/web/nginx/php-fpm/magento.stpl | 2 +- .../templates/web/nginx/php-fpm/magento.tpl | 2 +- .../templates/web/nginx/php-fpm/modx.stpl | 2 +- .../templates/web/nginx/php-fpm/modx.tpl | 2 +- .../templates/web/nginx/php-fpm/moodle.stpl | 2 +- .../templates/web/nginx/php-fpm/moodle.tpl | 2 +- .../templates/web/nginx/php-fpm/no-php.stpl | 2 +- .../templates/web/nginx/php-fpm/no-php.tpl | 2 +- .../templates/web/nginx/php-fpm/odoo.stpl | 2 +- .../templates/web/nginx/php-fpm/odoo.tpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.stpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.tpl | 2 +- .../templates/web/nginx/php-fpm/piwik.stpl | 2 +- .../templates/web/nginx/php-fpm/piwik.tpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.tpl | 2 +- .../web/nginx/php-fpm/wordpress.stpl | 2 +- .../templates/web/nginx/php-fpm/wordpress.tpl | 2 +- .../web/nginx/php-fpm/wordpress2.stpl | 2 +- .../web/nginx/php-fpm/wordpress2.tpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.stpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.tpl | 2 +- .../web/nginx/php-fpm/codeigniter2.stpl | 2 +- .../web/nginx/php-fpm/codeigniter2.tpl | 2 +- .../web/nginx/php-fpm/codeigniter3.stpl | 2 +- .../web/nginx/php-fpm/codeigniter3.tpl | 2 +- .../web/nginx/php-fpm/datalife_engine.stpl | 2 +- .../web/nginx/php-fpm/datalife_engine.tpl | 2 +- .../templates/web/nginx/php-fpm/default.stpl | 2 +- .../templates/web/nginx/php-fpm/default.tpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.tpl | 2 +- .../templates/web/nginx/php-fpm/joomla.stpl | 2 +- .../templates/web/nginx/php-fpm/joomla.tpl | 2 +- .../templates/web/nginx/php-fpm/laravel.stpl | 2 +- .../templates/web/nginx/php-fpm/laravel.tpl | 2 +- .../templates/web/nginx/php-fpm/magento.stpl | 2 +- .../templates/web/nginx/php-fpm/magento.tpl | 2 +- .../templates/web/nginx/php-fpm/modx.stpl | 2 +- .../templates/web/nginx/php-fpm/modx.tpl | 2 +- .../templates/web/nginx/php-fpm/moodle.stpl | 2 +- .../templates/web/nginx/php-fpm/moodle.tpl | 2 +- .../templates/web/nginx/php-fpm/no-php.stpl | 2 +- .../templates/web/nginx/php-fpm/no-php.tpl | 2 +- .../templates/web/nginx/php-fpm/odoo.stpl | 2 +- .../templates/web/nginx/php-fpm/odoo.tpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.stpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.tpl | 2 +- .../templates/web/nginx/php-fpm/piwik.stpl | 2 +- .../templates/web/nginx/php-fpm/piwik.tpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.tpl | 2 +- .../web/nginx/php-fpm/wordpress.stpl | 2 +- .../templates/web/nginx/php-fpm/wordpress.tpl | 2 +- .../web/nginx/php-fpm/wordpress2.stpl | 2 +- .../web/nginx/php-fpm/wordpress2.tpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.stpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.tpl | 2 +- .../web/nginx/php-fpm/codeigniter2.stpl | 2 +- .../web/nginx/php-fpm/codeigniter2.tpl | 2 +- .../web/nginx/php-fpm/codeigniter3.stpl | 2 +- .../web/nginx/php-fpm/codeigniter3.tpl | 2 +- .../web/nginx/php-fpm/datalife_engine.stpl | 2 +- .../web/nginx/php-fpm/datalife_engine.tpl | 2 +- .../templates/web/nginx/php-fpm/default.stpl | 2 +- .../templates/web/nginx/php-fpm/default.tpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.tpl | 2 +- .../templates/web/nginx/php-fpm/joomla.stpl | 2 +- .../templates/web/nginx/php-fpm/joomla.tpl | 2 +- .../templates/web/nginx/php-fpm/laravel.stpl | 2 +- .../templates/web/nginx/php-fpm/laravel.tpl | 2 +- .../templates/web/nginx/php-fpm/magento.stpl | 2 +- .../templates/web/nginx/php-fpm/magento.tpl | 2 +- .../templates/web/nginx/php-fpm/modx.stpl | 2 +- .../templates/web/nginx/php-fpm/modx.tpl | 2 +- .../templates/web/nginx/php-fpm/moodle.stpl | 2 +- .../templates/web/nginx/php-fpm/moodle.tpl | 2 +- .../templates/web/nginx/php-fpm/no-php.stpl | 2 +- .../templates/web/nginx/php-fpm/no-php.tpl | 2 +- .../templates/web/nginx/php-fpm/odoo.stpl | 2 +- .../templates/web/nginx/php-fpm/odoo.tpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.stpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.tpl | 2 +- .../templates/web/nginx/php-fpm/piwik.stpl | 2 +- .../templates/web/nginx/php-fpm/piwik.tpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.tpl | 2 +- .../web/nginx/php-fpm/wordpress.stpl | 2 +- .../templates/web/nginx/php-fpm/wordpress.tpl | 2 +- .../web/nginx/php-fpm/wordpress2.stpl | 2 +- .../web/nginx/php-fpm/wordpress2.tpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.stpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.tpl | 2 +- .../web/nginx/php-fpm/codeigniter2.stpl | 2 +- .../web/nginx/php-fpm/codeigniter2.tpl | 2 +- .../web/nginx/php-fpm/codeigniter3.stpl | 2 +- .../web/nginx/php-fpm/codeigniter3.tpl | 2 +- .../web/nginx/php-fpm/datalife_engine.stpl | 2 +- .../web/nginx/php-fpm/datalife_engine.tpl | 2 +- .../templates/web/nginx/php-fpm/default.stpl | 2 +- .../templates/web/nginx/php-fpm/default.tpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.tpl | 2 +- .../templates/web/nginx/php-fpm/joomla.stpl | 2 +- .../templates/web/nginx/php-fpm/joomla.tpl | 2 +- .../templates/web/nginx/php-fpm/laravel.stpl | 2 +- .../templates/web/nginx/php-fpm/laravel.tpl | 2 +- .../templates/web/nginx/php-fpm/magento.stpl | 2 +- .../templates/web/nginx/php-fpm/magento.tpl | 2 +- .../templates/web/nginx/php-fpm/modx.stpl | 2 +- .../templates/web/nginx/php-fpm/modx.tpl | 2 +- .../templates/web/nginx/php-fpm/moodle.stpl | 2 +- .../templates/web/nginx/php-fpm/moodle.tpl | 2 +- .../templates/web/nginx/php-fpm/no-php.stpl | 2 +- .../templates/web/nginx/php-fpm/no-php.tpl | 2 +- .../templates/web/nginx/php-fpm/odoo.stpl | 2 +- .../templates/web/nginx/php-fpm/odoo.tpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.stpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.tpl | 2 +- .../templates/web/nginx/php-fpm/piwik.stpl | 2 +- .../templates/web/nginx/php-fpm/piwik.tpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.tpl | 2 +- .../web/nginx/php-fpm/wordpress.stpl | 2 +- .../templates/web/nginx/php-fpm/wordpress.tpl | 2 +- .../web/nginx/php-fpm/wordpress2.stpl | 2 +- .../web/nginx/php-fpm/wordpress2.tpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.stpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.tpl | 2 +- .../web/nginx/php-fpm/codeigniter2.stpl | 2 +- .../web/nginx/php-fpm/codeigniter2.tpl | 2 +- .../web/nginx/php-fpm/codeigniter3.stpl | 2 +- .../web/nginx/php-fpm/codeigniter3.tpl | 2 +- .../web/nginx/php-fpm/datalife_engine.stpl | 2 +- .../web/nginx/php-fpm/datalife_engine.tpl | 2 +- .../templates/web/nginx/php-fpm/default.stpl | 2 +- .../templates/web/nginx/php-fpm/default.tpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.tpl | 2 +- .../templates/web/nginx/php-fpm/joomla.stpl | 2 +- .../templates/web/nginx/php-fpm/joomla.tpl | 2 +- .../templates/web/nginx/php-fpm/laravel.stpl | 2 +- .../templates/web/nginx/php-fpm/laravel.tpl | 2 +- .../templates/web/nginx/php-fpm/magento.stpl | 2 +- .../templates/web/nginx/php-fpm/magento.tpl | 2 +- .../templates/web/nginx/php-fpm/modx.stpl | 2 +- .../templates/web/nginx/php-fpm/modx.tpl | 2 +- .../templates/web/nginx/php-fpm/moodle.stpl | 2 +- .../templates/web/nginx/php-fpm/moodle.tpl | 2 +- .../templates/web/nginx/php-fpm/no-php.stpl | 2 +- .../templates/web/nginx/php-fpm/no-php.tpl | 2 +- .../templates/web/nginx/php-fpm/odoo.stpl | 2 +- .../templates/web/nginx/php-fpm/odoo.tpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.stpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.tpl | 2 +- .../templates/web/nginx/php-fpm/piwik.stpl | 2 +- .../templates/web/nginx/php-fpm/piwik.tpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.tpl | 2 +- .../web/nginx/php-fpm/wordpress.stpl | 2 +- .../templates/web/nginx/php-fpm/wordpress.tpl | 2 +- .../web/nginx/php-fpm/wordpress2.stpl | 2 +- .../web/nginx/php-fpm/wordpress2.tpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.stpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.tpl | 2 +- .../web/nginx/php-fpm/codeigniter2.stpl | 2 +- .../web/nginx/php-fpm/codeigniter2.tpl | 2 +- .../web/nginx/php-fpm/codeigniter3.stpl | 2 +- .../web/nginx/php-fpm/codeigniter3.tpl | 2 +- .../web/nginx/php-fpm/datalife_engine.stpl | 2 +- .../web/nginx/php-fpm/datalife_engine.tpl | 2 +- .../templates/web/nginx/php-fpm/default.stpl | 2 +- .../templates/web/nginx/php-fpm/default.tpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.tpl | 2 +- .../templates/web/nginx/php-fpm/joomla.stpl | 2 +- .../templates/web/nginx/php-fpm/joomla.tpl | 2 +- .../templates/web/nginx/php-fpm/laravel.stpl | 2 +- .../templates/web/nginx/php-fpm/laravel.tpl | 2 +- .../templates/web/nginx/php-fpm/magento.stpl | 2 +- .../templates/web/nginx/php-fpm/magento.tpl | 2 +- .../templates/web/nginx/php-fpm/modx.stpl | 2 +- .../templates/web/nginx/php-fpm/modx.tpl | 2 +- .../templates/web/nginx/php-fpm/moodle.stpl | 2 +- .../templates/web/nginx/php-fpm/moodle.tpl | 2 +- .../templates/web/nginx/php-fpm/no-php.stpl | 2 +- .../templates/web/nginx/php-fpm/no-php.tpl | 2 +- .../templates/web/nginx/php-fpm/odoo.stpl | 2 +- .../templates/web/nginx/php-fpm/odoo.tpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.stpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.tpl | 2 +- .../templates/web/nginx/php-fpm/piwik.stpl | 2 +- .../templates/web/nginx/php-fpm/piwik.tpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.tpl | 2 +- .../web/nginx/php-fpm/wordpress.stpl | 2 +- .../templates/web/nginx/php-fpm/wordpress.tpl | 2 +- .../web/nginx/php-fpm/wordpress2.stpl | 2 +- .../web/nginx/php-fpm/wordpress2.tpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.stpl | 2 +- .../web/nginx/php-fpm/cms_made_simple.tpl | 2 +- .../web/nginx/php-fpm/codeigniter2.stpl | 2 +- .../web/nginx/php-fpm/codeigniter2.tpl | 2 +- .../web/nginx/php-fpm/codeigniter3.stpl | 2 +- .../web/nginx/php-fpm/codeigniter3.tpl | 2 +- .../web/nginx/php-fpm/datalife_engine.stpl | 2 +- .../web/nginx/php-fpm/datalife_engine.tpl | 2 +- .../templates/web/nginx/php-fpm/default.stpl | 2 +- .../templates/web/nginx/php-fpm/default.tpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- .../templates/web/nginx/php-fpm/dokuwiki.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal6.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal7.tpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.stpl | 2 +- .../templates/web/nginx/php-fpm/drupal8.tpl | 2 +- .../templates/web/nginx/php-fpm/joomla.stpl | 2 +- .../templates/web/nginx/php-fpm/joomla.tpl | 2 +- .../templates/web/nginx/php-fpm/laravel.stpl | 2 +- .../templates/web/nginx/php-fpm/laravel.tpl | 2 +- .../templates/web/nginx/php-fpm/magento.stpl | 2 +- .../templates/web/nginx/php-fpm/magento.tpl | 2 +- .../templates/web/nginx/php-fpm/modx.stpl | 2 +- .../templates/web/nginx/php-fpm/modx.tpl | 2 +- .../templates/web/nginx/php-fpm/moodle.stpl | 2 +- .../templates/web/nginx/php-fpm/moodle.tpl | 2 +- .../templates/web/nginx/php-fpm/no-php.stpl | 2 +- .../templates/web/nginx/php-fpm/no-php.tpl | 2 +- .../templates/web/nginx/php-fpm/odoo.stpl | 2 +- .../templates/web/nginx/php-fpm/odoo.tpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.stpl | 2 +- .../templates/web/nginx/php-fpm/owncloud.tpl | 2 +- .../templates/web/nginx/php-fpm/piwik.stpl | 2 +- .../templates/web/nginx/php-fpm/piwik.tpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- .../templates/web/nginx/php-fpm/pyrocms.tpl | 2 +- .../web/nginx/php-fpm/wordpress.stpl | 2 +- .../templates/web/nginx/php-fpm/wordpress.tpl | 2 +- .../web/nginx/php-fpm/wordpress2.stpl | 2 +- .../web/nginx/php-fpm/wordpress2.tpl | 2 +- src/deb/vesta/postinst | 4 ++++ src/rpm/specs/vesta.spec | 3 +++ upd/fix_nginx_auth.sh | 19 +++++++++++++++++++ 636 files changed, 680 insertions(+), 637 deletions(-) create mode 100755 upd/fix_nginx_auth.sh diff --git a/bin/v-add-web-domain-stats-user b/bin/v-add-web-domain-stats-user index 7d7472e3..1de3ba59 100755 --- a/bin/v-add-web-domain-stats-user +++ b/bin/v-add-web-domain-stats-user @@ -1,6 +1,6 @@ #!/bin/bash # info: add password protection to web domain statistics -# options: USER DOMAIN STATS_USER STATS_PASSWORD +# options: USER DOMAIN STATS_USER STATS_PASSWORD [RESTART] # # The call is used for securing the web statistics page. @@ -14,6 +14,7 @@ user=$1 domain=$2 stats_user=$3 password=$4; HIDE=4 +restart=$5 # Includes source $VESTA/func/main.sh @@ -25,7 +26,7 @@ source $VESTA/conf/vesta.conf # Verifications # #----------------------------------------------------------# -check_args '4' "$#" 'USER DOMAIN STATS_USER STATS_PASS' +check_args '4' "$#" 'USER DOMAIN STATS_USER STATS_PASS [RESTART]' is_format_valid 'user' 'domain' 'stats_user' is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM' is_object_valid 'user' 'USER' "$user" @@ -41,11 +42,12 @@ is_password_valid # Defining statistic dir stats_dir="$HOMEDIR/$user/web/$domain/stats" +conf_dir="$HOMEDIR/$user/conf/web" # Adding htaccess file if [ "$WEB_SYSTEM" = 'nginx' ]; then - echo "auth_basic \"Web Statistics\";" > $stats_dir/auth.conf - echo "auth_basic_user_file $stats_dir/.htpasswd;" >> $stats_dir/auth.conf + echo "auth_basic \"Web Statistics\";" > $conf_dir/$domain.auth + echo "auth_basic_user_file $stats_dir/.htpasswd;" >> $conf_dir/$domain.auth else echo "AuthUserFile $stats_dir/.htpasswd" > $stats_dir/.htaccess echo "AuthName \"Web Statistics\"" >> $stats_dir/.htaccess @@ -67,6 +69,12 @@ echo "$stats_user:$stats_pass" > $stats_dir/.htpasswd update_object_value 'web' 'DOMAIN' "$domain" '$STATS_USER' "$stats_user" update_object_value 'web' 'DOMAIN' "$domain" '$STATS_CRYPT' "$stats_pass" +# Restarting web server +if [ "$WEB_SYSTEM" = 'nginx' ]; then + $BIN/v-restart-web $restart + check_result $? "Web restart failed" >/dev/null +fi + # Logging log_history "added password protection for web stats on $domain" log_event "$OK" "$ARGUMENTS" diff --git a/bin/v-delete-web-domain-stats-user b/bin/v-delete-web-domain-stats-user index c0067271..dd7a4f33 100755 --- a/bin/v-delete-web-domain-stats-user +++ b/bin/v-delete-web-domain-stats-user @@ -1,6 +1,6 @@ #!/bin/bash # info: disable webdomain stats authentication support -# options: USER DOMAIN +# options: USER DOMAIN [RESTART] # # The function removes authentication of statistics system. If the script is # called without naming a certain user, all users will be removed. After @@ -15,6 +15,7 @@ # Argument definition user=$1 domain=$(idn -t --quiet -u "$2" ) +restart=$3 # Includes source $VESTA/func/main.sh @@ -26,7 +27,7 @@ source $VESTA/conf/vesta.conf # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'USER DOMAIN' +check_args '2' "$#" 'USER DOMAIN [RESTART]' is_format_valid 'user' 'domain' is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM' is_object_valid 'user' 'USER' "$user" @@ -44,6 +45,14 @@ is_object_value_exist 'web' 'DOMAIN' "$domain" '$STATS_USER' rm -f $HOMEDIR/$user/web/$domain/stats/.htpasswd rm -f $HOMEDIR/$user/web/$domain/stats/.htaccess +# Deleting nginx auth config +if [ "$WEB_SYSTEM" = 'nginx' ]; then + conf_dir="$HOMEDIR/$user/conf/web" + rm -f $conf_dir/$domain.auth 2>/dev/null + $BIN/v-restart-web $restart + check_result $? "Web restart failed" >/dev/null +fi + #----------------------------------------------------------# # Vesta # diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains index fafcf602..0ffefc5c 100755 --- a/bin/v-rebuild-web-domains +++ b/bin/v-rebuild-web-domains @@ -61,7 +61,7 @@ fi for domain in $($BIN/v-list-web-domains $user plain |cut -f 1); do if [ ! -z "$WEB_BACKEND" ]; then template=$(get_object_value 'web' 'DOMAIN' "$domain" '$BACKEND') - $BIN/v-add-web-domain-backend $user $domain $template + $BIN/v-add-web-domain-backend $user $domain $template $restart fi rebuild_web_domain_conf done diff --git a/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl index 1a0a0451..2ea6dbfe 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl index 663ef0bc..c5180786 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl index ac6c3eb8..ef34746f 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -50,7 +50,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl index fa61e8dd..de811555 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -46,7 +46,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl index dd0637e1..de77cf0c 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl index 6c62cd48..edf6ef6d 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl index 25211612..7a780e6e 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -116,7 +116,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl index 4e16945b..a1653d6a 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -112,7 +112,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/default.stpl b/install/debian/7/templates/web/nginx/php5-fpm/default.stpl index cc10cbe1..1443d878 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/default.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/default.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/default.tpl b/install/debian/7/templates/web/nginx/php5-fpm/default.tpl index 85713579..0e734ec6 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/default.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/default.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl index c117c9f4..f12a9643 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -61,7 +61,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl index bf4b3051..413d49dd 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl index a3d06cf2..8a6d7f12 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl index b7010137..390c3e6e 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl index 9481aec0..1f7ce308 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl index a4376141..11e6555d 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl index 090dd842..a8ec9385 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl @@ -91,7 +91,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl index e564b5f3..ad4a6e07 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl @@ -88,7 +88,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl b/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl index 52bf3d32..d90af704 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl b/install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl index 8b4565e1..bbc4ecac 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl @@ -48,7 +48,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl b/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl index b6231476..112b668e 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/laravel.tpl b/install/debian/7/templates/web/nginx/php5-fpm/laravel.tpl index 5ef66f98..afcd44ca 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/laravel.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/laravel.tpl @@ -39,7 +39,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/magento.stpl b/install/debian/7/templates/web/nginx/php5-fpm/magento.stpl index 17528656..1f9aa2bd 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/magento.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/magento.stpl @@ -187,7 +187,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/magento.tpl b/install/debian/7/templates/web/nginx/php5-fpm/magento.tpl index 1a7e8118..d802868b 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/magento.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/magento.tpl @@ -183,7 +183,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl b/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl index c50118d2..21665b23 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/modx.tpl b/install/debian/7/templates/web/nginx/php5-fpm/modx.tpl index b37583d0..98200c35 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/modx.tpl @@ -54,7 +54,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl b/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl index 8c2dbc48..83b5f361 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl @@ -79,7 +79,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/moodle.tpl b/install/debian/7/templates/web/nginx/php5-fpm/moodle.tpl index 7fc741b6..d5b185f0 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/moodle.tpl @@ -76,7 +76,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl b/install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl index 9d40c9ed..0ba7a96c 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl @@ -36,7 +36,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl b/install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl index af6f8597..f525f4a2 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl @@ -32,7 +32,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/odoo.stpl b/install/debian/7/templates/web/nginx/php5-fpm/odoo.stpl index 422d2bf3..6dd5377e 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/odoo.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/odoo.stpl @@ -59,7 +59,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/odoo.tpl b/install/debian/7/templates/web/nginx/php5-fpm/odoo.tpl index c877f403..3eb67e4c 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/odoo.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/odoo.tpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl index ada6efb8..07e650bd 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl @@ -74,7 +74,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl index d0682ea4..cb26067c 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl @@ -70,7 +70,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl b/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl index 0eb7a514..b00b6cb1 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl @@ -62,7 +62,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl b/install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl index b52d29a2..05098e48 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl index abac91f4..9426dde2 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl index 89f4b3d2..65b99f51 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -51,7 +51,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl index cc10cbe1..1443d878 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl index 85713579..0e734ec6 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl index 9772e75b..bb3007b1 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl index d1350ed8..c5051eed 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl index 1a0a0451..2ea6dbfe 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl index 663ef0bc..c5180786 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl index ac6c3eb8..ef34746f 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -50,7 +50,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl index fa61e8dd..de811555 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -46,7 +46,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl index dd0637e1..de77cf0c 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl index 6c62cd48..edf6ef6d 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl index 25211612..7a780e6e 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -116,7 +116,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl index 4e16945b..a1653d6a 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -112,7 +112,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/default.stpl b/install/debian/8/templates/web/nginx/php5-fpm/default.stpl index cc10cbe1..1443d878 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/default.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/default.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/default.tpl b/install/debian/8/templates/web/nginx/php5-fpm/default.tpl index 85713579..0e734ec6 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/default.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/default.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl index c117c9f4..f12a9643 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -61,7 +61,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl index bf4b3051..413d49dd 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl index a3d06cf2..8a6d7f12 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl index b7010137..390c3e6e 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl index 9481aec0..1f7ce308 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl index a4376141..11e6555d 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl index 090dd842..a8ec9385 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl @@ -91,7 +91,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl index e564b5f3..ad4a6e07 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl @@ -88,7 +88,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl b/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl index 52bf3d32..d90af704 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl b/install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl index 8b4565e1..bbc4ecac 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl @@ -48,7 +48,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl b/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl index b6231476..112b668e 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/laravel.tpl b/install/debian/8/templates/web/nginx/php5-fpm/laravel.tpl index 5ef66f98..afcd44ca 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/laravel.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/laravel.tpl @@ -39,7 +39,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/magento.stpl b/install/debian/8/templates/web/nginx/php5-fpm/magento.stpl index 17528656..1f9aa2bd 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/magento.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/magento.stpl @@ -187,7 +187,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/magento.tpl b/install/debian/8/templates/web/nginx/php5-fpm/magento.tpl index 1a7e8118..d802868b 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/magento.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/magento.tpl @@ -183,7 +183,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl b/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl index c50118d2..21665b23 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/modx.tpl b/install/debian/8/templates/web/nginx/php5-fpm/modx.tpl index b37583d0..98200c35 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/modx.tpl @@ -54,7 +54,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl b/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl index 8c2dbc48..83b5f361 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl @@ -79,7 +79,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/moodle.tpl b/install/debian/8/templates/web/nginx/php5-fpm/moodle.tpl index 7fc741b6..d5b185f0 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/moodle.tpl @@ -76,7 +76,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl b/install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl index 9d40c9ed..0ba7a96c 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl @@ -36,7 +36,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl b/install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl index af6f8597..f525f4a2 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl @@ -32,7 +32,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/odoo.stpl b/install/debian/8/templates/web/nginx/php5-fpm/odoo.stpl index 422d2bf3..6dd5377e 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/odoo.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/odoo.stpl @@ -59,7 +59,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/odoo.tpl b/install/debian/8/templates/web/nginx/php5-fpm/odoo.tpl index c877f403..3eb67e4c 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/odoo.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/odoo.tpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl index ada6efb8..07e650bd 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl @@ -74,7 +74,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl index d0682ea4..cb26067c 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl @@ -70,7 +70,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl b/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl index 0eb7a514..b00b6cb1 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl @@ -62,7 +62,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl b/install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl index b52d29a2..05098e48 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl index abac91f4..9426dde2 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl index 89f4b3d2..65b99f51 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -51,7 +51,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl index cc10cbe1..1443d878 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl index 85713579..0e734ec6 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl index 9772e75b..bb3007b1 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl index d1350ed8..c5051eed 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl index 1a0a0451..2ea6dbfe 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl index 663ef0bc..c5180786 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl index ac6c3eb8..ef34746f 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -50,7 +50,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl index fa61e8dd..de811555 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -46,7 +46,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl index dd0637e1..de77cf0c 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl index 6c62cd48..edf6ef6d 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl index 25211612..7a780e6e 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -116,7 +116,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl index 4e16945b..a1653d6a 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -112,7 +112,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/default.stpl b/install/rhel/5/templates/web/nginx/php-fpm/default.stpl index cc10cbe1..1443d878 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/default.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/default.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/default.tpl b/install/rhel/5/templates/web/nginx/php-fpm/default.tpl index 85713579..0e734ec6 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/default.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/default.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl index c117c9f4..f12a9643 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -61,7 +61,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl index bf4b3051..413d49dd 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl index a3d06cf2..8a6d7f12 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl index b7010137..390c3e6e 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl index 9481aec0..1f7ce308 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl index a4376141..11e6555d 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl index 090dd842..a8ec9385 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl @@ -91,7 +91,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl index e564b5f3..ad4a6e07 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl @@ -88,7 +88,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl b/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl index 52bf3d32..d90af704 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl b/install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl index 8b4565e1..bbc4ecac 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl @@ -48,7 +48,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl b/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl index b6231476..112b668e 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/laravel.tpl b/install/rhel/5/templates/web/nginx/php-fpm/laravel.tpl index 5ef66f98..afcd44ca 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/laravel.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/laravel.tpl @@ -39,7 +39,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/magento.stpl b/install/rhel/5/templates/web/nginx/php-fpm/magento.stpl index 17528656..1f9aa2bd 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/magento.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/magento.stpl @@ -187,7 +187,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/magento.tpl b/install/rhel/5/templates/web/nginx/php-fpm/magento.tpl index 1a7e8118..d802868b 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/magento.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/magento.tpl @@ -183,7 +183,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl b/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl index c50118d2..21665b23 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/modx.tpl b/install/rhel/5/templates/web/nginx/php-fpm/modx.tpl index b37583d0..98200c35 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/modx.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/modx.tpl @@ -54,7 +54,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl b/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl index 8c2dbc48..83b5f361 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl @@ -79,7 +79,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/moodle.tpl b/install/rhel/5/templates/web/nginx/php-fpm/moodle.tpl index 7fc741b6..d5b185f0 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/moodle.tpl @@ -76,7 +76,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/no-php.stpl b/install/rhel/5/templates/web/nginx/php-fpm/no-php.stpl index 9d40c9ed..0ba7a96c 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/no-php.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/no-php.stpl @@ -36,7 +36,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/no-php.tpl b/install/rhel/5/templates/web/nginx/php-fpm/no-php.tpl index af6f8597..f525f4a2 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/no-php.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/no-php.tpl @@ -32,7 +32,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/odoo.stpl b/install/rhel/5/templates/web/nginx/php-fpm/odoo.stpl index 422d2bf3..6dd5377e 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/odoo.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/odoo.stpl @@ -59,7 +59,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/odoo.tpl b/install/rhel/5/templates/web/nginx/php-fpm/odoo.tpl index c877f403..3eb67e4c 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/odoo.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/odoo.tpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl index ada6efb8..07e650bd 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl @@ -74,7 +74,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl index d0682ea4..cb26067c 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl @@ -70,7 +70,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl b/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl index 0eb7a514..b00b6cb1 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl @@ -62,7 +62,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl b/install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl index b52d29a2..05098e48 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl index abac91f4..9426dde2 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl index 89f4b3d2..65b99f51 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl @@ -51,7 +51,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl index cc10cbe1..1443d878 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl index 85713579..0e734ec6 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl index 9772e75b..bb3007b1 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl index d1350ed8..c5051eed 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl index 1a0a0451..2ea6dbfe 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.tpl index 663ef0bc..c5180786 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl index ac6c3eb8..ef34746f 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -50,7 +50,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl index fa61e8dd..de811555 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -46,7 +46,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl index dd0637e1..de77cf0c 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl index 6c62cd48..edf6ef6d 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl index 25211612..7a780e6e 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -116,7 +116,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.tpl index 4e16945b..a1653d6a 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -112,7 +112,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/default.stpl b/install/rhel/6/templates/web/nginx/php-fpm/default.stpl index cc10cbe1..1443d878 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/default.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/default.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/default.tpl b/install/rhel/6/templates/web/nginx/php-fpm/default.tpl index 85713579..0e734ec6 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/default.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/default.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl index c117c9f4..f12a9643 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -61,7 +61,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl index bf4b3051..413d49dd 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl index a3d06cf2..8a6d7f12 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl index b7010137..390c3e6e 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl index 9481aec0..1f7ce308 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl index a4376141..11e6555d 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl index 090dd842..a8ec9385 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl @@ -91,7 +91,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl index e564b5f3..ad4a6e07 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl @@ -88,7 +88,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl b/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl index 52bf3d32..d90af704 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl b/install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl index 8b4565e1..bbc4ecac 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl @@ -48,7 +48,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl b/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl index b6231476..112b668e 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl b/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl index 5ef66f98..afcd44ca 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl @@ -39,7 +39,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/magento.stpl b/install/rhel/6/templates/web/nginx/php-fpm/magento.stpl index 17528656..1f9aa2bd 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/magento.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/magento.stpl @@ -187,7 +187,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/magento.tpl b/install/rhel/6/templates/web/nginx/php-fpm/magento.tpl index 1a7e8118..d802868b 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/magento.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/magento.tpl @@ -183,7 +183,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl b/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl index c50118d2..21665b23 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/modx.tpl b/install/rhel/6/templates/web/nginx/php-fpm/modx.tpl index b37583d0..98200c35 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/modx.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/modx.tpl @@ -54,7 +54,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl b/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl index 8c2dbc48..83b5f361 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl @@ -79,7 +79,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/moodle.tpl b/install/rhel/6/templates/web/nginx/php-fpm/moodle.tpl index 7fc741b6..d5b185f0 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/moodle.tpl @@ -76,7 +76,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/no-php.stpl b/install/rhel/6/templates/web/nginx/php-fpm/no-php.stpl index 9d40c9ed..0ba7a96c 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/no-php.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/no-php.stpl @@ -36,7 +36,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/no-php.tpl b/install/rhel/6/templates/web/nginx/php-fpm/no-php.tpl index af6f8597..f525f4a2 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/no-php.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/no-php.tpl @@ -32,7 +32,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/odoo.stpl b/install/rhel/6/templates/web/nginx/php-fpm/odoo.stpl index 422d2bf3..6dd5377e 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/odoo.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/odoo.stpl @@ -59,7 +59,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/odoo.tpl b/install/rhel/6/templates/web/nginx/php-fpm/odoo.tpl index c877f403..3eb67e4c 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/odoo.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/odoo.tpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl index ada6efb8..07e650bd 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl @@ -74,7 +74,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl index d0682ea4..cb26067c 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl @@ -70,7 +70,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl b/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl index 0eb7a514..b00b6cb1 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl @@ -62,7 +62,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl b/install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl index b52d29a2..05098e48 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl index abac91f4..9426dde2 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl index 89f4b3d2..65b99f51 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl @@ -51,7 +51,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl index cc10cbe1..1443d878 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl index 85713579..0e734ec6 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl index 9772e75b..bb3007b1 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl index d1350ed8..c5051eed 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl index 1a0a0451..2ea6dbfe 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.tpl index 663ef0bc..c5180786 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl index ac6c3eb8..ef34746f 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -50,7 +50,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl index fa61e8dd..de811555 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -46,7 +46,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl index dd0637e1..de77cf0c 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl index 6c62cd48..edf6ef6d 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl index 25211612..7a780e6e 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -116,7 +116,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.tpl index 4e16945b..a1653d6a 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -112,7 +112,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/default.stpl b/install/rhel/7/templates/web/nginx/php-fpm/default.stpl index cc10cbe1..1443d878 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/default.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/default.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/default.tpl b/install/rhel/7/templates/web/nginx/php-fpm/default.tpl index 85713579..0e734ec6 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/default.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/default.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl index c117c9f4..f12a9643 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -61,7 +61,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl index bf4b3051..413d49dd 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl index a3d06cf2..8a6d7f12 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl index b7010137..390c3e6e 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl index 9481aec0..1f7ce308 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl index a4376141..11e6555d 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl index 090dd842..a8ec9385 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl @@ -91,7 +91,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl index e564b5f3..ad4a6e07 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl @@ -88,7 +88,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl b/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl index 52bf3d32..d90af704 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl b/install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl index 8b4565e1..bbc4ecac 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl @@ -48,7 +48,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl b/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl index b6231476..112b668e 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/laravel.tpl b/install/rhel/7/templates/web/nginx/php-fpm/laravel.tpl index 5ef66f98..afcd44ca 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/laravel.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/laravel.tpl @@ -39,7 +39,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/magento.stpl b/install/rhel/7/templates/web/nginx/php-fpm/magento.stpl index 17528656..1f9aa2bd 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/magento.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/magento.stpl @@ -187,7 +187,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/magento.tpl b/install/rhel/7/templates/web/nginx/php-fpm/magento.tpl index 1a7e8118..d802868b 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/magento.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/magento.tpl @@ -183,7 +183,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl b/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl index c50118d2..21665b23 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/modx.tpl b/install/rhel/7/templates/web/nginx/php-fpm/modx.tpl index b37583d0..98200c35 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/modx.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/modx.tpl @@ -54,7 +54,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl b/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl index 8c2dbc48..83b5f361 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl @@ -79,7 +79,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/moodle.tpl b/install/rhel/7/templates/web/nginx/php-fpm/moodle.tpl index 7fc741b6..d5b185f0 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/moodle.tpl @@ -76,7 +76,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/no-php.stpl b/install/rhel/7/templates/web/nginx/php-fpm/no-php.stpl index 9d40c9ed..0ba7a96c 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/no-php.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/no-php.stpl @@ -36,7 +36,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/no-php.tpl b/install/rhel/7/templates/web/nginx/php-fpm/no-php.tpl index af6f8597..f525f4a2 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/no-php.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/no-php.tpl @@ -32,7 +32,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/odoo.stpl b/install/rhel/7/templates/web/nginx/php-fpm/odoo.stpl index 422d2bf3..6dd5377e 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/odoo.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/odoo.stpl @@ -59,7 +59,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/odoo.tpl b/install/rhel/7/templates/web/nginx/php-fpm/odoo.tpl index c877f403..3eb67e4c 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/odoo.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/odoo.tpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl index ada6efb8..07e650bd 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl @@ -74,7 +74,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl index d0682ea4..cb26067c 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl @@ -70,7 +70,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl b/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl index 0eb7a514..b00b6cb1 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl @@ -62,7 +62,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl b/install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl index b52d29a2..05098e48 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl index abac91f4..9426dde2 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl index 89f4b3d2..65b99f51 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl @@ -51,7 +51,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl index cc10cbe1..1443d878 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl index 85713579..0e734ec6 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl index 9772e75b..bb3007b1 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl index d1350ed8..c5051eed 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.stpl index 1a0a0451..2ea6dbfe 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.tpl index 663ef0bc..c5180786 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.stpl index ac6c3eb8..ef34746f 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -50,7 +50,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.tpl index fa61e8dd..de811555 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -46,7 +46,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.stpl index dd0637e1..de77cf0c 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.tpl index 6c62cd48..edf6ef6d 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.stpl index 25211612..7a780e6e 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -116,7 +116,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.tpl index 4e16945b..a1653d6a 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -112,7 +112,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.stpl index cc10cbe1..1443d878 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.tpl index 85713579..0e734ec6 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.stpl index c117c9f4..f12a9643 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -61,7 +61,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.tpl index bf4b3051..413d49dd 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl index a3d06cf2..8a6d7f12 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.tpl index b7010137..390c3e6e 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl index 9481aec0..1f7ce308 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.tpl index a4376141..11e6555d 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl index 090dd842..a8ec9385 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl @@ -91,7 +91,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.tpl index e564b5f3..ad4a6e07 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.tpl @@ -88,7 +88,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.stpl index 52bf3d32..d90af704 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.stpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.tpl index 8b4565e1..bbc4ecac 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.tpl @@ -48,7 +48,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl index b6231476..112b668e 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.tpl index 5ef66f98..afcd44ca 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.tpl @@ -39,7 +39,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.stpl index 17528656..1f9aa2bd 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.stpl @@ -187,7 +187,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.tpl index 1a7e8118..d802868b 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.tpl @@ -183,7 +183,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.stpl index c50118d2..21665b23 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.stpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.tpl index b37583d0..98200c35 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.tpl @@ -54,7 +54,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.stpl index 8c2dbc48..83b5f361 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.stpl @@ -79,7 +79,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.tpl index 7fc741b6..d5b185f0 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.tpl @@ -76,7 +76,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.stpl index 9d40c9ed..0ba7a96c 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.stpl @@ -36,7 +36,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.tpl index af6f8597..f525f4a2 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.tpl @@ -32,7 +32,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/odoo.stpl index 422d2bf3..6dd5377e 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/odoo.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/odoo.stpl @@ -59,7 +59,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/odoo.tpl index c877f403..3eb67e4c 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/odoo.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/odoo.tpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.stpl index ada6efb8..07e650bd 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.stpl @@ -74,7 +74,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.tpl index d0682ea4..cb26067c 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.tpl @@ -70,7 +70,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.stpl index 0eb7a514..b00b6cb1 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.stpl @@ -62,7 +62,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.tpl index b52d29a2..05098e48 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.tpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl index abac91f4..9426dde2 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl index 89f4b3d2..65b99f51 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl @@ -51,7 +51,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.stpl index cc10cbe1..1443d878 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.tpl index 85713579..0e734ec6 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl index 9772e75b..bb3007b1 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.tpl index d1350ed8..c5051eed 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.tpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.stpl index 1a0a0451..2ea6dbfe 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.tpl index 663ef0bc..c5180786 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.stpl index ac6c3eb8..ef34746f 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -50,7 +50,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.tpl index fa61e8dd..de811555 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -46,7 +46,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.stpl index dd0637e1..de77cf0c 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.tpl index 6c62cd48..edf6ef6d 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.stpl index 25211612..7a780e6e 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -116,7 +116,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.tpl index 4e16945b..a1653d6a 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -112,7 +112,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.stpl index cc10cbe1..1443d878 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.tpl index 85713579..0e734ec6 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.stpl index c117c9f4..f12a9643 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -61,7 +61,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.tpl index bf4b3051..413d49dd 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl index a3d06cf2..8a6d7f12 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.tpl index b7010137..390c3e6e 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl index 9481aec0..1f7ce308 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.tpl index a4376141..11e6555d 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl index 090dd842..a8ec9385 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl @@ -91,7 +91,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.tpl index e564b5f3..ad4a6e07 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.tpl @@ -88,7 +88,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.stpl index 52bf3d32..d90af704 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.stpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.tpl index 8b4565e1..bbc4ecac 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.tpl @@ -48,7 +48,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl index b6231476..112b668e 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.tpl index 5ef66f98..afcd44ca 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.tpl @@ -39,7 +39,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.stpl index 17528656..1f9aa2bd 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.stpl @@ -187,7 +187,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.tpl index 1a7e8118..d802868b 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.tpl @@ -183,7 +183,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.stpl index c50118d2..21665b23 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.stpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.tpl index b37583d0..98200c35 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.tpl @@ -54,7 +54,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.stpl index 8c2dbc48..83b5f361 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.stpl @@ -79,7 +79,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.tpl index 7fc741b6..d5b185f0 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.tpl @@ -76,7 +76,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.stpl index 9d40c9ed..0ba7a96c 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.stpl @@ -36,7 +36,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.tpl index af6f8597..f525f4a2 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.tpl @@ -32,7 +32,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/odoo.stpl index 422d2bf3..6dd5377e 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/odoo.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/odoo.stpl @@ -59,7 +59,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/odoo.tpl index c877f403..3eb67e4c 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/odoo.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/odoo.tpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.stpl index ada6efb8..07e650bd 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.stpl @@ -74,7 +74,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.tpl index d0682ea4..cb26067c 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.tpl @@ -70,7 +70,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.stpl index 0eb7a514..b00b6cb1 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.stpl @@ -62,7 +62,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.tpl index b52d29a2..05098e48 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.tpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl index abac91f4..9426dde2 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl index 89f4b3d2..65b99f51 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl @@ -51,7 +51,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.stpl index cc10cbe1..1443d878 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.tpl index 85713579..0e734ec6 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.stpl index 9772e75b..bb3007b1 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.stpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.tpl index d1350ed8..c5051eed 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.tpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.stpl index 1a0a0451..2ea6dbfe 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.tpl index 663ef0bc..c5180786 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.stpl index ac6c3eb8..ef34746f 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -50,7 +50,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.tpl index fa61e8dd..de811555 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -46,7 +46,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.stpl index dd0637e1..de77cf0c 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.tpl index 6c62cd48..edf6ef6d 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.stpl index 25211612..7a780e6e 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -116,7 +116,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.tpl index 4e16945b..a1653d6a 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -112,7 +112,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.stpl index cc10cbe1..1443d878 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.tpl index 85713579..0e734ec6 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.stpl index c117c9f4..f12a9643 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -61,7 +61,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.tpl index bf4b3051..413d49dd 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl index a3d06cf2..8a6d7f12 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.tpl index b7010137..390c3e6e 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl index 9481aec0..1f7ce308 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.tpl index a4376141..11e6555d 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl index 090dd842..a8ec9385 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl @@ -91,7 +91,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.tpl index e564b5f3..ad4a6e07 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.tpl @@ -88,7 +88,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.stpl index 52bf3d32..d90af704 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.stpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.tpl index 8b4565e1..bbc4ecac 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.tpl @@ -48,7 +48,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl index b6231476..112b668e 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.tpl index 5ef66f98..afcd44ca 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.tpl @@ -39,7 +39,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.stpl index 17528656..1f9aa2bd 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.stpl @@ -187,7 +187,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.tpl index 1a7e8118..d802868b 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.tpl @@ -183,7 +183,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.stpl index c50118d2..21665b23 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.stpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.tpl index b37583d0..98200c35 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.tpl @@ -54,7 +54,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.stpl index 8c2dbc48..83b5f361 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.stpl @@ -79,7 +79,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.tpl index 7fc741b6..d5b185f0 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.tpl @@ -76,7 +76,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.stpl index 9d40c9ed..0ba7a96c 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.stpl @@ -36,7 +36,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.tpl index af6f8597..f525f4a2 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.tpl @@ -32,7 +32,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/odoo.stpl index 422d2bf3..6dd5377e 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/odoo.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/odoo.stpl @@ -59,7 +59,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/odoo.tpl index c877f403..3eb67e4c 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/odoo.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/odoo.tpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.stpl index ada6efb8..07e650bd 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.stpl @@ -74,7 +74,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.tpl index d0682ea4..cb26067c 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.tpl @@ -70,7 +70,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.stpl index 0eb7a514..b00b6cb1 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.stpl @@ -62,7 +62,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.tpl index b52d29a2..05098e48 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.tpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl index abac91f4..9426dde2 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl index 89f4b3d2..65b99f51 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl @@ -51,7 +51,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.stpl index cc10cbe1..1443d878 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.tpl index 85713579..0e734ec6 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.stpl index 9772e75b..bb3007b1 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.stpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.tpl index d1350ed8..c5051eed 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.tpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.stpl index 1a0a0451..2ea6dbfe 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.tpl index 663ef0bc..c5180786 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.stpl index ac6c3eb8..ef34746f 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -50,7 +50,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.tpl index fa61e8dd..de811555 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -46,7 +46,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.stpl index dd0637e1..de77cf0c 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.tpl index 6c62cd48..edf6ef6d 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.stpl index 25211612..7a780e6e 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -116,7 +116,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.tpl index 4e16945b..a1653d6a 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -112,7 +112,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.stpl index cc10cbe1..1443d878 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.tpl index 85713579..0e734ec6 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.stpl index c117c9f4..f12a9643 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -61,7 +61,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.tpl index bf4b3051..413d49dd 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl index a3d06cf2..8a6d7f12 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.tpl index b7010137..390c3e6e 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl index 9481aec0..1f7ce308 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.tpl index a4376141..11e6555d 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl index 090dd842..a8ec9385 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl @@ -91,7 +91,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.tpl index e564b5f3..ad4a6e07 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.tpl @@ -88,7 +88,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.stpl index 52bf3d32..d90af704 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.stpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.tpl index 8b4565e1..bbc4ecac 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.tpl @@ -48,7 +48,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl index b6231476..112b668e 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.tpl index 5ef66f98..afcd44ca 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.tpl @@ -39,7 +39,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.stpl index 17528656..1f9aa2bd 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.stpl @@ -187,7 +187,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.tpl index 1a7e8118..d802868b 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.tpl @@ -183,7 +183,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.stpl index c50118d2..21665b23 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.stpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.tpl index b37583d0..98200c35 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.tpl @@ -54,7 +54,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.stpl index 8c2dbc48..83b5f361 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.stpl @@ -79,7 +79,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.tpl index 7fc741b6..d5b185f0 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.tpl @@ -76,7 +76,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.stpl index 9d40c9ed..0ba7a96c 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.stpl @@ -36,7 +36,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.tpl index af6f8597..f525f4a2 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.tpl @@ -32,7 +32,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/odoo.stpl index 422d2bf3..6dd5377e 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/odoo.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/odoo.stpl @@ -59,7 +59,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/odoo.tpl index c877f403..3eb67e4c 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/odoo.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/odoo.tpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.stpl index ada6efb8..07e650bd 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.stpl @@ -74,7 +74,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.tpl index d0682ea4..cb26067c 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.tpl @@ -70,7 +70,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.stpl index 0eb7a514..b00b6cb1 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.stpl @@ -62,7 +62,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.tpl index b52d29a2..05098e48 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.tpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl index abac91f4..9426dde2 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl index 89f4b3d2..65b99f51 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl @@ -51,7 +51,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.stpl index cc10cbe1..1443d878 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.tpl index 85713579..0e734ec6 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.stpl index 9772e75b..bb3007b1 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.stpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.tpl index d1350ed8..c5051eed 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.tpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.stpl index 1a0a0451..2ea6dbfe 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.tpl index 663ef0bc..c5180786 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.stpl index ac6c3eb8..ef34746f 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -50,7 +50,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.tpl index fa61e8dd..de811555 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -46,7 +46,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.stpl index dd0637e1..de77cf0c 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.tpl index 6c62cd48..edf6ef6d 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.stpl index 25211612..7a780e6e 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -116,7 +116,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.tpl index 4e16945b..a1653d6a 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -112,7 +112,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.stpl index cc10cbe1..1443d878 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.tpl index 85713579..0e734ec6 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.stpl index c117c9f4..f12a9643 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -61,7 +61,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.tpl index bf4b3051..413d49dd 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl index a3d06cf2..8a6d7f12 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.tpl index b7010137..390c3e6e 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl index 9481aec0..1f7ce308 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.tpl index a4376141..11e6555d 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl index 090dd842..a8ec9385 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl @@ -91,7 +91,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.tpl index e564b5f3..ad4a6e07 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.tpl @@ -88,7 +88,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.stpl index 52bf3d32..d90af704 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.stpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.tpl index 8b4565e1..bbc4ecac 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.tpl @@ -48,7 +48,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl index b6231476..112b668e 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.tpl index 5ef66f98..afcd44ca 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.tpl @@ -39,7 +39,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.stpl index 17528656..1f9aa2bd 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.stpl @@ -187,7 +187,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.tpl index 1a7e8118..d802868b 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.tpl @@ -183,7 +183,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.stpl index c50118d2..21665b23 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.stpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.tpl index b37583d0..98200c35 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.tpl @@ -54,7 +54,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.stpl index 8c2dbc48..83b5f361 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.stpl @@ -79,7 +79,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.tpl index 7fc741b6..d5b185f0 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.tpl @@ -76,7 +76,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.stpl index 9d40c9ed..0ba7a96c 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.stpl @@ -36,7 +36,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.tpl index af6f8597..f525f4a2 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.tpl @@ -32,7 +32,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/odoo.stpl index 422d2bf3..6dd5377e 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/odoo.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/odoo.stpl @@ -59,7 +59,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/odoo.tpl index c877f403..3eb67e4c 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/odoo.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/odoo.tpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.stpl index ada6efb8..07e650bd 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.stpl @@ -74,7 +74,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.tpl index d0682ea4..cb26067c 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.tpl @@ -70,7 +70,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.stpl index 0eb7a514..b00b6cb1 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.stpl @@ -62,7 +62,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.tpl index b52d29a2..05098e48 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.tpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl index abac91f4..9426dde2 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl index 89f4b3d2..65b99f51 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl @@ -51,7 +51,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.stpl index cc10cbe1..1443d878 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.tpl index 85713579..0e734ec6 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.stpl index 9772e75b..bb3007b1 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.stpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.tpl index d1350ed8..c5051eed 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.tpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.stpl index 1a0a0451..2ea6dbfe 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.tpl index 663ef0bc..c5180786 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.stpl index ac6c3eb8..ef34746f 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -50,7 +50,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.tpl index fa61e8dd..de811555 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -46,7 +46,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.stpl index dd0637e1..de77cf0c 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.tpl index 6c62cd48..edf6ef6d 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.stpl index 25211612..7a780e6e 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -116,7 +116,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.tpl index 4e16945b..a1653d6a 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -112,7 +112,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.stpl index cc10cbe1..1443d878 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.tpl index 85713579..0e734ec6 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.stpl index c117c9f4..f12a9643 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -61,7 +61,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.tpl index bf4b3051..413d49dd 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl index a3d06cf2..8a6d7f12 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.tpl index b7010137..390c3e6e 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl index 9481aec0..1f7ce308 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.tpl index a4376141..11e6555d 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl index 090dd842..a8ec9385 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl @@ -91,7 +91,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.tpl index e564b5f3..ad4a6e07 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.tpl @@ -88,7 +88,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.stpl index 52bf3d32..d90af704 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.stpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.tpl index 8b4565e1..bbc4ecac 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.tpl @@ -48,7 +48,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl index b6231476..112b668e 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.tpl index 5ef66f98..afcd44ca 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.tpl @@ -39,7 +39,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.stpl index 17528656..1f9aa2bd 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.stpl @@ -187,7 +187,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.tpl index 1a7e8118..d802868b 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.tpl @@ -183,7 +183,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.stpl index c50118d2..21665b23 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.stpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.tpl index b37583d0..98200c35 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.tpl @@ -54,7 +54,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.stpl index 8c2dbc48..83b5f361 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.stpl @@ -79,7 +79,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.tpl index 7fc741b6..d5b185f0 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.tpl @@ -76,7 +76,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.stpl index 9d40c9ed..0ba7a96c 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.stpl @@ -36,7 +36,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.tpl index af6f8597..f525f4a2 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.tpl @@ -32,7 +32,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/odoo.stpl index 422d2bf3..6dd5377e 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/odoo.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/odoo.stpl @@ -59,7 +59,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/odoo.tpl index c877f403..3eb67e4c 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/odoo.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/odoo.tpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.stpl index ada6efb8..07e650bd 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.stpl @@ -74,7 +74,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.tpl index d0682ea4..cb26067c 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.tpl @@ -70,7 +70,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.stpl index 0eb7a514..b00b6cb1 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.stpl @@ -62,7 +62,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.tpl index b52d29a2..05098e48 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.tpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl index abac91f4..9426dde2 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl index 89f4b3d2..65b99f51 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl @@ -51,7 +51,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.stpl index cc10cbe1..1443d878 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.tpl index 85713579..0e734ec6 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl index 9772e75b..bb3007b1 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.tpl index d1350ed8..c5051eed 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.tpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.stpl index 1a0a0451..2ea6dbfe 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.tpl index 663ef0bc..c5180786 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.stpl index ac6c3eb8..ef34746f 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -50,7 +50,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.tpl index fa61e8dd..de811555 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -46,7 +46,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.stpl index dd0637e1..de77cf0c 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.tpl index 6c62cd48..edf6ef6d 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.stpl index 25211612..7a780e6e 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -116,7 +116,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.tpl index 4e16945b..a1653d6a 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -112,7 +112,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.stpl index cc10cbe1..1443d878 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.tpl index 85713579..0e734ec6 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.stpl index c117c9f4..f12a9643 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -61,7 +61,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.tpl index bf4b3051..413d49dd 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl index a3d06cf2..8a6d7f12 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.tpl index b7010137..390c3e6e 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl index 9481aec0..1f7ce308 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.tpl index a4376141..11e6555d 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl index 090dd842..a8ec9385 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl @@ -91,7 +91,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.tpl index e564b5f3..ad4a6e07 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.tpl @@ -88,7 +88,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.stpl index 52bf3d32..d90af704 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.stpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.tpl index 8b4565e1..bbc4ecac 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.tpl @@ -48,7 +48,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl index b6231476..112b668e 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.tpl index 5ef66f98..afcd44ca 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.tpl @@ -39,7 +39,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.stpl index 17528656..1f9aa2bd 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.stpl @@ -187,7 +187,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.tpl index 1a7e8118..d802868b 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.tpl @@ -183,7 +183,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.stpl index c50118d2..21665b23 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.stpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.tpl index b37583d0..98200c35 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.tpl @@ -54,7 +54,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.stpl index 8c2dbc48..83b5f361 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.stpl @@ -79,7 +79,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.tpl index 7fc741b6..d5b185f0 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.tpl @@ -76,7 +76,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.stpl index 9d40c9ed..0ba7a96c 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.stpl @@ -36,7 +36,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.tpl index af6f8597..f525f4a2 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.tpl @@ -32,7 +32,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/odoo.stpl index 422d2bf3..6dd5377e 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/odoo.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/odoo.stpl @@ -59,7 +59,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/odoo.tpl index c877f403..3eb67e4c 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/odoo.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/odoo.tpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.stpl index ada6efb8..07e650bd 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.stpl @@ -74,7 +74,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.tpl index d0682ea4..cb26067c 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.tpl @@ -70,7 +70,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.stpl index 0eb7a514..b00b6cb1 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.stpl @@ -62,7 +62,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.tpl index b52d29a2..05098e48 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.tpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl index abac91f4..9426dde2 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl index 89f4b3d2..65b99f51 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl @@ -51,7 +51,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.stpl index cc10cbe1..1443d878 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.tpl index 85713579..0e734ec6 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.stpl index 9772e75b..bb3007b1 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.stpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.tpl index d1350ed8..c5051eed 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.tpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.stpl index 1a0a0451..2ea6dbfe 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.tpl index 663ef0bc..c5180786 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.stpl index ac6c3eb8..ef34746f 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -50,7 +50,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.tpl index fa61e8dd..de811555 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -46,7 +46,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.stpl index dd0637e1..de77cf0c 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.tpl index 6c62cd48..edf6ef6d 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.stpl index 25211612..7a780e6e 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -116,7 +116,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.tpl index 4e16945b..a1653d6a 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -112,7 +112,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.stpl index cc10cbe1..1443d878 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.tpl index 85713579..0e734ec6 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.stpl index c117c9f4..f12a9643 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -61,7 +61,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.tpl index bf4b3051..413d49dd 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl index a3d06cf2..8a6d7f12 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.tpl index b7010137..390c3e6e 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.stpl index 14c0cf29..ac116bf3 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.tpl index a4376141..11e6555d 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl index 090dd842..a8ec9385 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl @@ -91,7 +91,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.tpl index e564b5f3..ad4a6e07 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.tpl @@ -88,7 +88,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.stpl index 52bf3d32..d90af704 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.stpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.tpl index 8b4565e1..bbc4ecac 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.tpl @@ -48,7 +48,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl index b6231476..112b668e 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.tpl index 5ef66f98..afcd44ca 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.tpl @@ -39,7 +39,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.stpl index 17528656..1f9aa2bd 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.stpl @@ -187,7 +187,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.tpl index 1a7e8118..d802868b 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.tpl @@ -183,7 +183,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.stpl index c50118d2..21665b23 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.stpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.tpl index b37583d0..98200c35 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.tpl @@ -54,7 +54,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.stpl index 8c2dbc48..83b5f361 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.stpl @@ -79,7 +79,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.tpl index 7fc741b6..d5b185f0 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.tpl @@ -76,7 +76,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.stpl index 9d40c9ed..0ba7a96c 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.stpl @@ -36,7 +36,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.tpl index af6f8597..f525f4a2 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.tpl @@ -32,7 +32,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/odoo.stpl index 422d2bf3..6dd5377e 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/odoo.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/odoo.stpl @@ -59,7 +59,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/odoo.tpl index c877f403..3eb67e4c 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/odoo.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/odoo.tpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.stpl index ada6efb8..07e650bd 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.stpl @@ -74,7 +74,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.tpl index d0682ea4..cb26067c 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.tpl @@ -70,7 +70,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.stpl index 0eb7a514..b00b6cb1 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.stpl @@ -62,7 +62,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.tpl index b52d29a2..05098e48 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.tpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl index abac91f4..9426dde2 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl index 89f4b3d2..65b99f51 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl @@ -51,7 +51,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.stpl index cc10cbe1..1443d878 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.tpl index 85713579..0e734ec6 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.stpl index 9772e75b..bb3007b1 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.stpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.tpl index d1350ed8..c5051eed 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.tpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/cms_made_simple.stpl index c9a7c4d4..4a11965f 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/cms_made_simple.tpl index 06353a47..a30769d4 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter2.stpl index 25799957..b342725b 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -50,7 +50,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter2.tpl index 1ed1e649..e2948f2d 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -46,7 +46,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter3.stpl index 88851e6f..ae915ae8 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter3.tpl index d5281dc9..e85c29d1 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/datalife_engine.stpl index 318b8200..84267e7d 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -116,7 +116,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/datalife_engine.tpl index d09b587e..c557670f 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/datalife_engine.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -112,7 +112,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/default.stpl index 7fade11b..25b8d08c 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/default.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/default.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/default.tpl index dbd38c07..ad11ffcd 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/default.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/default.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/dokuwiki.stpl index da028f3f..6eabd7d5 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -61,7 +61,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/dokuwiki.tpl index ba854768..861c3dee 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.stpl index 7b7ae3d0..75ba711f 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.tpl index 55dde013..3d7c0499 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.stpl index 1fb3cce4..f44fd736 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.tpl index c5d737ea..1f9c2fc9 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.stpl index 22ecc726..c93fab95 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.stpl @@ -91,7 +91,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.tpl index 2100f934..ed0213a5 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.tpl @@ -88,7 +88,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/joomla.stpl index 5a1c5e83..7f2114c9 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/joomla.stpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/joomla.tpl index 9d46116a..8070f6d5 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/joomla.tpl @@ -48,7 +48,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl index b6231476..112b668e 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.tpl index 5ef66f98..afcd44ca 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.tpl @@ -39,7 +39,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.stpl index 17528656..1f9aa2bd 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.stpl @@ -187,7 +187,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.tpl index 1a7e8118..d802868b 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.tpl @@ -183,7 +183,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/modx.stpl index 0377bb52..bc557126 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/modx.stpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/modx.tpl index b3c3e350..6c89d7bb 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/modx.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/modx.tpl @@ -54,7 +54,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/moodle.stpl index 8bb9f777..18d25f06 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/moodle.stpl @@ -79,7 +79,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/moodle.tpl index 49ea2869..69f50963 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/moodle.tpl @@ -76,7 +76,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/no-php.stpl index f49a4a5b..c03491a0 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/no-php.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/no-php.stpl @@ -36,7 +36,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/no-php.tpl index 3e796d1e..b56a9f39 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/no-php.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/no-php.tpl @@ -32,7 +32,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/odoo.stpl index 422d2bf3..6dd5377e 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/odoo.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/odoo.stpl @@ -59,7 +59,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/odoo.tpl index c877f403..3eb67e4c 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/odoo.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/odoo.tpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/owncloud.stpl index 111ed2f4..92b65bc2 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/owncloud.stpl @@ -74,7 +74,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/owncloud.tpl index 2c697cc4..d3496b0f 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/owncloud.tpl @@ -70,7 +70,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/piwik.stpl index 7a2be4f9..b137067f 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/piwik.stpl @@ -62,7 +62,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/piwik.tpl index 253fe87b..1e9de371 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/piwik.tpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl index bda635ca..dd5acb2f 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.tpl index f850c412..b9217751 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.tpl @@ -51,7 +51,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress.stpl index 7fade11b..25b8d08c 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress.tpl index dbd38c07..ad11ffcd 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2.stpl index cf4770be..4baa8503 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2.stpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2.tpl index 54e1c755..e3e07392 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2.tpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/cms_made_simple.stpl index c9a7c4d4..4a11965f 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/cms_made_simple.tpl index 06353a47..a30769d4 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter2.stpl index 25799957..b342725b 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -50,7 +50,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter2.tpl index 1ed1e649..e2948f2d 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -46,7 +46,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter3.stpl index 88851e6f..ae915ae8 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter3.tpl index d5281dc9..e85c29d1 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -41,7 +41,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/datalife_engine.stpl index 318b8200..84267e7d 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -116,7 +116,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/datalife_engine.tpl index d09b587e..c557670f 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/datalife_engine.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -112,7 +112,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/default.stpl index 7fade11b..25b8d08c 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/default.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/default.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/default.tpl index dbd38c07..ad11ffcd 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/default.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/default.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/dokuwiki.stpl index da028f3f..6eabd7d5 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -61,7 +61,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/dokuwiki.tpl index ba854768..861c3dee 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.stpl index 7b7ae3d0..75ba711f 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.tpl index 55dde013..3d7c0499 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.stpl index 1fb3cce4..f44fd736 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.stpl @@ -90,7 +90,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.tpl index c5d737ea..1f9c2fc9 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.tpl @@ -87,7 +87,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.stpl index 22ecc726..c93fab95 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.stpl @@ -91,7 +91,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.tpl index 2100f934..ed0213a5 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.tpl @@ -88,7 +88,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/joomla.stpl index 5a1c5e83..7f2114c9 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/joomla.stpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/joomla.tpl index 9d46116a..8070f6d5 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/joomla.tpl @@ -48,7 +48,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl index b6231476..112b668e 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl @@ -45,7 +45,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.tpl index 5ef66f98..afcd44ca 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.tpl @@ -39,7 +39,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.stpl index 17528656..1f9aa2bd 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.stpl @@ -187,7 +187,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.tpl index 1a7e8118..d802868b 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.tpl @@ -183,7 +183,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/modx.stpl index 0377bb52..bc557126 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/modx.stpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/modx.tpl index b3c3e350..6c89d7bb 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/modx.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/modx.tpl @@ -54,7 +54,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/moodle.stpl index 8bb9f777..18d25f06 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/moodle.stpl @@ -79,7 +79,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/moodle.tpl index 49ea2869..69f50963 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/moodle.tpl @@ -76,7 +76,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/no-php.stpl index f49a4a5b..c03491a0 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/no-php.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/no-php.stpl @@ -36,7 +36,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/no-php.tpl index 3e796d1e..b56a9f39 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/no-php.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/no-php.tpl @@ -32,7 +32,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/odoo.stpl index 422d2bf3..6dd5377e 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/odoo.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/odoo.stpl @@ -59,7 +59,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/odoo.tpl index c877f403..3eb67e4c 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/odoo.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/odoo.tpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/owncloud.stpl index 111ed2f4..92b65bc2 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/owncloud.stpl @@ -74,7 +74,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/owncloud.tpl index 2c697cc4..d3496b0f 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/owncloud.tpl @@ -70,7 +70,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/piwik.stpl index 7a2be4f9..b137067f 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/piwik.stpl @@ -62,7 +62,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/piwik.tpl index 253fe87b..1e9de371 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/piwik.tpl @@ -58,7 +58,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.stpl index bda635ca..dd5acb2f 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.stpl @@ -55,7 +55,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.tpl index d7dd09ea..4709268c 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.tpl @@ -51,7 +51,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress.stpl index 7fade11b..25b8d08c 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress.stpl @@ -44,7 +44,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress.tpl index dbd38c07..ad11ffcd 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress.tpl @@ -40,7 +40,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2.stpl index cf4770be..4baa8503 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2.stpl @@ -56,7 +56,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2.tpl index 54e1c755..e3e07392 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2.tpl @@ -52,7 +52,7 @@ server { location /vstats/ { alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; + include %home%/%user%/conf/web/%domain%.auth } include /etc/nginx/conf.d/phpmyadmin.inc*; diff --git a/src/deb/vesta/postinst b/src/deb/vesta/postinst index 21ae5892..2c539b1d 100755 --- a/src/deb/vesta/postinst +++ b/src/deb/vesta/postinst @@ -20,4 +20,8 @@ if [ -x "/usr/local/vesta/upd/fix_sessions.sh" ]; then /usr/local/vesta/upd/fix_sessions.sh fi +if [ -e /usr/local/vesta/upd/fix_nginx_auth.sh ]; then + /usr/local/vesta/upd/fix_nginx_auth.sh +fi + exit 0 diff --git a/src/rpm/specs/vesta.spec b/src/rpm/specs/vesta.spec index 7936e302..6be72e16 100644 --- a/src/rpm/specs/vesta.spec +++ b/src/rpm/specs/vesta.spec @@ -39,6 +39,9 @@ if [ $1 -ge 2 ]; then if [ -e /usr/local/vesta/upd/fix_sessions.sh ]; then /usr/local/vesta/upd/fix_sessions.sh fi + if [ -e /usr/local/vesta/upd/fix_nginx_auth.sh ]; then + /usr/local/vesta/upd/fix_nginx_auth.sh + fi fi %files %{_vestadir} diff --git a/upd/fix_nginx_auth.sh b/upd/fix_nginx_auth.sh new file mode 100755 index 00000000..eed5f1b9 --- /dev/null +++ b/upd/fix_nginx_auth.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +source /etc/profile.d/vesta.sh +source /usr/local/vesta/conf/vesta.conf + +#if [ "$WEB_SYSTEM" != 'nginx' ]; then +# exit +#fi + +sed -i "s|web/%domain%/stats/auth.*|conf/web/%domain%.auth|" \ + $VESTA/data/templates/web/nginx/*/*tpl >/dev/null 2>&1 + +check=`egrep "STATS_USER='([0-9]|[a-Z].*)'" $VESTA/data/users/*/web.conf` +if [ ! -z "$check" ]; then + for user in $(echo $check |cut -f1 -d: |cut -f7 -d/); do + $VESTA/bin/v-rebuild-web-domains $user no >/dev/null 2>&1 + done + $VESTA/bin/v-restart-service nginx +fi