github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-11 09:07:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:serghey-rodin/vesta

Browse source
This commit is contained in:
Serghey Rodin 2017-12-07 15:04:55 +02:00
commit f8be208fa3
790 changed files with 808 additions and 805 deletions

7
bin/v-backup-user
View file

@ -508,7 +508,6 @@ local_backup(){
backups_count=$(echo "$backup_list" |wc -l)
if [ "$BACKUPS" -le "$backups_count" ]; then
backups_rm_number=$((backups_count - BACKUPS))
(( ++backups_rm_number))
# Removing old backup
for backup in $(echo "$backup_list" |head -n $backups_rm_number); do
@ -624,7 +623,7 @@ ftp_backup() {
fi
backups_count=$(echo "$backup_list" |wc -l)
if [ "$backups_count" -ge "$BACKUPS" ]; then
backups_rm_number=$((backups_count - BACKUPS + 1))
backups_rm_number=$((backups_count - BACKUPS))
for backup in $(echo "$backup_list" |head -n $backups_rm_number); do
backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar$//")
echo -e "$(date "+%F %T") Rotated ftp backup: $backup_date" |\
@ -779,7 +778,7 @@ sftp_backup() {
fi
backups_count=$(echo "$backup_list" |wc -l)
if [ "$backups_count" -ge "$BACKUPS" ]; then
backups_rm_number=$((backups_count - BACKUPS + 1))
backups_rm_number=$((backups_count - BACKUPS))
for backup in $(echo "$backup_list" |head -n $backups_rm_number); do
backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar.*$//")
echo -e "$(date "+%F %T") Rotated sftp backup: $backup_date" |\
@ -828,7 +827,7 @@ google_backup() {
backup_list=$(${gsutil} ls gs://$BUCKET/$BPATH/$user.* 2>/dev/null)
backups_count=$(echo "$backup_list" |wc -l)
if [ "$backups_count" -ge "$BACKUPS" ]; then
backups_rm_number=$((backups_count - BACKUPS + 1))
backups_rm_number=$((backups_count - BACKUPS))
for backup in $(echo "$backup_list" |head -n $backups_rm_number); do
echo -e "$(date "+%F %T") Roated gcp backup: $backup"
$gsutil rm $backup > /dev/null 2>&1

2
install/debian/7/templates/web/apache2/basedir.stpl
View file

@ -38,7 +38,7 @@
AssignUserID %user% %group%
</IfModule>
Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/7/templates/web/apache2/basedir.tpl
View file

@ -32,7 +32,7 @@
AssignUserID %user% %group%
</IfModule>
Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/7/templates/web/apache2/default.stpl
View file

@ -37,7 +37,7 @@
AssignUserID %user% %group%
</IfModule>
Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/7/templates/web/apache2/default.tpl
View file

@ -31,7 +31,7 @@
AssignUserID %user% %group%
</IfModule>
Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/7/templates/web/apache2/hosting.stpl
View file

@ -43,7 +43,7 @@
AssignUserID %user% %group%
</IfModule>
Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/7/templates/web/apache2/hosting.tpl
View file

@ -38,7 +38,7 @@
AssignUserID %user% %group%
</IfModule>
Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/7/templates/web/apache2/phpcgi.stpl
View file

@ -32,7 +32,7 @@
SSLCertificateKeyFile %ssl_key%
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/7/templates/web/apache2/phpcgi.tpl
View file

@ -25,7 +25,7 @@
<Directory %home%/%user%/web/%domain%/stats>
AllowOverride All
</Directory>
Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/7/templates/web/apache2/phpfcgid.stpl
View file

@ -33,7 +33,7 @@
SSLCertificateKeyFile %ssl_key%
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/7/templates/web/apache2/phpfcgid.tpl
View file

@ -25,7 +25,7 @@
<Directory %home%/%user%/web/%domain%/stats>
AllowOverride All
</Directory>
Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/7/templates/web/nginx/caching.stpl
View file

@ -40,5 +40,5 @@ server {
location ~ /\.hg/ {return 404;}
location ~ /\.bzr/ {return 404;}
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/caching.tpl
View file

@ -37,5 +37,5 @@ server {
location ~ /\.hg/ {return 404;}
location ~ /\.bzr/ {return 404;}
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/default.stpl
View file

@ -31,6 +31,6 @@ server {
location ~ /\.hg/ {return 404;}
location ~ /\.bzr/ {return 404;}
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/default.tpl
View file

@ -28,6 +28,6 @@ server {
location ~ /\.hg/ {return 404;}
location ~ /\.bzr/ {return 404;}
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/hosting.stpl
View file

@ -33,6 +33,6 @@ server {
disable_symlinks if_not_owner from=%docroot%;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/hosting.tpl
View file

@ -30,6 +30,6 @@ server {
disable_symlinks if_not_owner from=%docroot%;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl
View file

@ -52,5 +52,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl
View file

@ -48,5 +48,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl
View file

@ -57,5 +57,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl
View file

@ -53,5 +53,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl
View file

@ -52,5 +52,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl
View file

@ -48,5 +48,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl
View file

@ -123,5 +123,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl
View file

@ -119,5 +119,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/default.stpl
View file

@ -51,5 +51,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/default.tpl
View file

@ -47,5 +47,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl
View file

@ -68,5 +68,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl
View file

@ -63,5 +63,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl
View file

@ -97,5 +97,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl
View file

@ -94,5 +94,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl
View file

@ -97,5 +97,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl
View file

@ -94,5 +94,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl
View file

@ -98,5 +98,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl
View file

@ -95,5 +95,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl
View file

@ -59,5 +59,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl
View file

@ -55,5 +55,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl
View file

@ -52,5 +52,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/laravel.tpl
View file

@ -46,5 +46,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/magento.stpl
View file

@ -194,5 +194,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/magento.tpl
View file

@ -190,5 +190,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/modx.stpl
View file

@ -65,5 +65,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/modx.tpl
View file

@ -61,5 +61,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl
View file

@ -86,5 +86,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/moodle.tpl
View file

@ -83,5 +83,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl
View file

@ -43,5 +43,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl
View file

@ -39,5 +39,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/odoo.stpl
View file

@ -66,5 +66,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/odoo.tpl
View file

@ -62,5 +62,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/opencart.tpl
View file

@ -45,5 +45,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl
View file

@ -81,5 +81,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl
View file

@ -77,5 +77,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl
View file

@ -69,5 +69,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl
View file

@ -65,5 +65,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl
View file

@ -62,5 +62,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl
View file

@ -58,5 +58,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl
View file

@ -51,5 +51,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl
View file

@ -47,5 +47,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl
View file

@ -63,5 +63,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl
View file

@ -59,5 +59,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/8/templates/web/apache2/basedir.stpl
View file

@ -38,7 +38,7 @@
AssignUserID %user% %group%
</IfModule>
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/8/templates/web/apache2/basedir.tpl
View file

@ -32,7 +32,7 @@
AssignUserID %user% %group%
</IfModule>
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/8/templates/web/apache2/default.stpl
View file

@ -37,7 +37,7 @@
AssignUserID %user% %group%
</IfModule>
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/8/templates/web/apache2/default.tpl
View file

@ -31,7 +31,7 @@
AssignUserID %user% %group%
</IfModule>
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/8/templates/web/apache2/hosting.stpl
View file

@ -43,7 +43,7 @@
AssignUserID %user% %group%
</IfModule>
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/8/templates/web/apache2/hosting.tpl
View file

@ -37,7 +37,7 @@
AssignUserID %user% %group%
</IfModule>
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/8/templates/web/apache2/phpcgi.stpl
View file

@ -32,7 +32,7 @@
SSLCertificateKeyFile %ssl_key%
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/8/templates/web/apache2/phpcgi.tpl
View file

@ -25,7 +25,7 @@
<Directory %home%/%user%/web/%domain%/stats>
AllowOverride All
</Directory>
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/8/templates/web/apache2/phpfcgid.stpl
View file

@ -33,7 +33,7 @@
SSLCertificateKeyFile %ssl_key%
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/8/templates/web/apache2/phpfcgid.tpl
View file

@ -25,7 +25,7 @@
<Directory %home%/%user%/web/%domain%/stats>
AllowOverride All
</Directory>
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
</VirtualHost>

2
install/debian/8/templates/web/nginx/caching.stpl
View file

@ -40,5 +40,5 @@ server {
location ~ /\.hg/ {return 404;}
location ~ /\.bzr/ {return 404;}
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/caching.tpl
View file

@ -37,5 +37,5 @@ server {
location ~ /\.hg/ {return 404;}
location ~ /\.bzr/ {return 404;}
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/default.stpl
View file

@ -31,6 +31,6 @@ server {
location ~ /\.hg/ {return 404;}
location ~ /\.bzr/ {return 404;}
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/default.tpl
View file

@ -28,6 +28,6 @@ server {
location ~ /\.hg/ {return 404;}
location ~ /\.bzr/ {return 404;}
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/hosting.stpl
View file

@ -33,6 +33,6 @@ server {
disable_symlinks if_not_owner from=%docroot%;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/hosting.tpl
View file

@ -30,6 +30,6 @@ server {
disable_symlinks if_not_owner from=%docroot%;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl
View file

@ -52,5 +52,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl
View file

@ -48,5 +48,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl
View file

@ -57,5 +57,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl
View file

@ -53,5 +53,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl
View file

@ -52,5 +52,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl
View file

@ -48,5 +48,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl
View file

@ -123,5 +123,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl
View file

@ -119,5 +119,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/default.stpl
View file

@ -51,5 +51,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/default.tpl
View file

@ -47,5 +47,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl
View file

@ -68,5 +68,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl
View file

@ -63,5 +63,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl
View file

@ -97,5 +97,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl
View file

@ -94,5 +94,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl
View file

@ -97,5 +97,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl
View file

@ -94,5 +94,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl
View file

@ -98,5 +98,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl
View file

@ -95,5 +95,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl
View file

@ -59,5 +59,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl
View file

@ -55,5 +55,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl
View file

@ -52,5 +52,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/laravel.tpl
View file

@ -46,5 +46,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/magento.stpl
View file

@ -194,5 +194,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/snginx.%domain%.conf*;
}

2
install/debian/8/templates/web/nginx/php5-fpm/magento.tpl
View file

@ -190,5 +190,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
include %home%/%user%/conf/web/nginx.%domain%.conf*;
}

Some files were not shown because too many files have changed in this diff Show more