diff --git a/bin/v-add-user b/bin/v-add-user index da50f674..256dacb3 100755 --- a/bin/v-add-user +++ b/bin/v-add-user @@ -74,7 +74,8 @@ fi if [ ! -z "$MAIL_SYSTEM" ]; then mkdir $HOMEDIR/$user/conf/mail $HOMEDIR/$user/mail - chmod 751 $HOMEDIR/$user/mail $HOMEDIR/$user/conf/mail + chmod 751 $HOMEDIR/$user/mail + chmod 755 $HOMEDIR/$user/conf/mail fi if [ ! -z "$DNS_SYSTEM" ]; then diff --git a/bin/v-add-web-domain-ftp b/bin/v-add-web-domain-ftp index 8d888093..699a8ba9 100755 --- a/bin/v-add-web-domain-ftp +++ b/bin/v-add-web-domain-ftp @@ -51,12 +51,8 @@ is_password_valid get_domain_values 'web' # Defining ftp user shell -if [ -z "$FTP_SHELL" ]; then - shell='/sbin/nologin' - if [ -e "/usr/bin/rssh" ]; then - shell='/usr/bin/rssh' - fi -else +shell='/sbin/nologin' +if [ ! -z "$FTP_SHELL" ]; then shell=$FTP_SHELL fi diff --git a/bin/v-add-web-domain-stats-user b/bin/v-add-web-domain-stats-user index ab23f209..7d7472e3 100755 --- a/bin/v-add-web-domain-stats-user +++ b/bin/v-add-web-domain-stats-user @@ -11,7 +11,7 @@ # Argument definition user=$1 -domain=$(idn -t --quiet -u "$2" ) +domain=$2 stats_user=$3 password=$4; HIDE=4 @@ -43,15 +43,21 @@ is_password_valid stats_dir="$HOMEDIR/$user/web/$domain/stats" # Adding htaccess file -echo "AuthUserFile $stats_dir/.htpasswd -AuthName \"Web Statistics\" -AuthType Basic -Require valid-user" > $stats_dir/.htaccess +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 +else + echo "AuthUserFile $stats_dir/.htpasswd" > $stats_dir/.htaccess + echo "AuthName \"Web Statistics\"" >> $stats_dir/.htaccess + echo "AuthType Basic" >> $stats_dir/.htaccess + echo "Require valid-user" >> $stats_dir/.htaccess +fi # Generating htaccess user and password -rm -f $stats_dir/.htpasswd -htpasswd -bc $stats_dir/.htpasswd "$stats_user" "$password" &>/dev/null -stats_crypt=$(grep $stats_user: $stats_dir/.htpasswd |cut -f 2 -d :) +salt=$(generate_password "$PW_MATRIX" "8") +stats_pass=$($BIN/v-generate-password-hash md5 $salt $password) +echo "$stats_user:$stats_pass" > $stats_dir/.htpasswd + #----------------------------------------------------------# # Vesta # @@ -59,7 +65,7 @@ stats_crypt=$(grep $stats_user: $stats_dir/.htpasswd |cut -f 2 -d :) # Adding stats user in config update_object_value 'web' 'DOMAIN' "$domain" '$STATS_USER' "$stats_user" -update_object_value 'web' 'DOMAIN' "$domain" '$STATS_CRYPT' "$stats_crypt" +update_object_value 'web' 'DOMAIN' "$domain" '$STATS_CRYPT' "$stats_pass" # Logging log_history "added password protection for web stats on $domain" diff --git a/bin/v-backup-user b/bin/v-backup-user index 1cd1f411..98995e9f 100755 --- a/bin/v-backup-user +++ b/bin/v-backup-user @@ -747,6 +747,46 @@ sftp_backup() { fi } +google_backup() { + + # Defining google settings + source $VESTA/conf/google.backup.conf + gsutil="$VESTA/3rdparty/gsutil/gsutil" + export BOTO_CONFIG="$VESTA/conf/.google.backup.boto" + + # Debug info + echo -e "$(date "+%F %T") Remote: gs://$BUCKET/$BPATH/$user.$date.tar" + + # Checking retention + 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)) + 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 + done + fi + + # Uploading backup archive + echo -e "$(date "+%F %T") Uploading $user.$date.tar ..." + if [ "$localbackup" = 'yes' ]; then + cd $BACKUP + ${gsutil} cp $user.$date.tar gs://$BUCKET/$BPATH/ > /dev/null 2>&1 + else + cd $tmpdir + tar -cf $BACKUP/$user.$date.tar . + cd $BACKUP/ + ${gsutil} cp $user.$date.tar gs://$BUCKET/$BPATH/ > /dev/null 2>&1 + rc=$? + rm -f $user.$date.tar + if [ "$rc" -ne 0 ]; then + check_result "$E_CONNECT" "gsutil failed to upload $user.$date.tar" + fi + fi +} + + echo -e "\n-- SUMMARY --" |tee -a $BACKUP/$user.log # Switching on backup system types @@ -755,6 +795,7 @@ for backup_type in $(echo -e "${BACKUP_SYSTEM//,/\\n}"); do local) local_backup ;; ftp) ftp_backup ;; sftp) sftp_backup ;; + google) google_backup ;; esac done diff --git a/bin/v-change-domain-owner b/bin/v-change-domain-owner index c6be1c89..7a0f265b 100755 --- a/bin/v-change-domain-owner +++ b/bin/v-change-domain-owner @@ -27,7 +27,7 @@ check_args '2' "$#" 'DOMAIN USER' is_format_valid 'domain' 'user' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" -owner=$(v-search-domain-owner $domain) +owner=$($BIN/v-search-domain-owner $domain) if [ -z "$owner" ]; then check_result $E_NOTEXIST "domain $domain doesn't exist" fi diff --git a/bin/v-change-sys-vesta-ssl b/bin/v-change-sys-vesta-ssl new file mode 100755 index 00000000..2531714e --- /dev/null +++ b/bin/v-change-sys-vesta-ssl @@ -0,0 +1,77 @@ +#!/bin/bash +# info: change vesta ssl certificate +# options: SSL_DIR [RESTART] +# +# The function changes vesta SSL certificate and the key. + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument definition +domain='certificate' +ssl_dir=$1 +restart=$2 + +# Includes +source $VESTA/func/main.sh +source $VESTA/func/domain.sh +source $VESTA/conf/vesta.conf + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +check_args '1' "$#" 'SSL_DIR [RESTART]' +is_format_valid 'ssl_dir' + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Checking new certificate +certificate=$(cat $ssl_dir/$domain.crt |grep -n END) +certificate_count=$(echo "$certificate" |wc -l) +if [ "$certificate_count" -gt 1 ]; then + crt_end=$(echo "$certificate" |head -n1 |cut -f 1 -d :) + crt_lines=$(wc -l $ssl_dir/$domain.crt |cut -f1 -d ' ') + pem_begin=$((crt_lines - crt_end)) + mv $ssl_dir/$domain.crt $ssl_dir/$domain.crt_full + head -n $crt_end $ssl_dir/$domain.crt_full > $ssl_dir/$domain.crt + tail -n $pem_begin $ssl_dir/$domain.crt_full > $ssl_dir/$domain.ca + is_web_domain_cert_valid + mv -f $ssl_dir/$domain.crt_full $ssl_dir/$domain.crt + rm -f $ssl_dir/$domain.ca +else + is_web_domain_cert_valid +fi + +# Moving old certificate +mv $VESTA/ssl/certificate.crt $VESTA/ssl/certificate.crt.back +mv $VESTA/ssl/certificate.key $VESTA/ssl/certificate.key.back + +# Adding new certificate +cp -f $ssl_dir/certificate.crt $VESTA/ssl/certificate.crt +cp -f $ssl_dir/certificate.key $VESTA/ssl/certificate.key + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Restarting web server +if [ "$restart" != 'no' ]; then + kill -HUP $(cat /var/run/vesta-nginx.pid) + $BIN/v-restart-mail + if [ ! -z "$IMAP_SYSTEM" ]; then + v-restart-service "$IMAP_SYSTEM" + fi +fi + +# Logging +log_event "$OK" "$ARGUMENTS" + +exit diff --git a/bin/v-list-sys-services b/bin/v-list-sys-services index c67cd94f..64556e76 100755 --- a/bin/v-list-sys-services +++ b/bin/v-list-sys-services @@ -99,7 +99,7 @@ get_srv_state() { # Calculating memory usage mem=$(echo "$pids" |awk '{sum += $3} END {print sum/1024 }') - mem=$(printf "%.0f\n" $mem) + mem=$(echo "${mem%%.*}") # Searching pid file pid_file='' diff --git a/bin/v-list-sys-vesta-ssl b/bin/v-list-sys-vesta-ssl new file mode 100755 index 00000000..f44e83a1 --- /dev/null +++ b/bin/v-list-sys-vesta-ssl @@ -0,0 +1,130 @@ +#!/bin/bash +# info: list vesta ssl certificate +# options: [FORMAT] +# +# The function of obtaining vesta ssl files. + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument definition +format=${1-shell} + +# Includes +source $VESTA/func/main.sh + +# JSON list function +json_list() { + echo '{' + echo -e "\t\"VESTA\": {" + echo " \"CRT\": \"$crt\"," + echo " \"KEY\": \"$key\"," + echo " \"CA\": \"$ca\"," + echo " \"SUBJECT\": \"$subj\"," + echo " \"ALIASES\": \"$alt_dns\"," + echo " \"NOT_BEFORE\": \"$before\"," + echo " \"NOT_AFTER\": \"$after\"," + echo " \"SIGNATURE\": \"$signature\"," + echo " \"PUB_KEY\": \"$pub_key\"," + echo " \"ISSUER\": \"$issuer\"" + echo -e "\t}\n}" +} + +# SHELL list function +shell_list() { + if [ ! -z "$crt" ]; then + echo -e "$crt" + fi + if [ ! -z "$key" ]; then + echo -e "\n$key" + fi + if [ ! -z "$crt" ]; then + echo + echo + echo "SUBJECT: $subj" + if [ ! -z "$alt_dns" ]; then + echo "ALIASES: ${alt_dns//,/ }" + fi + echo "VALID FROM: $before" + echo "VALID TIL: $after" + echo "SIGNATURE: $signature" + echo "PUB_KEY: $pub_key" + echo "ISSUER: $issuer" + fi +} + +# PLAIN list function +plain_list() { + if [ ! -z "$crt" ]; then + echo -e "$crt" + fi + if [ ! -z "$key" ]; then + echo -e "\n$key" + fi + if [ ! -z "$ca" ]; then + echo -e "\n$ca" + fi + if [ ! -z "$crt" ]; then + echo "$subj" + echo "${alt_dns//,/ }" + echo "$before" + echo "$after" + echo "$signature" + echo "$pub_key" + echo "$issuer" + fi + +} + +# CSV list function +csv_list() { + echo -n "CRT,KEY,CA,SUBJECT,ALIASES,NOT_BEFORE,NOT_AFTER,SIGNATURE," + echo "PUB_KEY,ISSUER" + echo -n "\"$crt\",\"$key\",\"$ca\",\"$subj\",\"${alt_dns//,/ }\"," + echo "\"$before\",\"$after\",\"$signature\",\"$pub_key\",\"$issuer\"" +} + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Parsing SSL certificate +crt=$(cat $VESTA/ssl/certificate.crt |sed ':a;N;$!ba;s/\n/\\n/g') +key=$(cat $VESTA/ssl/certificate.crt |sed ':a;N;$!ba;s/\n/\\n/g') + +# Parsing SSL certificate details without CA +info=$(openssl x509 -text -in $VESTA/ssl/certificate.crt) +subj=$(echo "$info" |grep Subject: |cut -f 2 -d =) +before=$(echo "$info" |grep Before: |sed -e "s/.*Before: //") +after=$(echo "$info" |grep "After :" |sed -e "s/.*After : //") +signature=$(echo "$info" |grep "Algorithm:" |head -n1 ) +signature=$(echo "$signature"| sed -e "s/.*Algorithm: //") +pub_key=$(echo "$info" |grep Public-Key: |cut -f2 -d \( | tr -d \)) +issuer=$(echo "$info" |grep Issuer: |sed -e "s/.*Issuer: //") +alt_dns=$(echo "$info" |grep DNS |sed -e 's/DNS:/\n/g' |tr -d ',') +alt_dns=$(echo "$alt_dns" |tr -d ' ' |sed -e "/^$/d") +alt_dns=$(echo "$alt_dns" |sed -e ':a;N;$!ba;s/\n/,/g') + +# Listing data +case $format in + json) json_list ;; + plain) plain_list ;; + csv) csv_list ;; + shell) shell_list ;; +esac + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +exit diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains index f3d35dd8..5ba9ef48 100755 --- a/bin/v-rebuild-web-domains +++ b/bin/v-rebuild-web-domains @@ -1,5 +1,5 @@ #!/bin/bash -# info: rebuild dns domains +# info: rebuild web domains # options: USER [RESTART] # # The function rebuilds web configuration files. diff --git a/bin/v-restore-user b/bin/v-restore-user index addff2d8..f2d4408c 100755 --- a/bin/v-restore-user +++ b/bin/v-restore-user @@ -36,13 +36,6 @@ source $VESTA/func/db.sh source $VESTA/func/rebuild.sh source $VESTA/conf/vesta.conf -# Check backup function -is_backup_valid() { - if [ ! -e "$1" ]; then - check_result $E_NOTEXIST "backup $1 doesn't exist" - fi -} - # Check backup ownership function is_backup_available() { if ! [[ $2 =~ ^$1.[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9].tar$ ]]; then @@ -50,6 +43,109 @@ is_backup_available() { fi } +# Defining ftp command function +ftpc() { + /usr/bin/ftp -n $HOST $PORT <" { + if {\$count < \$argc} { + set arg [lindex \$argv \$count] + send "\$arg\r" + incr count + } else { + incr count + } else { + send "exit\r" + set output "Disconnected." + if {[info exists rc] != 1} { + set rc $OK + } + } + exp_continue + } + timeout { + set output "Connection timeout." + set rc $E_CONNECT + } + } + + if {[info exists output] == 1} { + puts "\$output" + } + + exit \$rc +EOF +} + +# SFTP backup download function +sftp_download() { + source $VESTA/conf/sftp.backup.conf + if [ -z "$PORT" ]; then + PORT='22' + fi + cd $BACKUP + sftpc "cd $BPATH" "get $1" > /dev/null 2>&1 + +} + +# Google backup download function +google_download() { + source $VESTA/conf/google.backup.conf + gsutil="$VESTA/3rdparty/gsutil/gsutil" + export BOTO_CONFIG="$VESTA/conf/.google.backup.boto" + ${gsutil} cp gs://$BUCKET/$BPATH/$1 $BACKUP/ > /dev/null 2>&1 + if [ "$?" -ne 0 ]; then + check_result "$E_CONNECT" "gsutil failed to download $1" + fi +} + #----------------------------------------------------------# # Verifications # @@ -58,7 +154,6 @@ is_backup_available() { args_usage='USER BACKUP [WEB] [DNS] [MAIL] [DB] [CRON] [UDIR] [NOTIFY]' check_args '2' "$#" "$args_usage" is_format_valid 'user' 'backup' -is_backup_valid "$BACKUP/$backup" is_backup_available "$user" "$backup" @@ -66,6 +161,25 @@ is_backup_available "$user" "$backup" # Action # #----------------------------------------------------------# +# Checking local backup +if [ ! -e "$BACKUP/$backup" ]; then + if [[ "$BACKUP_SYSTEM" =~ "google" ]]; then + google_download $backup + downloaded='yes' + fi + if [[ "$BACKUP_SYSTEM" =~ "sftp" ]] && [ -z "$downloaded" ]; then + sftp_download $backup + downloaded='yes' + fi + if [[ "$BACKUP_SYSTEM" =~ "ftp" ]] && [ -z "$downloaded" ]; then + ftp_download $backup + downloaded='yes' + fi + if [ -z "$downloaded" ]; then + check_result $E_NOTEXIST "backup $backup doesn't exist" + fi +fi + # Checking user existance on the server check_user=$(is_object_valid 'user' 'USER' "$user") if [ -z "$check_user" ]; then diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip index b783b177..71d903b0 100755 --- a/bin/v-update-sys-ip +++ b/bin/v-update-sys-ip @@ -97,7 +97,8 @@ fi # Compare ips for ip in $ip_list; do - if [ ! -e "$VESTA/data/ips/$ip" ]; then + check_ifconfig=$(/sbin/ifconfig |grep "$ip") + if [ ! -e "$VESTA/data/ips/$ip" ] && [ ! -z "$check_ifconfig)" ]; then interface=$(/sbin/ip addr |grep $ip |awk '{print $NF}') interface=$(echo $interface |cut -f 1 -d :) netmask=$(/sbin/ip addr |grep $ip |cut -f 2 -d / |cut -f 1 -d \ ) diff --git a/func/domain.sh b/func/domain.sh index d5f0de35..1bc6f10b 100644 --- a/func/domain.sh +++ b/func/domain.sh @@ -271,7 +271,7 @@ del_web_config() { get_web_config_lines $WEBTPL/$1/$WEB_BACKEND/$2 $conf sed -i "$top_line,$bottom_line d" $conf - web_domain=$(grep $domain $USER_DATA/web.conf |wc -l) + web_domain=$(grep DOMAIN $USER_DATA/web.conf |wc -l) if [ "$web_domain" -eq '0' ]; then sed -i "/.*\/$user\/.*$1.conf/d" /etc/$1/conf.d/vesta.conf rm -f $conf @@ -360,6 +360,11 @@ update_domain_zone() { if [ -z "$SERIAL" ]; then SERIAL=$(date +'%Y%m%d01') fi + if [[ "$domain" = *[![:ascii:]]* ]]; then + domain_idn=$(idn -t --quiet -a $domain) + else + domain_idn=$domain + fi zn_conf="$HOMEDIR/$user/conf/dns/$domain.db" echo "\$TTL $TTL @ IN SOA $SOA. root.$domain_idn. ( @@ -506,12 +511,12 @@ is_mail_domain_new() { is_mail_new() { check_acc=$(grep "ACCOUNT='$1'" $USER_DATA/mail/$domain.conf) if [ ! -z "$check_acc" ]; then - check_result $E_EXIST "mail account $1 is already exists" + check_result $E_EXISTS "mail account $1 is already exists" fi check_als=$(awk -F "ALIAS='" '{print $2}' $USER_DATA/mail/$domain.conf ) check_als=$(echo "$check_als" | cut -f 1 -d "'" | grep -w $1) if [ ! -z "$check_als" ]; then - check_result $E_EXIST "mail alias $1 is already exists" + check_result $E_EXISTS "mail alias $1 is already exists" fi } diff --git a/func/rebuild.sh b/func/rebuild.sh index 72cd7002..5e532ca5 100644 --- a/func/rebuild.sh +++ b/func/rebuild.sh @@ -252,10 +252,16 @@ rebuild_web_domain_conf() { if [ ! -z "$STATS_USER" ]; then stats_dir="$HOMEDIR/$user/web/$domain/stats" - echo "AuthUserFile $stats_dir/.htpasswd" > $stats_dir/.htaccess - echo "AuthName \"Web Statistics\"" >> $stats_dir/.htaccess - echo "AuthType Basic" >> $stats_dir/.htaccess - echo "Require valid-user" >> $stats_dir/.htaccess + 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 + else + echo "AuthUserFile $stats_dir/.htpasswd" > $stats_dir/.htaccess + echo "AuthName \"Web Statistics\"" >> $stats_dir/.htaccess + echo "AuthType Basic" >> $stats_dir/.htaccess + echo "Require valid-user" >> $stats_dir/.htaccess + fi echo "$STATS_USER:$STATS_CRYPT" > $stats_dir/.htpasswd fi fi diff --git a/install/debian/7/packages/default.pkg b/install/debian/7/packages/default.pkg index 29585bac..f4a37554 100644 --- a/install/debian/7/packages/default.pkg +++ b/install/debian/7/packages/default.pkg @@ -9,7 +9,7 @@ MAIL_DOMAINS='100' MAIL_ACCOUNTS='100' DATABASES='100' CRON_JOBS='100' -DISK_QUOTA='10000' +DISK_QUOTA='unlimited' BANDWIDTH='100000' NS='ns1.localhost.ltd,ns2.localhost.ltd' SHELL='nologin' 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 01d82b60..b19fdeaa 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 @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 af452d19..06353a47 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 @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a592a652..b1491edf 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -48,6 +48,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 9b955aa6..1ed1e649 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -44,6 +44,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 4d330d34..8723a0e7 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 1f446e5d..d5281dc9 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 d1b5bcd2..9e7720bf 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 @@ -114,6 +114,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 ff33c232..d09b587e 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 @@ -110,6 +110,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a68c9986..7fade11b 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/default.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/default.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b143e53b..dbd38c07 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/default.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/default.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 8acad089..f0669d6f 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -59,6 +59,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 f3456aa7..ba854768 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 62e67cc9..13c17ecb 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 52adf452..55dde013 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 6ff87d84..6e8d89fa 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 75719cd9..c5d737ea 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b334d481..902f6fdb 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl @@ -89,6 +89,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 c927ab13..2100f934 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl @@ -86,6 +86,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 235a0121..6105b2c3 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 997c268d..9d46116a 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl @@ -46,6 +46,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b8dfc44d..54fab2b1 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl @@ -35,13 +35,13 @@ server { rewrite ^/(.*)$ /index.php?q=$1; } - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } + location ~ \.php$ { + try_files $uri =404; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + include /etc/nginx/fastcgi_params; + } error_page 403 /error/404.html; error_page 404 /error/404.html; @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 5928cd0e..b3c3e350 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/modx.tpl @@ -52,6 +52,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 c67efe86..7f16b0dd 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl @@ -77,6 +77,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 0147c821..49ea2869 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/moodle.tpl @@ -74,6 +74,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a0234ae3..f49a4a5b 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 @@ -34,6 +34,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 97d04599..3e796d1e 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 @@ -30,6 +30,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 3d3b7547..8cf16b07 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl @@ -72,6 +72,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 2e898100..e33332e0 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl @@ -68,6 +68,16 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 c53af401..877db95a 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl @@ -60,6 +60,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 6b4a94a6..253fe87b 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a6fc6755..2e5d9c8d 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -53,6 +53,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 68b378ef..4b2ec788 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -49,6 +49,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 910c28b6..a43dbe82 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b143e53b..dbd38c07 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 2822f875..80fd787a 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 37b8be30..54e1c755 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/www.conf b/install/debian/7/templates/web/nginx/php5-fpm/www.conf deleted file mode 100644 index d046bcee..00000000 --- a/install/debian/7/templates/web/nginx/php5-fpm/www.conf +++ /dev/null @@ -1,10 +0,0 @@ -[www] -listen = 127.0.0.1:9000 -listen.allowed_clients = 127.0.0.1 -user = www-data -group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 5 -pm.min_spare_servers = 3 -pm.max_spare_servers = 35 diff --git a/install/debian/8/packages/default.pkg b/install/debian/8/packages/default.pkg index 29585bac..f4a37554 100644 --- a/install/debian/8/packages/default.pkg +++ b/install/debian/8/packages/default.pkg @@ -9,7 +9,7 @@ MAIL_DOMAINS='100' MAIL_ACCOUNTS='100' DATABASES='100' CRON_JOBS='100' -DISK_QUOTA='10000' +DISK_QUOTA='unlimited' BANDWIDTH='100000' NS='ns1.localhost.ltd,ns2.localhost.ltd' SHELL='nologin' 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 01d82b60..b19fdeaa 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 @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 af452d19..06353a47 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 @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a592a652..b1491edf 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -48,6 +48,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 9b955aa6..1ed1e649 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -44,6 +44,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 4d330d34..8723a0e7 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 1f446e5d..d5281dc9 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 d1b5bcd2..9e7720bf 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 @@ -114,6 +114,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 ff33c232..d09b587e 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 @@ -110,6 +110,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a68c9986..7fade11b 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/default.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/default.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b143e53b..dbd38c07 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/default.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/default.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 8acad089..f0669d6f 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -59,6 +59,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 f3456aa7..ba854768 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 62e67cc9..13c17ecb 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 52adf452..55dde013 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 6ff87d84..6e8d89fa 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 75719cd9..c5d737ea 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b334d481..902f6fdb 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl @@ -89,6 +89,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 c927ab13..2100f934 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl @@ -86,6 +86,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 235a0121..6105b2c3 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 997c268d..9d46116a 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl @@ -46,6 +46,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b8dfc44d..54fab2b1 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl @@ -35,13 +35,13 @@ server { rewrite ^/(.*)$ /index.php?q=$1; } - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } + location ~ \.php$ { + try_files $uri =404; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + include /etc/nginx/fastcgi_params; + } error_page 403 /error/404.html; error_page 404 /error/404.html; @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 5928cd0e..b3c3e350 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/modx.tpl @@ -52,6 +52,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 c67efe86..7f16b0dd 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl @@ -77,6 +77,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 0147c821..49ea2869 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/moodle.tpl @@ -74,6 +74,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a0234ae3..f49a4a5b 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 @@ -34,6 +34,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 97d04599..3e796d1e 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 @@ -30,6 +30,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 3d3b7547..8cf16b07 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl @@ -72,6 +72,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 2e898100..e33332e0 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl @@ -68,6 +68,16 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 c53af401..877db95a 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl @@ -60,6 +60,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 6b4a94a6..253fe87b 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a6fc6755..2e5d9c8d 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -53,6 +53,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 68b378ef..4b2ec788 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -49,6 +49,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 910c28b6..a43dbe82 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b143e53b..dbd38c07 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 2822f875..80fd787a 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 37b8be30..54e1c755 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/rhel/5/packages/default.pkg b/install/rhel/5/packages/default.pkg index 3df21d3d..0deb08ce 100644 --- a/install/rhel/5/packages/default.pkg +++ b/install/rhel/5/packages/default.pkg @@ -10,7 +10,7 @@ MAIL_DOMAINS='100' MAIL_ACCOUNTS='100' DATABASES='100' CRON_JOBS='100' -DISK_QUOTA='10000' +DISK_QUOTA='unlimited' BANDWIDTH='100000' NS='ns1.localhost.ltd,ns2.localhost.ltd' SHELL='nologin' diff --git a/install/rhel/5/pma/phpMyAdmin.conf b/install/rhel/5/pma/phpMyAdmin.conf index 0049ef2b..b1b6b60d 100644 --- a/install/rhel/5/pma/phpMyAdmin.conf +++ b/install/rhel/5/pma/phpMyAdmin.conf @@ -37,3 +37,9 @@ Alias /phpmyadmin /usr/share/phpMyAdmin # SecRuleInheritance Off # # + + + Order Deny,Allow + Deny from All + Allow from None + 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 01d82b60..b19fdeaa 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 @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 af452d19..06353a47 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 @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a592a652..b1491edf 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -48,6 +48,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 9b955aa6..1ed1e649 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -44,6 +44,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 4d330d34..8723a0e7 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 1f446e5d..d5281dc9 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 d1b5bcd2..9e7720bf 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 @@ -114,6 +114,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 ff33c232..d09b587e 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 @@ -110,6 +110,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a68c9986..7fade11b 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/default.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/default.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b143e53b..dbd38c07 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/default.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/default.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 8acad089..f0669d6f 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -59,6 +59,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 f3456aa7..ba854768 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 62e67cc9..13c17ecb 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 52adf452..55dde013 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 6ff87d84..6e8d89fa 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 75719cd9..c5d737ea 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b334d481..902f6fdb 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl @@ -89,6 +89,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 c927ab13..2100f934 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl @@ -86,6 +86,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 235a0121..6105b2c3 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 997c268d..9d46116a 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl @@ -46,6 +46,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b8dfc44d..54fab2b1 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl @@ -35,13 +35,13 @@ server { rewrite ^/(.*)$ /index.php?q=$1; } - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } + location ~ \.php$ { + try_files $uri =404; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + include /etc/nginx/fastcgi_params; + } error_page 403 /error/404.html; error_page 404 /error/404.html; @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 5928cd0e..b3c3e350 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/modx.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/modx.tpl @@ -52,6 +52,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 c67efe86..7f16b0dd 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl @@ -77,6 +77,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 0147c821..49ea2869 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/moodle.tpl @@ -74,6 +74,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 new file mode 100644 index 00000000..f49a4a5b --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/no-php.stpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %sdocroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + types { + text/html html htm shtml php php5; + } + + location / { + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} 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 new file mode 100644 index 00000000..3e796d1e --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/no-php.tpl @@ -0,0 +1,43 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + types { + text/html html htm shtml php php5; + } + + location / { + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} 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 3d3b7547..8cf16b07 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl @@ -72,6 +72,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 2e898100..e33332e0 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl @@ -68,6 +68,16 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 c53af401..877db95a 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl @@ -60,6 +60,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 6b4a94a6..253fe87b 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a6fc6755..2e5d9c8d 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl @@ -53,6 +53,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 68b378ef..4b2ec788 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl @@ -49,6 +49,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 910c28b6..a43dbe82 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b143e53b..dbd38c07 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 2822f875..80fd787a 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 37b8be30..54e1c755 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/rhel/6/packages/default.pkg b/install/rhel/6/packages/default.pkg index 3df21d3d..0deb08ce 100644 --- a/install/rhel/6/packages/default.pkg +++ b/install/rhel/6/packages/default.pkg @@ -10,7 +10,7 @@ MAIL_DOMAINS='100' MAIL_ACCOUNTS='100' DATABASES='100' CRON_JOBS='100' -DISK_QUOTA='10000' +DISK_QUOTA='unlimited' BANDWIDTH='100000' NS='ns1.localhost.ltd,ns2.localhost.ltd' SHELL='nologin' diff --git a/install/rhel/6/pma/phpMyAdmin.conf b/install/rhel/6/pma/phpMyAdmin.conf index 0049ef2b..b1b6b60d 100644 --- a/install/rhel/6/pma/phpMyAdmin.conf +++ b/install/rhel/6/pma/phpMyAdmin.conf @@ -37,3 +37,9 @@ Alias /phpmyadmin /usr/share/phpMyAdmin # SecRuleInheritance Off # # + + + Order Deny,Allow + Deny from All + Allow from None + 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 01d82b60..b19fdeaa 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 @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 af452d19..06353a47 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 @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a592a652..b1491edf 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -48,6 +48,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 9b955aa6..1ed1e649 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -44,6 +44,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 4d330d34..8723a0e7 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 1f446e5d..d5281dc9 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 d1b5bcd2..9e7720bf 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 @@ -114,6 +114,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 ff33c232..d09b587e 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 @@ -110,6 +110,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a68c9986..7fade11b 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/default.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/default.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b143e53b..dbd38c07 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/default.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/default.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 8acad089..f0669d6f 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -59,6 +59,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 f3456aa7..ba854768 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 62e67cc9..13c17ecb 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 52adf452..55dde013 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 6ff87d84..6e8d89fa 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 75719cd9..c5d737ea 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b334d481..902f6fdb 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl @@ -89,6 +89,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 c927ab13..2100f934 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl @@ -86,6 +86,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 235a0121..6105b2c3 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 997c268d..9d46116a 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl @@ -46,6 +46,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b8dfc44d..54fab2b1 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl @@ -35,13 +35,13 @@ server { rewrite ^/(.*)$ /index.php?q=$1; } - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } + location ~ \.php$ { + try_files $uri =404; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + include /etc/nginx/fastcgi_params; + } error_page 403 /error/404.html; error_page 404 /error/404.html; @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 5928cd0e..b3c3e350 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/modx.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/modx.tpl @@ -52,6 +52,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 c67efe86..7f16b0dd 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl @@ -77,6 +77,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 0147c821..49ea2869 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/moodle.tpl @@ -74,6 +74,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 new file mode 100644 index 00000000..f49a4a5b --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/no-php.stpl @@ -0,0 +1,47 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + root %sdocroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + types { + text/html html htm shtml php php5; + } + + location / { + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/snginx.%domain%.conf*; +} 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 new file mode 100644 index 00000000..3e796d1e --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/no-php.tpl @@ -0,0 +1,43 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + types { + text/html html htm shtml php php5; + } + + location / { + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} 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 3d3b7547..8cf16b07 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl @@ -72,6 +72,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 2e898100..e33332e0 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl @@ -68,6 +68,16 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 c53af401..877db95a 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl @@ -60,6 +60,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 6b4a94a6..253fe87b 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a6fc6755..2e5d9c8d 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl @@ -53,6 +53,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 68b378ef..4b2ec788 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl @@ -49,6 +49,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 910c28b6..a43dbe82 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b143e53b..dbd38c07 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 2822f875..80fd787a 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 37b8be30..54e1c755 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/rhel/7/packages/default.pkg b/install/rhel/7/packages/default.pkg index 3df21d3d..0deb08ce 100644 --- a/install/rhel/7/packages/default.pkg +++ b/install/rhel/7/packages/default.pkg @@ -10,7 +10,7 @@ MAIL_DOMAINS='100' MAIL_ACCOUNTS='100' DATABASES='100' CRON_JOBS='100' -DISK_QUOTA='10000' +DISK_QUOTA='unlimited' BANDWIDTH='100000' NS='ns1.localhost.ltd,ns2.localhost.ltd' SHELL='nologin' diff --git a/install/rhel/7/pma/phpMyAdmin.conf b/install/rhel/7/pma/phpMyAdmin.conf index 0049ef2b..b1b6b60d 100644 --- a/install/rhel/7/pma/phpMyAdmin.conf +++ b/install/rhel/7/pma/phpMyAdmin.conf @@ -37,3 +37,9 @@ Alias /phpmyadmin /usr/share/phpMyAdmin # SecRuleInheritance Off # # + + + Order Deny,Allow + Deny from All + Allow from None + 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 01d82b60..b19fdeaa 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 @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 af452d19..06353a47 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 @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a592a652..b1491edf 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -48,6 +48,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 9b955aa6..1ed1e649 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -44,6 +44,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 4d330d34..8723a0e7 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 1f446e5d..d5281dc9 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 d1b5bcd2..9e7720bf 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 @@ -114,6 +114,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 ff33c232..d09b587e 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 @@ -110,6 +110,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a68c9986..7fade11b 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/default.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/default.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b143e53b..dbd38c07 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/default.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/default.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 8acad089..f0669d6f 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -59,6 +59,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 f3456aa7..ba854768 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 62e67cc9..13c17ecb 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 52adf452..55dde013 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 6ff87d84..6e8d89fa 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 75719cd9..c5d737ea 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b334d481..902f6fdb 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl @@ -89,6 +89,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 c927ab13..2100f934 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl @@ -86,6 +86,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 235a0121..6105b2c3 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 997c268d..9d46116a 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl @@ -46,6 +46,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b8dfc44d..54fab2b1 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl @@ -35,13 +35,13 @@ server { rewrite ^/(.*)$ /index.php?q=$1; } - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } + location ~ \.php$ { + try_files $uri =404; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + include /etc/nginx/fastcgi_params; + } error_page 403 /error/404.html; error_page 404 /error/404.html; @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 5928cd0e..b3c3e350 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/modx.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/modx.tpl @@ -52,6 +52,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 c67efe86..7f16b0dd 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl @@ -77,6 +77,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 0147c821..49ea2869 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/moodle.tpl @@ -74,6 +74,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a0234ae3..f49a4a5b 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 @@ -34,6 +34,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 97d04599..3e796d1e 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 @@ -30,6 +30,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 3d3b7547..8cf16b07 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl @@ -72,6 +72,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 2e898100..e33332e0 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl @@ -68,6 +68,16 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 c53af401..877db95a 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl @@ -60,6 +60,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 6b4a94a6..253fe87b 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 a6fc6755..2e5d9c8d 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl @@ -53,6 +53,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 68b378ef..4b2ec788 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl @@ -49,6 +49,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 910c28b6..a43dbe82 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 b143e53b..dbd38c07 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 2822f875..80fd787a 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.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 37b8be30..54e1c755 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/packages/default.pkg b/install/ubuntu/12.04/packages/default.pkg index 29585bac..f4a37554 100644 --- a/install/ubuntu/12.04/packages/default.pkg +++ b/install/ubuntu/12.04/packages/default.pkg @@ -9,7 +9,7 @@ MAIL_DOMAINS='100' MAIL_ACCOUNTS='100' DATABASES='100' CRON_JOBS='100' -DISK_QUOTA='10000' +DISK_QUOTA='unlimited' BANDWIDTH='100000' NS='ns1.localhost.ltd,ns2.localhost.ltd' SHELL='nologin' diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl index 01d82b60..b19fdeaa 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl index af452d19..06353a47 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.stpl index a592a652..b1491edf 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -48,6 +48,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.tpl index 9b955aa6..1ed1e649 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -44,6 +44,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.stpl index 4d330d34..8723a0e7 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.tpl index 1f446e5d..d5281dc9 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.stpl index d1b5bcd2..9e7720bf 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -114,6 +114,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.tpl index ff33c232..d09b587e 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -110,6 +110,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.stpl index a68c9986..7fade11b 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.tpl index b143e53b..dbd38c07 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.stpl index 8acad089..f0669d6f 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -59,6 +59,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.tpl index f3456aa7..ba854768 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.stpl index 62e67cc9..13c17ecb 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.tpl index 52adf452..55dde013 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.stpl index 6ff87d84..6e8d89fa 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.tpl index 75719cd9..c5d737ea 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.stpl index b334d481..902f6fdb 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.stpl @@ -89,6 +89,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.tpl index c927ab13..2100f934 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.tpl @@ -86,6 +86,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.stpl index 235a0121..6105b2c3 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.stpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.tpl index 997c268d..9d46116a 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.tpl @@ -46,6 +46,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.stpl index b8dfc44d..54fab2b1 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.stpl @@ -35,13 +35,13 @@ server { rewrite ^/(.*)$ /index.php?q=$1; } - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } + location ~ \.php$ { + try_files $uri =404; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + include /etc/nginx/fastcgi_params; + } error_page 403 /error/404.html; error_page 404 /error/404.html; @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.tpl index 5928cd0e..b3c3e350 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.tpl @@ -52,6 +52,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.stpl index c67efe86..7f16b0dd 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.stpl @@ -77,6 +77,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.tpl index 0147c821..49ea2869 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.tpl @@ -74,6 +74,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.stpl index a0234ae3..f49a4a5b 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.stpl @@ -34,6 +34,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.tpl index 97d04599..3e796d1e 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.tpl @@ -30,6 +30,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.stpl index 3d3b7547..8cf16b07 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.stpl @@ -72,6 +72,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.tpl index 2e898100..e33332e0 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.tpl @@ -68,6 +68,16 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.stpl index c53af401..877db95a 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.stpl @@ -60,6 +60,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.tpl index 6b4a94a6..253fe87b 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.tpl @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.stpl index a6fc6755..2e5d9c8d 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -53,6 +53,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.tpl index 68b378ef..4b2ec788 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -49,6 +49,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.stpl index 910c28b6..a43dbe82 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.tpl index b143e53b..dbd38c07 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.stpl index 2822f875..80fd787a 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.tpl index 37b8be30..54e1c755 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/packages/default.pkg b/install/ubuntu/12.10/packages/default.pkg index 29585bac..f4a37554 100644 --- a/install/ubuntu/12.10/packages/default.pkg +++ b/install/ubuntu/12.10/packages/default.pkg @@ -9,7 +9,7 @@ MAIL_DOMAINS='100' MAIL_ACCOUNTS='100' DATABASES='100' CRON_JOBS='100' -DISK_QUOTA='10000' +DISK_QUOTA='unlimited' BANDWIDTH='100000' NS='ns1.localhost.ltd,ns2.localhost.ltd' SHELL='nologin' diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl index 01d82b60..b19fdeaa 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl index af452d19..06353a47 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.stpl index a592a652..b1491edf 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -48,6 +48,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.tpl index 9b955aa6..1ed1e649 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -44,6 +44,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.stpl index 4d330d34..8723a0e7 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.tpl index 1f446e5d..d5281dc9 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.stpl index d1b5bcd2..9e7720bf 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -114,6 +114,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.tpl index ff33c232..d09b587e 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -110,6 +110,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.stpl index a68c9986..7fade11b 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.tpl index b143e53b..dbd38c07 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.stpl index 8acad089..f0669d6f 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -59,6 +59,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.tpl index f3456aa7..ba854768 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.stpl index 62e67cc9..13c17ecb 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.tpl index 52adf452..55dde013 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.stpl index 6ff87d84..6e8d89fa 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.tpl index 75719cd9..c5d737ea 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.stpl index b334d481..902f6fdb 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.stpl @@ -89,6 +89,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.tpl index c927ab13..2100f934 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.tpl @@ -86,6 +86,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.stpl index 235a0121..6105b2c3 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.stpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.tpl index 997c268d..9d46116a 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.tpl @@ -46,6 +46,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.stpl index b8dfc44d..54fab2b1 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.stpl @@ -35,13 +35,13 @@ server { rewrite ^/(.*)$ /index.php?q=$1; } - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } + location ~ \.php$ { + try_files $uri =404; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + include /etc/nginx/fastcgi_params; + } error_page 403 /error/404.html; error_page 404 /error/404.html; @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.tpl index 5928cd0e..b3c3e350 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.tpl @@ -52,6 +52,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.stpl index c67efe86..7f16b0dd 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.stpl @@ -77,6 +77,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.tpl index 0147c821..49ea2869 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.tpl @@ -74,6 +74,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.stpl index a0234ae3..f49a4a5b 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.stpl @@ -34,6 +34,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.tpl index 97d04599..3e796d1e 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.tpl @@ -30,6 +30,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.stpl index 3d3b7547..8cf16b07 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.stpl @@ -72,6 +72,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.tpl index 2e898100..e33332e0 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.tpl @@ -68,6 +68,16 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.stpl index c53af401..877db95a 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.stpl @@ -60,6 +60,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.tpl index 6b4a94a6..253fe87b 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.tpl @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.stpl index a6fc6755..2e5d9c8d 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -53,6 +53,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.tpl index 68b378ef..4b2ec788 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -49,6 +49,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.stpl index 910c28b6..a43dbe82 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.tpl index b143e53b..dbd38c07 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.stpl index 2822f875..80fd787a 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.tpl index 37b8be30..54e1c755 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/packages/default.pkg b/install/ubuntu/13.04/packages/default.pkg index 29585bac..f4a37554 100644 --- a/install/ubuntu/13.04/packages/default.pkg +++ b/install/ubuntu/13.04/packages/default.pkg @@ -9,7 +9,7 @@ MAIL_DOMAINS='100' MAIL_ACCOUNTS='100' DATABASES='100' CRON_JOBS='100' -DISK_QUOTA='10000' +DISK_QUOTA='unlimited' BANDWIDTH='100000' NS='ns1.localhost.ltd,ns2.localhost.ltd' SHELL='nologin' diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl index 01d82b60..b19fdeaa 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl index af452d19..06353a47 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.stpl index a592a652..b1491edf 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -48,6 +48,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.tpl index 9b955aa6..1ed1e649 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -44,6 +44,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.stpl index 4d330d34..8723a0e7 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.tpl index 1f446e5d..d5281dc9 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.stpl index d1b5bcd2..9e7720bf 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -114,6 +114,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.tpl index ff33c232..d09b587e 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -110,6 +110,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.stpl index a68c9986..7fade11b 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.tpl index b143e53b..dbd38c07 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.stpl index 8acad089..f0669d6f 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -59,6 +59,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.tpl index f3456aa7..ba854768 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.stpl index 62e67cc9..13c17ecb 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.tpl index 52adf452..55dde013 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.stpl index 6ff87d84..6e8d89fa 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.tpl index 75719cd9..c5d737ea 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.stpl index b334d481..902f6fdb 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.stpl @@ -89,6 +89,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.tpl index c927ab13..2100f934 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.tpl @@ -86,6 +86,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.stpl index 235a0121..6105b2c3 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.stpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.tpl index 997c268d..9d46116a 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.tpl @@ -46,6 +46,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.stpl index b8dfc44d..54fab2b1 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.stpl @@ -35,13 +35,13 @@ server { rewrite ^/(.*)$ /index.php?q=$1; } - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } + location ~ \.php$ { + try_files $uri =404; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + include /etc/nginx/fastcgi_params; + } error_page 403 /error/404.html; error_page 404 /error/404.html; @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.tpl index 5928cd0e..b3c3e350 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.tpl @@ -52,6 +52,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.stpl index c67efe86..7f16b0dd 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.stpl @@ -77,6 +77,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.tpl index 0147c821..49ea2869 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.tpl @@ -74,6 +74,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.stpl index a0234ae3..f49a4a5b 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.stpl @@ -34,6 +34,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.tpl index 97d04599..3e796d1e 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.tpl @@ -30,6 +30,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.stpl index 3d3b7547..8cf16b07 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.stpl @@ -72,6 +72,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.tpl index 2e898100..e33332e0 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.tpl @@ -68,6 +68,16 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.stpl index c53af401..877db95a 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.stpl @@ -60,6 +60,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.tpl index 6b4a94a6..253fe87b 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.tpl @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.stpl index a6fc6755..2e5d9c8d 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -53,6 +53,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.tpl index 68b378ef..4b2ec788 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -49,6 +49,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.stpl index 910c28b6..a43dbe82 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.tpl index b143e53b..dbd38c07 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.stpl index 2822f875..80fd787a 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.tpl index 37b8be30..54e1c755 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/packages/default.pkg b/install/ubuntu/13.10/packages/default.pkg index 29585bac..f4a37554 100644 --- a/install/ubuntu/13.10/packages/default.pkg +++ b/install/ubuntu/13.10/packages/default.pkg @@ -9,7 +9,7 @@ MAIL_DOMAINS='100' MAIL_ACCOUNTS='100' DATABASES='100' CRON_JOBS='100' -DISK_QUOTA='10000' +DISK_QUOTA='unlimited' BANDWIDTH='100000' NS='ns1.localhost.ltd,ns2.localhost.ltd' SHELL='nologin' diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl index 01d82b60..b19fdeaa 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl index af452d19..06353a47 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.stpl index a592a652..b1491edf 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -48,6 +48,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.tpl index 9b955aa6..1ed1e649 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -44,6 +44,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.stpl index 4d330d34..8723a0e7 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.tpl index 1f446e5d..d5281dc9 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.stpl index d1b5bcd2..9e7720bf 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -114,6 +114,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.tpl index ff33c232..d09b587e 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -110,6 +110,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.stpl index a68c9986..7fade11b 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.tpl index b143e53b..dbd38c07 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.stpl index 8acad089..f0669d6f 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -59,6 +59,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.tpl index f3456aa7..ba854768 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.stpl index 62e67cc9..13c17ecb 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.tpl index 52adf452..55dde013 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.stpl index 6ff87d84..6e8d89fa 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.tpl index 75719cd9..c5d737ea 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.stpl index b334d481..902f6fdb 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.stpl @@ -89,6 +89,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.tpl index c927ab13..2100f934 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.tpl @@ -86,6 +86,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.stpl index 235a0121..6105b2c3 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.stpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.tpl index 997c268d..9d46116a 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.tpl @@ -46,6 +46,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.stpl index b8dfc44d..54fab2b1 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.stpl @@ -35,13 +35,13 @@ server { rewrite ^/(.*)$ /index.php?q=$1; } - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } + location ~ \.php$ { + try_files $uri =404; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + include /etc/nginx/fastcgi_params; + } error_page 403 /error/404.html; error_page 404 /error/404.html; @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.tpl index 5928cd0e..b3c3e350 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.tpl @@ -52,6 +52,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.stpl index c67efe86..7f16b0dd 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.stpl @@ -77,6 +77,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.tpl index 0147c821..49ea2869 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.tpl @@ -74,6 +74,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.stpl index a0234ae3..f49a4a5b 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.stpl @@ -34,6 +34,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.tpl index 97d04599..3e796d1e 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.tpl @@ -30,6 +30,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.stpl index 3d3b7547..8cf16b07 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.stpl @@ -72,6 +72,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.tpl index 2e898100..e33332e0 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.tpl @@ -68,6 +68,16 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.stpl index c53af401..877db95a 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.stpl @@ -60,6 +60,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.tpl index 6b4a94a6..253fe87b 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.tpl @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.stpl index a6fc6755..2e5d9c8d 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -53,6 +53,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.tpl index 68b378ef..4b2ec788 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -49,6 +49,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.stpl index 910c28b6..a43dbe82 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.tpl index b143e53b..dbd38c07 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.stpl index 2822f875..80fd787a 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.tpl index 37b8be30..54e1c755 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/packages/default.pkg b/install/ubuntu/14.04/packages/default.pkg index 29585bac..f4a37554 100644 --- a/install/ubuntu/14.04/packages/default.pkg +++ b/install/ubuntu/14.04/packages/default.pkg @@ -9,7 +9,7 @@ MAIL_DOMAINS='100' MAIL_ACCOUNTS='100' DATABASES='100' CRON_JOBS='100' -DISK_QUOTA='10000' +DISK_QUOTA='unlimited' BANDWIDTH='100000' NS='ns1.localhost.ltd,ns2.localhost.ltd' SHELL='nologin' diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl index 01d82b60..b19fdeaa 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl index af452d19..06353a47 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.stpl index a592a652..b1491edf 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -48,6 +48,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.tpl index 9b955aa6..1ed1e649 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -44,6 +44,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.stpl index 4d330d34..8723a0e7 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.tpl index 1f446e5d..d5281dc9 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.stpl index d1b5bcd2..9e7720bf 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -114,6 +114,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.tpl index ff33c232..d09b587e 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -110,6 +110,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.stpl index a68c9986..7fade11b 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.tpl index b143e53b..dbd38c07 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.stpl index 8acad089..f0669d6f 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -59,6 +59,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.tpl index f3456aa7..ba854768 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.stpl index 62e67cc9..13c17ecb 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.tpl index 52adf452..55dde013 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.stpl index 6ff87d84..6e8d89fa 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.tpl index 75719cd9..c5d737ea 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.stpl index b334d481..902f6fdb 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.stpl @@ -89,6 +89,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.tpl index c927ab13..2100f934 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.tpl @@ -86,6 +86,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.stpl index 235a0121..6105b2c3 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.stpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.tpl index 997c268d..9d46116a 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.tpl @@ -46,6 +46,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.stpl index b8dfc44d..54fab2b1 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.stpl @@ -35,13 +35,13 @@ server { rewrite ^/(.*)$ /index.php?q=$1; } - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } + location ~ \.php$ { + try_files $uri =404; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + include /etc/nginx/fastcgi_params; + } error_page 403 /error/404.html; error_page 404 /error/404.html; @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.tpl index 5928cd0e..b3c3e350 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.tpl @@ -52,6 +52,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.stpl index c67efe86..7f16b0dd 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.stpl @@ -77,6 +77,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.tpl index 0147c821..49ea2869 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.tpl @@ -74,6 +74,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.stpl index a0234ae3..f49a4a5b 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.stpl @@ -34,6 +34,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.tpl index 97d04599..3e796d1e 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.tpl @@ -30,6 +30,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.stpl index 3d3b7547..8cf16b07 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.stpl @@ -72,6 +72,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.tpl index 2e898100..e33332e0 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.tpl @@ -68,6 +68,16 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.stpl index c53af401..877db95a 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.stpl @@ -60,6 +60,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.tpl index 6b4a94a6..253fe87b 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.tpl @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.stpl index a6fc6755..2e5d9c8d 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -53,6 +53,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.tpl index 68b378ef..4b2ec788 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -49,6 +49,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.stpl index 910c28b6..a43dbe82 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.tpl index b143e53b..dbd38c07 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.stpl index 2822f875..80fd787a 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.tpl index 37b8be30..54e1c755 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/packages/default.pkg b/install/ubuntu/14.10/packages/default.pkg index 29585bac..f4a37554 100644 --- a/install/ubuntu/14.10/packages/default.pkg +++ b/install/ubuntu/14.10/packages/default.pkg @@ -9,7 +9,7 @@ MAIL_DOMAINS='100' MAIL_ACCOUNTS='100' DATABASES='100' CRON_JOBS='100' -DISK_QUOTA='10000' +DISK_QUOTA='unlimited' BANDWIDTH='100000' NS='ns1.localhost.ltd,ns2.localhost.ltd' SHELL='nologin' diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl index 01d82b60..b19fdeaa 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl index af452d19..06353a47 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.stpl index a592a652..b1491edf 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -48,6 +48,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.tpl index 9b955aa6..1ed1e649 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -44,6 +44,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.stpl index 4d330d34..8723a0e7 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.tpl index 1f446e5d..d5281dc9 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.stpl index d1b5bcd2..9e7720bf 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -114,6 +114,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.tpl index ff33c232..d09b587e 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -110,6 +110,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.stpl index a68c9986..7fade11b 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.tpl index b143e53b..dbd38c07 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.stpl index 8acad089..f0669d6f 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -59,6 +59,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.tpl index f3456aa7..ba854768 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.stpl index 62e67cc9..13c17ecb 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.tpl index 52adf452..55dde013 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.stpl index 6ff87d84..6e8d89fa 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.tpl index 75719cd9..c5d737ea 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.stpl index b334d481..902f6fdb 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.stpl @@ -89,6 +89,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.tpl index c927ab13..2100f934 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.tpl @@ -86,6 +86,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.stpl index 235a0121..6105b2c3 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.stpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.tpl index 997c268d..9d46116a 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.tpl @@ -46,6 +46,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.stpl index b8dfc44d..54fab2b1 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.stpl @@ -35,13 +35,13 @@ server { rewrite ^/(.*)$ /index.php?q=$1; } - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } + location ~ \.php$ { + try_files $uri =404; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + include /etc/nginx/fastcgi_params; + } error_page 403 /error/404.html; error_page 404 /error/404.html; @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.tpl index 5928cd0e..b3c3e350 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.tpl @@ -52,6 +52,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.stpl index c67efe86..7f16b0dd 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.stpl @@ -77,6 +77,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.tpl index 0147c821..49ea2869 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.tpl @@ -74,6 +74,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.stpl index a0234ae3..f49a4a5b 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.stpl @@ -34,6 +34,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.tpl index 97d04599..3e796d1e 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.tpl @@ -30,6 +30,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.stpl index 3d3b7547..8cf16b07 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.stpl @@ -72,6 +72,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.tpl index 2e898100..e33332e0 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.tpl @@ -68,6 +68,16 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.stpl index c53af401..877db95a 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.stpl @@ -60,6 +60,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.tpl index 6b4a94a6..253fe87b 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.tpl @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.stpl index a6fc6755..2e5d9c8d 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -53,6 +53,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.tpl index 68b378ef..4b2ec788 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -49,6 +49,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.stpl index 910c28b6..a43dbe82 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.tpl index b143e53b..dbd38c07 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.stpl index 2822f875..80fd787a 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.tpl index 37b8be30..54e1c755 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/packages/default.pkg b/install/ubuntu/15.04/packages/default.pkg index 29585bac..f4a37554 100644 --- a/install/ubuntu/15.04/packages/default.pkg +++ b/install/ubuntu/15.04/packages/default.pkg @@ -9,7 +9,7 @@ MAIL_DOMAINS='100' MAIL_ACCOUNTS='100' DATABASES='100' CRON_JOBS='100' -DISK_QUOTA='10000' +DISK_QUOTA='unlimited' BANDWIDTH='100000' NS='ns1.localhost.ltd,ns2.localhost.ltd' SHELL='nologin' diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl index 01d82b60..b19fdeaa 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl index af452d19..06353a47 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.stpl index a592a652..b1491edf 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -48,6 +48,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.tpl index 9b955aa6..1ed1e649 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -44,6 +44,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.stpl index 4d330d34..8723a0e7 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.tpl index 1f446e5d..d5281dc9 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.stpl index d1b5bcd2..9e7720bf 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -114,6 +114,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.tpl index ff33c232..d09b587e 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -110,6 +110,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.stpl index a68c9986..7fade11b 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.tpl index b143e53b..dbd38c07 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.stpl index 8acad089..f0669d6f 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -59,6 +59,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.tpl index f3456aa7..ba854768 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.stpl index 62e67cc9..13c17ecb 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.tpl index 52adf452..55dde013 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.stpl index 6ff87d84..6e8d89fa 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.tpl index 75719cd9..c5d737ea 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.stpl index b334d481..902f6fdb 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.stpl @@ -89,6 +89,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.tpl index c927ab13..2100f934 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.tpl @@ -86,6 +86,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.stpl index 235a0121..6105b2c3 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.stpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.tpl index 997c268d..9d46116a 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.tpl @@ -46,6 +46,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.stpl index a56fe12b..54fab2b1 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.stpl @@ -6,7 +6,7 @@ server { access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; @@ -35,13 +35,13 @@ server { rewrite ^/(.*)$ /index.php?q=$1; } - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } + location ~ \.php$ { + try_files $uri =404; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + include /etc/nginx/fastcgi_params; + } error_page 403 /error/404.html; error_page 404 /error/404.html; @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.tpl index 5928cd0e..b3c3e350 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.tpl @@ -52,6 +52,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.stpl index c67efe86..7f16b0dd 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.stpl @@ -77,6 +77,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.tpl index 0147c821..49ea2869 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.tpl @@ -74,6 +74,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.stpl index a0234ae3..f49a4a5b 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.stpl @@ -34,6 +34,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.tpl index 97d04599..3e796d1e 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.tpl @@ -30,6 +30,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.stpl index 3d3b7547..8cf16b07 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.stpl @@ -72,6 +72,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.tpl index 2e898100..e33332e0 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.tpl @@ -68,6 +68,16 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.stpl index c53af401..877db95a 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.stpl @@ -60,6 +60,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.tpl index 6b4a94a6..253fe87b 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.tpl @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.stpl index a6fc6755..2e5d9c8d 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -53,6 +53,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.tpl index 68b378ef..4b2ec788 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -49,6 +49,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.stpl index 910c28b6..a43dbe82 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.tpl index b143e53b..dbd38c07 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.stpl index 2822f875..80fd787a 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.tpl index 37b8be30..54e1c755 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/packages/default.pkg b/install/ubuntu/15.10/packages/default.pkg index 29585bac..f4a37554 100644 --- a/install/ubuntu/15.10/packages/default.pkg +++ b/install/ubuntu/15.10/packages/default.pkg @@ -9,7 +9,7 @@ MAIL_DOMAINS='100' MAIL_ACCOUNTS='100' DATABASES='100' CRON_JOBS='100' -DISK_QUOTA='10000' +DISK_QUOTA='unlimited' BANDWIDTH='100000' NS='ns1.localhost.ltd,ns2.localhost.ltd' SHELL='nologin' diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl index 01d82b60..b19fdeaa 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl index af452d19..06353a47 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.stpl index a592a652..b1491edf 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -48,6 +48,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.tpl index 9b955aa6..1ed1e649 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -44,6 +44,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.stpl index 4d330d34..8723a0e7 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -43,6 +43,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.tpl index 1f446e5d..d5281dc9 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -39,6 +39,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.stpl index d1b5bcd2..9e7720bf 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -114,6 +114,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.tpl index ff33c232..d09b587e 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -110,6 +110,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.stpl index a68c9986..7fade11b 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.tpl index b143e53b..dbd38c07 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.stpl index 8acad089..f0669d6f 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -59,6 +59,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.tpl index f3456aa7..ba854768 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.stpl index 62e67cc9..13c17ecb 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.tpl index 52adf452..55dde013 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.stpl index 6ff87d84..6e8d89fa 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.stpl @@ -88,6 +88,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.tpl index 75719cd9..c5d737ea 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.tpl @@ -85,6 +85,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.stpl index b334d481..902f6fdb 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.stpl @@ -89,6 +89,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.tpl index c927ab13..2100f934 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.tpl @@ -86,6 +86,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.stpl index 235a0121..6105b2c3 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.stpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.tpl index 997c268d..9d46116a 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.tpl @@ -46,6 +46,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.stpl index b8dfc44d..54fab2b1 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.stpl @@ -35,13 +35,13 @@ server { rewrite ^/(.*)$ /index.php?q=$1; } - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } + location ~ \.php$ { + try_files $uri =404; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + include /etc/nginx/fastcgi_params; + } error_page 403 /error/404.html; error_page 404 /error/404.html; @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.tpl index 5928cd0e..b3c3e350 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.tpl @@ -52,6 +52,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.stpl index c67efe86..7f16b0dd 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.stpl @@ -77,6 +77,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.tpl index 0147c821..49ea2869 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.tpl @@ -74,6 +74,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.stpl index a0234ae3..f49a4a5b 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.stpl @@ -34,6 +34,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.tpl index 97d04599..3e796d1e 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.tpl @@ -30,6 +30,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.stpl index 3d3b7547..8cf16b07 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.stpl @@ -72,6 +72,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.tpl index 2e898100..e33332e0 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.tpl @@ -68,6 +68,16 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.stpl index c53af401..877db95a 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.stpl @@ -60,6 +60,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.tpl index 6b4a94a6..253fe87b 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.tpl @@ -56,6 +56,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.stpl index a6fc6755..2e5d9c8d 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -53,6 +53,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.tpl index 68b378ef..4b2ec788 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -49,6 +49,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.stpl index 910c28b6..a43dbe82 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.stpl @@ -42,6 +42,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.tpl index b143e53b..dbd38c07 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.tpl @@ -38,6 +38,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.stpl index 2822f875..80fd787a 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -54,6 +54,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.tpl index 37b8be30..54e1c755 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -50,6 +50,11 @@ server { return 404; } + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + include /etc/nginx/conf.d/phpmyadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index 4aaf11af..eb0273f5 100755 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -844,6 +844,9 @@ if [ "$apache" = 'yes' ]; then update-rc.d apache2 defaults service apache2 start check_result $? "apache2 start failed" +else + update-rc.d apache2 disable >/dev/null 2>&1 + service apache2 stop >/dev/null 2>&1 fi diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh index 68cc72a1..252ebeb5 100755 --- a/install/vst-install-rhel.sh +++ b/install/vst-install-rhel.sh @@ -852,6 +852,12 @@ if [ "$nginx" = 'yes' ]; then chkconfig nginx on service nginx start check_result $? "nginx start failed" + + # Workaround for OpenVZ/Virtuozzo + if [ "$release" -eq '7' ] && [ -e "/proc/vz/veinfo" ]; then + echo "#Vesta: workraround for networkmanager" >> /etc/rc.local + echo "sleep 3 && service nginx restart" >> /etc/rc.local + fi fi @@ -884,6 +890,12 @@ if [ "$apache" = 'yes' ]; then chkconfig httpd on service httpd start check_result $? "httpd start failed" + + # Workaround for OpenVZ/Virtuozzo + if [ "$release" -eq '7' ] && [ -e "/proc/vz/veinfo" ]; then + echo "#Vesta: workraround for networkmanager" >> /etc/rc.local + echo "sleep 2 && service httpd restart" >> /etc/rc.local + fi fi diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh index ca3c186a..429cc8f7 100755 --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -834,6 +834,9 @@ if [ "$apache" = 'yes' ]; then update-rc.d apache2 defaults service apache2 start check_result $? "apache2 start failed" +else + update-rc.d apache2 disable >/dev/null 2>&1 + service apache2 stop >/dev/null 2>&1 fi diff --git a/web/css/styles.min.css b/web/css/styles.min.css index b106f314..8dc1af5a 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -2808,7 +2808,7 @@ a.button.cancel { vertical-align: top; } .mail-infoblock { - padding-top: 76px; + padding-top: 80px; margin-left: -100px; font-size: 12px; color: #777; @@ -2816,11 +2816,26 @@ a.button.cancel { .mail-infoblock td { color: #777; font-size: 14px; - height: 20px; + height: 18px; padding-right: 25px; font-weight: normal; } +.additional-info { + margin-left: 30px; + margin-top: 30px; + width: 547px; +} +.additional-info td { + font-size: 12px; + height: 22px; + font-weight: normal; +} +.additional-info td.details { + padding-left: 20px; +} + + :focus {outline:none;} ::-moz-focus-inner {border:0;} diff --git a/web/edit/server/index.php b/web/edit/server/index.php index 9010ab77..14f4f672 100644 --- a/web/edit/server/index.php +++ b/web/edit/server/index.php @@ -78,6 +78,21 @@ foreach ($backup_types as $backup_type) { } } +// List ssl certificate info +exec (VESTA_CMD."v-list-sys-vesta-ssl json", $output, $return_var); +$ssl_str = json_decode(implode('', $output), true); +unset($output); +$v_ssl_crt = $ssl_str['VESTA']['CRT']; +$v_ssl_key = $ssl_str['VESTA']['KEY']; +$v_ssl_ca = $ssl_str['VESTA']['CA']; +$v_ssl_subject = $ssl_str['VESTA']['SUBJECT']; +$v_ssl_aliases = $ssl_str['VESTA']['ALIASES']; +$v_ssl_not_before = $ssl_str['VESTA']['NOT_BEFORE']; +$v_ssl_not_after = $ssl_str['VESTA']['NOT_AFTER']; +$v_ssl_signature = $ssl_str['VESTA']['SIGNATURE']; +$v_ssl_pub_key = $ssl_str['VESTA']['PUB_KEY']; +$v_ssl_issuer = $ssl_str['VESTA']['ISSUER']; + // Check POST request if (!empty($_POST['save'])) { @@ -178,7 +193,6 @@ if (!empty($_POST['save'])) { } } - // Update webmail url if (empty($_SESSION['error_msg'])) { if ($_POST['v_mail_url'] != $_SESSION['MAIL_URL']) { @@ -231,7 +245,6 @@ if (!empty($_POST['save'])) { } } - // Change backup gzip level if (empty($_SESSION['error_msg'])) { if ($_POST['v_backup_gzip'] != $v_backup_gzip ) { @@ -323,7 +336,6 @@ if (!empty($_POST['save'])) { } } - // Delete remote backup host if (empty($_SESSION['error_msg'])) { if ((empty($_POST['v_backup_host'])) && (!empty($v_backup_host))) { @@ -340,6 +352,49 @@ if (!empty($_POST['save'])) { } } + // Update SSL certificate + if ((!empty($_POST['v_ssl_crt'])) && (empty($_SESSION['error_msg']))) { + if (($v_ssl_crt != str_replace("\r\n", "\n", $_POST['v_ssl_crt'])) || ($v_ssl_key != str_replace("\r\n", "\n", $_POST['v_ssl_key']))) { + exec ('mktemp -d', $mktemp_output, $return_var); + $tmpdir = $mktemp_output[0]; + + // Certificate + if (!empty($_POST['v_ssl_crt'])) { + $fp = fopen($tmpdir."/certificate.crt", 'w'); + fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_crt'])); + fwrite($fp, "\n"); + fclose($fp); + } + + // Key + if (!empty($_POST['v_ssl_key'])) { + $fp = fopen($tmpdir."/certificate.key", 'w'); + fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_key'])); + fwrite($fp, "\n"); + fclose($fp); + } + + exec (VESTA_CMD."v-change-sys-vesta-ssl ".$tmpdir, $output, $return_var); + check_return_code($return_var,$output); + unset($output); + + // List ssl certificate info + exec (VESTA_CMD."v-list-sys-vesta-ssl json", $output, $return_var); + $ssl_str = json_decode(implode('', $output), true); + unset($output); + $v_ssl_crt = $ssl_str['VESTA']['CRT']; + $v_ssl_key = $ssl_str['VESTA']['KEY']; + $v_ssl_ca = $ssl_str['VESTA']['CA']; + $v_ssl_subject = $ssl_str['VESTA']['SUBJECT']; + $v_ssl_aliases = $ssl_str['VESTA']['ALIASES']; + $v_ssl_not_before = $ssl_str['VESTA']['NOT_BEFORE']; + $v_ssl_not_after = $ssl_str['VESTA']['NOT_AFTER']; + $v_ssl_signature = $ssl_str['VESTA']['SIGNATURE']; + $v_ssl_pub_key = $ssl_str['VESTA']['PUB_KEY']; + $v_ssl_issuer = $ssl_str['VESTA']['ISSUER']; + } + } + // Flush field values on success if (empty($_SESSION['error_msg'])) { $_SESSION['ok_msg'] = __('Changes has been saved.'); @@ -375,7 +430,6 @@ if (!empty($_POST['save'])) { } } - // activating filemanager licence if (empty($_SESSION['error_msg'])) { if($_SESSION['FILEMANAGER_KEY'] != $_POST['v_filemanager_licence'] && $_POST['v_filemanager'] == 'yes'){ @@ -410,11 +464,14 @@ if (!empty($_POST['save'])) { // Check system configuration exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var); $data = json_decode(implode('', $output), true); +unset($output); + $sys_arr = $data['config']; foreach ($sys_arr as $key => $value) { $_SESSION[$key] = $value; } + // Render page render_page($user, $TAB, 'edit_server'); diff --git a/web/edit/web/index.php b/web/edit/web/index.php index c2a60221..83108105 100644 --- a/web/edit/web/index.php +++ b/web/edit/web/index.php @@ -43,6 +43,13 @@ if ( $v_ssl == 'yes' && ($v_letsencrypt == 'no' || empty($v_letsencrypt))) { $v_ssl_crt = $ssl_str[$v_domain]['CRT']; $v_ssl_key = $ssl_str[$v_domain]['KEY']; $v_ssl_ca = $ssl_str[$v_domain]['CA']; + $v_ssl_subject = $ssl_str[$v_domain]['SUBJECT']; + $v_ssl_aliases = $ssl_str[$v_domain]['ALIASES']; + $v_ssl_not_before = $ssl_str[$v_domain]['NOT_BEFORE']; + $v_ssl_not_after = $ssl_str[$v_domain]['NOT_AFTER']; + $v_ssl_signature = $ssl_str[$v_domain]['SIGNATURE']; + $v_ssl_pub_key = $ssl_str[$v_domain]['PUB_KEY']; + $v_ssl_issuer = $ssl_str[$v_domain]['ISSUER']; } $v_ssl_home = $data[$v_domain]['SSL_HOME']; $v_backend_template = $data[$v_domain]['BACKEND']; @@ -321,14 +328,25 @@ if (!empty($_POST['save'])) { fclose($fp); } - exec (VESTA_CMD."v-change-web-domain-sslcert ".$user." ".$v_domain." ".$tmpdir." 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); - $restart_web = 'yes'; - $restart_proxy = 'yes'; - $v_ssl_crt = $_POST['v_ssl_crt']; - $v_ssl_key = $_POST['v_ssl_key']; - $v_ssl_ca = $_POST['v_ssl_ca']; + exec (VESTA_CMD."v-change-web-domain-sslcert ".$user." ".$v_domain." ".$tmpdir." 'no'", $output, $return_var); + check_return_code($return_var,$output); + unset($output); + $restart_web = 'yes'; + $restart_proxy = 'yes'; + + exec (VESTA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var); + $ssl_str = json_decode(implode('', $output), true); + unset($output); + $v_ssl_crt = $ssl_str[$v_domain]['CRT']; + $v_ssl_key = $ssl_str[$v_domain]['KEY']; + $v_ssl_ca = $ssl_str[$v_domain]['CA']; + $v_ssl_subject = $ssl_str[$v_domain]['SUBJECT']; + $v_ssl_aliases = $ssl_str[$v_domain]['ALIASES']; + $v_ssl_not_before = $ssl_str[$v_domain]['NOT_BEFORE']; + $v_ssl_not_after = $ssl_str[$v_domain]['NOT_AFTER']; + $v_ssl_signature = $ssl_str[$v_domain]['SIGNATURE']; + $v_ssl_pub_key = $ssl_str[$v_domain]['PUB_KEY']; + $v_ssl_issuer = $ssl_str[$v_domain]['ISSUER']; // Cleanup certificate tempfiles if (!empty($_POST['v_ssl_crt'])) { @@ -380,22 +398,32 @@ if (!empty($_POST['save'])) { fclose($fp); } - // CA - if (!empty($_POST['v_ssl_ca'])) { - $fp = fopen($tmpdir."/".$_POST['v_domain'].".ca", 'w'); - fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_ca'])); - fclose($fp); - } - exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var); - check_return_code($return_var,$output); - unset($output); - $v_ssl = 'yes'; - $restart_web = 'yes'; - $restart_proxy = 'yes'; - $v_ssl_crt = $_POST['v_ssl_crt']; - $v_ssl_key = $_POST['v_ssl_key']; - $v_ssl_ca = $_POST['v_ssl_ca']; - $v_ssl_home = $_POST['v_ssl_home']; + // CA + if (!empty($_POST['v_ssl_ca'])) { + $fp = fopen($tmpdir."/".$_POST['v_domain'].".ca", 'w'); + fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_ca'])); + fclose($fp); + } + exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var); + check_return_code($return_var,$output); + unset($output); + $v_ssl = 'yes'; + $restart_web = 'yes'; + $restart_proxy = 'yes'; + + exec (VESTA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var); + $ssl_str = json_decode(implode('', $output), true); + unset($output); + $v_ssl_crt = $ssl_str[$v_domain]['CRT']; + $v_ssl_key = $ssl_str[$v_domain]['KEY']; + $v_ssl_ca = $ssl_str[$v_domain]['CA']; + $v_ssl_subject = $ssl_str[$v_domain]['SUBJECT']; + $v_ssl_aliases = $ssl_str[$v_domain]['ALIASES']; + $v_ssl_not_before = $ssl_str[$v_domain]['NOT_BEFORE']; + $v_ssl_not_after = $ssl_str[$v_domain]['NOT_AFTER']; + $v_ssl_signature = $ssl_str[$v_domain]['SIGNATURE']; + $v_ssl_pub_key = $ssl_str[$v_domain]['PUB_KEY']; + $v_ssl_issuer = $ssl_str[$v_domain]['ISSUER']; // Cleanup certificate tempfiles if (!empty($_POST['v_ssl_crt'])) { @@ -606,10 +634,10 @@ if (!empty($_POST['save'])) { // Change FTP account path $v_ftp_username = $user . '_' . $v_ftp_user_data['v_ftp_user']; //preg_replace("/^".$user."_/", "", $v_ftp_user_data['v_ftp_user']); $v_ftp_username = escapeshellarg($v_ftp_username); - //if (!empty($v_ftp_user_data['v_ftp_path'])) { $v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path'])); - exec (VESTA_CMD."v-change-web-domain-ftp-path ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_path, $output, $return_var); - //} + if(escapeshellarg(trim($v_ftp_user_data['v_ftp_path_prev'])) != $v_ftp_path) { + exec (VESTA_CMD."v-change-web-domain-ftp-path ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_path, $output, $return_var); + } // Change FTP account password if (!empty($v_ftp_user_data['v_ftp_password'])) { diff --git a/web/inc/i18n/ar.php b/web/inc/i18n/ar.php index 30c8fc5c..714f3c8f 100644 --- a/web/inc/i18n/ar.php +++ b/web/inc/i18n/ar.php @@ -730,10 +730,28 @@ $LANG['ar'] = array( 'webalizer' => 'محلل الويب webalizer', 'awstats' => 'احصائيات الويب awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', // Texts below doesn't exist in en.php '%s rule' => 'قواعد %s', 'MainDomain' => 'النطاق الرئيسي', 'SubDomain' => 'النطاق الفرعي (الجزء الاول الذي يضاف إلى النطاق الرئيسي)', 'Add Sub Domain' => 'إضافة نطاق فرعي' + ); diff --git a/web/inc/i18n/bs.php b/web/inc/i18n/bs.php index a9f4cc03..0f8af03d 100644 --- a/web/inc/i18n/bs.php +++ b/web/inc/i18n/bs.php @@ -728,4 +728,22 @@ $LANG['bs'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Koristi server hostname', + 'Use domain hostname' => 'Koristi hostname domena', + 'Use STARTTLS' => 'Koristi STARTTLS', + 'Use SSL' => 'Koristi SSL', + 'No encryption' => 'Bez enkripcije', + 'Do not use encryption' => 'Nemoj koristiti enkripciju', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); \ No newline at end of file diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php index d4e4faf1..1c9366fa 100644 --- a/web/inc/i18n/cn.php +++ b/web/inc/i18n/cn.php @@ -730,4 +730,21 @@ $LANG['cn'] = array( 'webalizer' => 'Webalizer', 'awstats' => 'AWStats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/cz.php b/web/inc/i18n/cz.php index 65a5bc7c..13d36c62 100644 --- a/web/inc/i18n/cz.php +++ b/web/inc/i18n/cz.php @@ -731,4 +731,21 @@ $LANG['cz'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/da.php b/web/inc/i18n/da.php index d5f29986..58fa964f 100644 --- a/web/inc/i18n/da.php +++ b/web/inc/i18n/da.php @@ -732,4 +732,21 @@ $LANG['da'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/de.php b/web/inc/i18n/de.php index 4d1556ba..b79f639a 100644 --- a/web/inc/i18n/de.php +++ b/web/inc/i18n/de.php @@ -730,4 +730,21 @@ $LANG['de'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/el.php b/web/inc/i18n/el.php index 5767981c..faece051 100644 --- a/web/inc/i18n/el.php +++ b/web/inc/i18n/el.php @@ -731,4 +731,21 @@ $LANG['el'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php index dca814db..755946ee 100644 --- a/web/inc/i18n/en.php +++ b/web/inc/i18n/en.php @@ -731,4 +731,22 @@ $LANG['en'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', + ); diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php index 7ebfe1e5..dd4fe2eb 100644 --- a/web/inc/i18n/es.php +++ b/web/inc/i18n/es.php @@ -727,4 +727,22 @@ $LANG['es'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/fa.php b/web/inc/i18n/fa.php index 26e2dc68..500a2ef7 100644 --- a/web/inc/i18n/fa.php +++ b/web/inc/i18n/fa.php @@ -3,106 +3,107 @@ *line 18-19 added * Vesta Farsi/Persian language file * By Foad Gh (secretjail@yahoo.com / http://www.Dotserver.ir ) + * By Ham3D (hamed334@gmail.com) * Yalda night 2015 */ -$LANG['fa'] = array( - 'Packages' => 'بسته ها', - 'IP' => 'آي پي', - 'Graphs' => 'نمودار ها', - 'Statistics' => 'آمار', - 'Log' => 'گزارش', - 'Server' => 'سرور', - 'Services' => 'خدمات', +$LANG['fa'] = [ + 'Packages' => 'بسته ها', + 'IP' => 'آي پي', + 'Graphs' => 'نمودار ها', + 'Statistics' => 'آمار', + 'Log' => 'گزارش', + 'Server' => 'سرور', + 'Services' => 'خدمات', 'Firewall' => 'ديوار آتشين', - 'Updates' => 'بروز رساني ها', - 'Log in' => 'ورود', - 'Log out' => 'خروج', + 'Updates' => 'بروز رساني ها', + 'Log in' => 'ورود', + 'Log out' => 'خروج', - 'USER' => 'كاربر', - 'WEB' => 'وب', - 'DNS' => 'نام سرور', - 'MAIL' => 'ايميل', - 'DB' => 'پايگاه داده', - 'CRON' => 'خودكار', - 'BACKUP' => 'پشتيبان', + 'USER' => 'كاربر', + 'WEB' => 'وب', + 'DNS' => 'نام سرور', + 'MAIL' => 'ايميل', + 'DB' => 'پايگاه داده', + 'CRON' => 'خودكار', + 'BACKUP' => 'پشتيبان', - 'LOGIN' => 'LOGIN', - 'RESET PASSWORD' => 'RESET PASSWORD', - 'SEARCH' => 'SEARCH', - 'PACKAGE' => 'PACKAGE', - 'RRD' => 'RRD', - 'STATS' => 'STATS', - 'LOG' => 'LOG', - 'UPDATES' => 'UPDATES', - 'FIREWALL' => 'FIREWALL', - 'SERVER' => 'SERVER', - 'MEMORY' => 'MEMORY', - 'DISK' => 'DISK', - 'NETWORK' => 'NETWORK', - 'Web Log Manager' => 'Web Log Manager', + 'LOGIN' => 'ورود', + 'RESET PASSWORD' => 'RESET PASSWORD', + 'SEARCH' => 'جستجو', + 'PACKAGE' => 'بسته', + 'RRD' => 'RRD', + 'STATS' => 'STATS', + 'LOG' => 'LOG', + 'UPDATES' => 'UPDATES', + 'FIREWALL' => 'FIREWALL', + 'SERVER' => 'سرور', + 'MEMORY' => 'حافظه', + 'DISK' => 'دیسک', + 'NETWORK' => 'شبکه', + 'Web Log Manager' => 'Web Log Manager', - 'Add User' => 'افزودن كاربر', - 'Add Domain' => 'افزودن دامنه', - 'Add Web Domain' => 'افزودن دامنه وب', - 'Add DNS Domain' => 'افزودن DNS دامنه', - 'Add DNS Record' => 'افزودن ركورد DNS', - 'Add Mail Domain' => 'افزودن ايميل دامنه', - 'Add Mail Account' => 'افزودن حساب ايميل', - 'Add Database' => 'افزودن پايگاه داده', - 'Add Cron Job' => 'افزودن عمل خودكار', - 'Create Backup' => 'ايجاد پشتيبان', - 'Configure' => 'پیکربندی', - 'Restore All' => 'بازيابي همه', - 'Add Package' => 'افزودن بسته', - 'Add IP' => 'افزودن آدرس آي پي', + 'Add User' => 'افزودن كاربر', + 'Add Domain' => 'افزودن دامنه', + 'Add Web Domain' => 'افزودن دامنه وب', + 'Add DNS Domain' => 'افزودن DNS دامنه', + 'Add DNS Record' => 'افزودن ركورد DNS', + 'Add Mail Domain' => 'افزودن ايميل دامنه', + 'Add Mail Account' => 'افزودن حساب ايميل', + 'Add Database' => 'افزودن پايگاه داده', + 'Add Cron Job' => 'افزودن عمل خودكار', + 'Create Backup' => 'ايجاد پشتيبان', + 'Configure' => 'پیکربندی', + 'Restore All' => 'بازيابي همه', + 'Add Package' => 'افزودن بسته', + 'Add IP' => 'افزودن آدرس آي پي', 'Add Rule' => 'افزودن قانون', 'Ban IP Address' => 'مسدود كردن آدرس آي پي', - 'Search' => 'جستجو', + 'Search' => 'جستجو', 'Add one more FTP Account' => 'افزودن يك حساب FTP ديگر', - 'Overall Statistics' => 'آمار كلي', - 'Daily' => 'روزانه', - 'Weekly' => 'هفتگي', - 'Monthly' => 'ماهانه', - 'Yearly' => 'ساليانه', - 'Add' => 'افزودن', - 'Back' => 'بازگشت', - 'Save' => 'ذخيره', - 'Submit' => 'اعمال', + 'Overall Statistics' => 'آمار كلي', + 'Daily' => 'روزانه', + 'Weekly' => 'هفتگي', + 'Monthly' => 'ماهانه', + 'Yearly' => 'ساليانه', + 'Add' => 'افزودن', + 'Back' => 'بازگشت', + 'Save' => 'ذخيره', + 'Submit' => 'اعمال', - 'toggle all' => 'دربرگيري همه', - 'apply to selected' => 'افزودن به موارد انتخاب شده', - 'rebuild' => 'بازسازي', - 'rebuild web' => 'بازسازي وب', - 'rebuild dns' => 'بازسازي dns', - 'rebuild mail' => 'بازسازي اي ميل', - 'rebuild db' => 'بازسازي پايگاه داده', - 'rebuild cron' => 'بازسازي كارهاي خودكار', - 'update counters' => 'بروزرساني شمارنده ها', - 'suspend' => 'تعليق', - 'unsuspend' => 'آزاد سازي', - 'delete' => 'حذف', - 'show per user' => 'نمايش هر كاربر', - 'login as' => 'ورود بجاي', - 'logout' => 'خروج', - 'edit' => 'ويرايش', - 'open webstats' => 'بازكردن وضعيت وب', - 'view logs' => 'مشاهده وقايع', - 'list records' => 'فهرست ركوردهاي %s', - 'add record' => 'افزودن ركورد', - 'list accounts' => 'فهرست حسابهاي %s', - 'add account' => 'افزودن حساب', - 'open webmail' => 'بازگردن وب ميل', + 'toggle all' => 'دربرگيري همه', + 'apply to selected' => 'افزودن به موارد انتخاب شده', + 'rebuild' => 'بازسازي', + 'rebuild web' => 'بازسازي وب', + 'rebuild dns' => 'بازسازي dns', + 'rebuild mail' => 'بازسازي اي ميل', + 'rebuild db' => 'بازسازي پايگاه داده', + 'rebuild cron' => 'بازسازي كارهاي خودكار', + 'update counters' => 'بروزرساني شمارنده ها', + 'suspend' => 'تعليق', + 'unsuspend' => 'آزاد سازي', + 'delete' => 'حذف', + 'show per user' => 'نمايش هر كاربر', + 'login as' => 'ورود بجاي', + 'logout' => 'خروج', + 'edit' => 'ويرايش', + 'open webstats' => 'بازكردن وضعيت وب', + 'view logs' => 'مشاهده وقايع', + 'list records' => 'فهرست ركوردهاي %s', + 'add record' => 'افزودن ركورد', + 'list accounts' => 'فهرست حسابهاي %s', + 'add account' => 'افزودن حساب', + 'open webmail' => 'بازگردن وب ميل', 'list fail2ban' => 'فهرست fail2ban', - 'open %s' => 'بازگشايي %s', - 'download' => 'بارگيري', - 'restore' => 'بازيابي', - 'configure restore settings' => 'پيكربندي تنظيمات بازيابي', - 'stop' => 'پايان', - 'start' => 'آغاز', - 'restart' => 'آغاز دوباره', - 'update' => 'بروزرساني', - 'generate' => 'ايجاد', + 'open %s' => 'بازگشايي %s', + 'download' => 'بارگيري', + 'restore' => 'بازيابي', + 'configure restore settings' => 'پيكربندي تنظيمات بازيابي', + 'stop' => 'پايان', + 'start' => 'آغاز', + 'restart' => 'آغاز دوباره', + 'update' => 'بروزرساني', + 'generate' => 'ايجاد', 'Generate CSR' => 'ايجاد CSR', 'reread IP' => 'بازخواني IP', 'enable autoupdate' => 'فعال كردن بروزرساني خودكار', @@ -110,262 +111,262 @@ $LANG['fa'] = array( 'turn on notifications' => 'نمايش اعلان ها', 'turn off notifications' => 'مخفي سازي اعلان ها', - 'Adding User' => 'افزودن كاربر', - 'Editing User' => 'ويرايش كاربر', - 'Adding Domain' => 'افزودندامنه', - 'Editing Domain' => 'ويرايش دامنه', - 'Adding DNS Domain' => 'افزودن DNS دامنه', - 'Editing DNS Domain' => 'ويرايش DNS دامنه', - 'Adding DNS Record' => 'افزودن ركورد DNS', - 'Editing DNS Record' => 'ويرايش ركورد DNS', - 'Adding Mail Domain' => 'افزودن دامنه ايميل', - 'Editing Mail Domain' => 'ويرايش دامنه ايميل', - 'Adding Mail Account' => 'افزودن حساب ايميل', - 'Editing Mail Account' => 'ويرايش حساب ايميل', - 'Adding database' => 'افزودن پايگاه داده', - 'Editing Cron Job' => 'ويرايش عمل خودكار', - 'Adding Cron Job' => 'افزودن عمل خودكار', - 'Editing Database' => 'ويرايش پايگاه داده', - 'Adding Package' => 'افزودن بسته', - 'Editing Package' => 'ويرايش بسته', - 'Adding IP address' => 'افزودن آدرس آي پي', - 'Editing IP Address' => 'ويرايش آدرس آي پي', + 'Adding User' => 'افزودن كاربر', + 'Editing User' => 'ويرايش كاربر', + 'Adding Domain' => 'افزودندامنه', + 'Editing Domain' => 'ويرايش دامنه', + 'Adding DNS Domain' => 'افزودن DNS دامنه', + 'Editing DNS Domain' => 'ويرايش DNS دامنه', + 'Adding DNS Record' => 'افزودن ركورد DNS', + 'Editing DNS Record' => 'ويرايش ركورد DNS', + 'Adding Mail Domain' => 'افزودن دامنه ايميل', + 'Editing Mail Domain' => 'ويرايش دامنه ايميل', + 'Adding Mail Account' => 'افزودن حساب ايميل', + 'Editing Mail Account' => 'ويرايش حساب ايميل', + 'Adding database' => 'افزودن پايگاه داده', + 'Editing Cron Job' => 'ويرايش عمل خودكار', + 'Adding Cron Job' => 'افزودن عمل خودكار', + 'Editing Database' => 'ويرايش پايگاه داده', + 'Adding Package' => 'افزودن بسته', + 'Editing Package' => 'ويرايش بسته', + 'Adding IP address' => 'افزودن آدرس آي پي', + 'Editing IP Address' => 'ويرايش آدرس آي پي', 'Editing Backup Exclusions' => 'ويرايش استتثناء هاي پشتيبان گيري', 'Generating CSR' => 'ايجاد CSR', - 'Listing' => 'فهرست كردن', - 'Search Results' => 'Sنتايج جستجو', + 'Listing' => 'فهرست كردن', + 'Search Results' => 'Sنتايج جستجو', 'Adding Firewall Rule' => 'افزودن قانون ديواره آتشين', 'Editing Firewall Rule' => 'ويرايش قانون ديوارآتشين', 'Adding IP Address to Banlist' => 'افزودن آدرس آي پي به فهرست مسدود شدگان', - 'active' => 'فعال', - 'spnd' => 'معلق', - 'suspended' => 'معلق گرديد', - 'running' => 'درحال اجرا', - 'stopped' => 'متوقف', - 'outdated' => 'منسوخ', - 'updated' => 'به روز', + 'active' => 'فعال', + 'spnd' => 'معلق', + 'suspended' => 'معلق گرديد', + 'running' => 'درحال اجرا', + 'stopped' => 'متوقف', + 'outdated' => 'منسوخ', + 'updated' => 'به روز', - 'yes' => 'بله', - 'no' => 'خير', - 'none' => 'هيچ يك', - 'pb' => 'پ.ب', - 'tb' => 'ت.ب', - 'gb' => 'گ.ب', - 'mb' => 'م.ب', - 'minute' => 'دقيقه', - 'hour' => 'ساعت', - 'day' => 'روز', - 'days' => 'روز', - 'hours' => 'ساعت', - 'minutes' => 'دقيقه', - 'month' => 'ماه', - 'package' => 'بسته', - 'Bandwidth' => 'پهناي باند', - 'Disk' => 'ديسك', - 'Web' => 'وب', - 'Mail' => 'ميل', - 'Databases' => 'پايگاه داده', - 'User Directories' => 'پوشه هاي كاربر', - 'Template' => 'قالب', - 'Web Template' => 'قالب وب', - 'Backend Template' => 'قالب نهايي', - 'Proxy Template' =>'قالب پراكسي', - 'DNS Template' => 'قالب DNS', - 'Web Domains' => 'دامنه هاي وب', - 'SSL Domains' => 'دامنه هاي SSL', - 'Web Aliases' => 'نامهاي مستعار وب', - 'per domain' => 'پيش دامنه', - 'DNS Domains' => 'دامنه هاي DNS', - 'DNS domains' => 'دامنه هاي DNS', - 'DNS records' => 'پيشينه هاي DNS', - 'Name Servers' => 'نامهاي سرور', - 'Mail Domains' => 'دامنه هاي ايميل', - 'Mail Accounts' => 'حساب هاي ايميل', - 'Cron Jobs' => 'كارهاي خودكار', - 'SSH Access' => 'دسترسي هاي SSH', - 'IP Address' => 'IP Address', - 'IP Addresses' => 'آدرس هاي آی پی', - 'Backups' => 'پشتيبان ها', - 'Backup System' => 'سيستم پشتيبان', + 'yes' => 'بله', + 'no' => 'خير', + 'none' => 'هيچ يك', + 'pb' => 'پ.ب', + 'tb' => 'ت.ب', + 'gb' => 'گ.ب', + 'mb' => 'م.ب', + 'minute' => 'دقيقه', + 'hour' => 'ساعت', + 'day' => 'روز', + 'days' => 'روز', + 'hours' => 'ساعت', + 'minutes' => 'دقيقه', + 'month' => 'ماه', + 'package' => 'بسته', + 'Bandwidth' => 'پهناي باند', + 'Disk' => 'ديسك', + 'Web' => 'وب', + 'Mail' => 'ميل', + 'Databases' => 'پايگاه داده', + 'User Directories' => 'پوشه هاي كاربر', + 'Template' => 'قالب', + 'Web Template' => 'قالب وب', + 'Backend Template' => 'قالب نهايي', + 'Proxy Template' => 'قالب پراكسي', + 'DNS Template' => 'قالب DNS', + 'Web Domains' => 'دامنه هاي وب', + 'SSL Domains' => 'دامنه هاي SSL', + 'Web Aliases' => 'نامهاي مستعار وب', + 'per domain' => 'پيش دامنه', + 'DNS Domains' => 'دامنه هاي DNS', + 'DNS domains' => 'دامنه هاي DNS', + 'DNS records' => 'پيشينه هاي DNS', + 'Name Servers' => 'نامهاي سرور', + 'Mail Domains' => 'دامنه هاي ايميل', + 'Mail Accounts' => 'حساب هاي ايميل', + 'Cron Jobs' => 'كارهاي خودكار', + 'SSH Access' => 'دسترسي هاي SSH', + 'IP Address' => 'IP Address', + 'IP Addresses' => 'آدرس هاي آی پی', + 'Backups' => 'پشتيبان ها', + 'Backup System' => 'سيستم پشتيبان', 'backup exclusions' => 'استثنا هاي پشتيبان', - 'template' => 'قالب', - 'SSL Support' => 'پشتیبانی SSL', - 'SSL Home Directory' => 'خانه SSL', - 'Proxy Support' => 'پشتیبانی Proxy', - 'Proxy Extensions' => 'فرمت های Proxy', - 'Web Statistics' => 'آمار هاي وب', - 'Additional FTP Account' => 'FTP اضافه', - 'Path' => 'Path', - 'SOA' => 'SOA', - 'TTL' => 'زمان زنده بودن', - 'Expire' => 'سپري شدن', - 'Records' => 'پيشسنه ها', - 'Serial' => 'Serial', - 'Catchall email' => 'دريافت همه ايميل ها', - 'AntiVirus Support' => 'پشتیبانی ضد ويروس', - 'AntiSpam Support' => 'پشتیبانی ضد هرزنامه', - 'DKIM Support' => 'پشتیبانی DKIM', - 'Accounts' => 'حساب ها', - 'Quota' => 'سهميه', - 'Autoreply' => 'پاسخگويي خودكار', - 'Forward to' => 'ارسال به', + 'template' => 'قالب', + 'SSL Support' => 'پشتیبانی SSL', + 'SSL Home Directory' => 'خانه SSL', + 'Proxy Support' => 'پشتیبانی Proxy', + 'Proxy Extensions' => 'فرمت های Proxy', + 'Web Statistics' => 'آمار هاي وب', + 'Additional FTP Account' => 'FTP اضافه', + 'Path' => 'Path', + 'SOA' => 'SOA', + 'TTL' => 'زمان زنده بودن', + 'Expire' => 'سپري شدن', + 'Records' => 'پيشسنه ها', + 'Serial' => 'Serial', + 'Catchall email' => 'دريافت همه ايميل ها', + 'AntiVirus Support' => 'پشتیبانی ضد ويروس', + 'AntiSpam Support' => 'پشتیبانی ضد هرزنامه', + 'DKIM Support' => 'پشتیبانی DKIM', + 'Accounts' => 'حساب ها', + 'Quota' => 'سهميه', + 'Autoreply' => 'پاسخگويي خودكار', + 'Forward to' => 'ارسال به', 'Do not store forwarded mail' => 'ذخيره نكردن ايميل هدايت شونده', - 'IMAP hostname' => 'IMAP hostname', - 'IMAP port' => 'IMAP port', - 'IMAP security' => 'IMAP security', - 'IMAP auth method' => 'IMAP auth method', - 'SMTP hostname' => 'SMTP hostname', - 'SMTP port' => 'SMTP port', - 'SMTP security' => 'SMTP security', - 'SMTP auth method' => 'SMTP auth method', - 'STARTTLS' => 'STARTTLS', - 'Normal password' => 'Normal password', - 'database' => 'پايگاه داده', - 'User' => 'كاربر', - 'Host' => 'ميزبان', - 'Charset' => 'مجموعه نویسه', - 'Min' => 'دقيقه', - 'Hour' => 'ساعت', - 'Day' => 'روز', - 'Month' => 'ماه', - 'Day of week' => 'روز هفته', - 'local' => 'محلي', - 'Run Time' => 'زمان اجرا', - 'Backup Size' => 'اندازه پشتيبان', - 'SYS' => 'سيستم', - 'Domains' => 'دامنه ها', - 'Status' => 'وضعيت', - 'shared' => 'مشترك', - 'dedicated' => 'اختصاصي', + 'IMAP hostname' => 'IMAP hostname', + 'IMAP port' => 'IMAP port', + 'IMAP security' => 'IMAP security', + 'IMAP auth method' => 'IMAP auth method', + 'SMTP hostname' => 'SMTP hostname', + 'SMTP port' => 'SMTP port', + 'SMTP security' => 'SMTP security', + 'SMTP auth method' => 'SMTP auth method', + 'STARTTLS' => 'STARTTLS', + 'Normal password' => 'Normal password', + 'database' => 'پايگاه داده', + 'User' => 'كاربر', + 'Host' => 'ميزبان', + 'Charset' => 'مجموعه نویسه', + 'Min' => 'دقيقه', + 'Hour' => 'ساعت', + 'Day' => 'روز', + 'Month' => 'ماه', + 'Day of week' => 'روز هفته', + 'local' => 'محلي', + 'Run Time' => 'زمان اجرا', + 'Backup Size' => 'اندازه پشتيبان', + 'SYS' => 'سيستم', + 'Domains' => 'دامنه ها', + 'Status' => 'وضعيت', + 'shared' => 'مشترك', + 'dedicated' => 'اختصاصي', 'Owner' => 'مالك', - 'Users' => 'كاربران', - 'Load Average' => 'ميانگين بارگزاري', - 'Memory Usage' => 'مصرف حافظه', - 'APACHE2 Usage' => 'APACHE2 Usage', - 'HTTPD Usage' => 'مصرف HTTPD', - 'NGINX Usage' => 'مصرف NGINX', - 'MySQL Usage on localhost' => 'مصرف MySQL در localhost', - 'PostgreSQL Usage on localhost' => 'مصرف PostgreSQL در localhost', - 'Bandwidth Usage eth0' => 'پهناي باند مصرفي eth0', + 'Users' => 'كاربران', + 'Load Average' => 'ميانگين بارگزاري', + 'Memory Usage' => 'مصرف حافظه', + 'APACHE2 Usage' => 'APACHE2 Usage', + 'HTTPD Usage' => 'مصرف HTTPD', + 'NGINX Usage' => 'مصرف NGINX', + 'MySQL Usage on localhost' => 'مصرف MySQL در localhost', + 'PostgreSQL Usage on localhost' => 'مصرف PostgreSQL در localhost', + 'Bandwidth Usage eth0' => 'پهناي باند مصرفي eth0', 'Exim Usage' => 'مصرف Exim', - 'FTP Usage' => 'مصرف FTP', - 'SSH Usage' => 'مصرف SSH', - 'reverse proxy' => 'پروکسی معکوس', - 'web server' => 'وب سرور', - 'dns server' => 'DNS سرور', - 'mail server' => 'ميل سرور', - 'pop/imap server' => 'سرور pop/imap', - 'email antivirus' => 'ضد ويروس ايميل', - 'email antispam' => 'ضد هرزنامه ايميل', - 'database server' => 'سرور پايگاه داده', - 'ftp server' => 'سرور FTP', - 'job scheduler' => 'زمان‌بندی كار', + 'FTP Usage' => 'مصرف FTP', + 'SSH Usage' => 'مصرف SSH', + 'reverse proxy' => 'پروکسی معکوس', + 'web server' => 'وب سرور', + 'dns server' => 'DNS سرور', + 'mail server' => 'ميل سرور', + 'pop/imap server' => 'سرور pop/imap', + 'email antivirus' => 'ضد ويروس ايميل', + 'email antispam' => 'ضد هرزنامه ايميل', + 'database server' => 'سرور پايگاه داده', + 'ftp server' => 'سرور FTP', + 'job scheduler' => 'زمان‌بندی كار', 'firewall' => 'ديوار آتشين', 'brute-force monitor' => 'مانيتور بروت فورس', - 'CPU' => 'پردازنده', - 'Memory' => 'حافظه', - 'Uptime' => 'زمان كاركرد', - 'core package' => 'بسته هسته', - 'php interpreter' => 'مترجم پي اچ پي', - 'internal web server' => 'وب سرور داخلي', - 'Version' => 'نسخه', - 'Release' => 'انتشار', - 'Architecture' => 'معماري', - 'Object' => 'شيء', - 'Username' => 'نام كاربري', - 'Password' => 'گذرواژه', - 'Email' => 'ايميل', - 'Package' => 'بسته', - 'Language' => 'زبان', - 'First Name' => 'نام', - 'Last Name' => 'نام خانوادگي', - 'Send login credentials to email address' => 'ارسال اطلاعات ورودی به آدرس ایمیل', - 'Default Template' => 'قالب پيش فرض', - 'Default Name Servers' => 'نام سرور پيش فرض', - 'Domain' => 'دامنه', - 'DNS Support' => 'پشتیبانی DNS', - 'Mail Support' => 'پشتیبانی ایمیل', - 'Advanced options' => 'گزینه های پیشرفته', - 'Basic options' => 'Basic options', - 'Aliases' => 'نام مستعار', - 'SSL Certificate' => 'گواهینامه SSL', - 'SSL Key' => 'کلید SSL', - 'SSL Certificate Authority / Intermediate' => 'صادركننده /واسط SSL', + 'CPU' => 'پردازنده', + 'Memory' => 'حافظه', + 'Uptime' => 'زمان كاركرد', + 'core package' => 'بسته هسته', + 'php interpreter' => 'مترجم پي اچ پي', + 'internal web server' => 'وب سرور داخلي', + 'Version' => 'نسخه', + 'Release' => 'انتشار', + 'Architecture' => 'معماري', + 'Object' => 'شيء', + 'Username' => 'نام كاربري', + 'Password' => 'گذرواژه', + 'Email' => 'ايميل', + 'Package' => 'بسته', + 'Language' => 'زبان', + 'First Name' => 'نام', + 'Last Name' => 'نام خانوادگي', + 'Send login credentials to email address' => 'ارسال اطلاعات ورودی به آدرس ایمیل', + 'Default Template' => 'قالب پيش فرض', + 'Default Name Servers' => 'نام سرور پيش فرض', + 'Domain' => 'دامنه', + 'DNS Support' => 'پشتیبانی DNS', + 'Mail Support' => 'پشتیبانی ایمیل', + 'Advanced options' => 'گزینه های پیشرفته', + 'Basic options' => 'Basic options', + 'Aliases' => 'نام مستعار', + 'SSL Certificate' => 'گواهینامه SSL', + 'SSL Key' => 'کلید SSL', + 'SSL Certificate Authority / Intermediate' => 'صادركننده /واسط SSL', 'SSL CSR' => 'SSL CSR', - 'optional' => 'دلخواه', + 'optional' => 'دلخواه', 'internal' => 'داخلی', - 'Statistics Authorization' => 'آمارهای اعتبار', - 'Statistics Auth' => 'آمار اعتبار', - 'Account' => 'حساب', - 'Prefix will be automaticaly added to username' => 'پيشوند %s خودكار به نام كاربري اضافه خواهد شد.', - 'Send FTP credentials to email' => 'ارسال اطلاعات FTP به ايميل', - 'Expiration Date' => 'زمان پايان', - 'YYYY-MM-DD' => 'سال-ماه-روز', - 'Name servers' => 'سرور نام ها', - 'Record' => 'پيشينه', - 'IP or Value' => 'آي پي يا مقدار', - 'Priority' => 'اولويت', + 'Statistics Authorization' => 'آمارهای اعتبار', + 'Statistics Auth' => 'آمار اعتبار', + 'Account' => 'حساب', + 'Prefix will be automaticaly added to username' => 'پيشوند %s خودكار به نام كاربري اضافه خواهد شد.', + 'Send FTP credentials to email' => 'ارسال اطلاعات FTP به ايميل', + 'Expiration Date' => 'زمان پايان', + 'YYYY-MM-DD' => 'سال-ماه-روز', + 'Name servers' => 'سرور نام ها', + 'Record' => 'پيشينه', + 'IP or Value' => 'آي پي يا مقدار', + 'Priority' => 'اولويت', 'Record Number' => 'شماره پيشينه', - 'in megabytes' => 'به مگابايت', - 'Message' => 'پيام', - 'use local-part' => 'استفاده از اجزا دروني', - 'one or more email addresses' => 'یک یا چند آدرس ایمیل', - 'Prefix will be automaticaly added to database name and database user' => 'پیشوند %s خودکار به نام و حساب پایگاه داده افزوده خواهد شد.', - 'Database' => 'پایگاه داده', - 'Type' => 'نوع', - 'Minute' => 'دقیقه', - 'Command' => 'دستور', - 'Package Name' => 'نام بسته', - 'Netmask' => 'پوشش شبكه (نت ماسك)', - 'Interface' => 'رابط', - 'Shared' => 'اشتراكي', - 'Assigned user' => 'کاربر اختصاص داده شده', - 'Assigned domain' => 'دامنه اختصاص داده شده', + 'in megabytes' => 'به مگابايت', + 'Message' => 'پيام', + 'use local-part' => 'استفاده از اجزا دروني', + 'one or more email addresses' => 'یک یا چند آدرس ایمیل', + 'Prefix will be automaticaly added to database name and database user' => 'پیشوند %s خودکار به نام و حساب پایگاه داده افزوده خواهد شد.', + 'Database' => 'پایگاه داده', + 'Type' => 'نوع', + 'Minute' => 'دقیقه', + 'Command' => 'دستور', + 'Package Name' => 'نام بسته', + 'Netmask' => 'پوشش شبكه (نت ماسك)', + 'Interface' => 'رابط', + 'Shared' => 'اشتراكي', + 'Assigned user' => 'کاربر اختصاص داده شده', + 'Assigned domain' => 'دامنه اختصاص داده شده', 'NAT IP association' => 'تجمع NAT IP', - 'shell' => 'پوسته', - 'web domains' => 'دامنه هاي وب', - 'web aliases' => 'نام مستعارهاي وب', - 'dns records' => 'پيشينه هاي DNS', - 'mail domains' => 'دامنه هاي ايميل', - 'mail accounts' => 'حسابهاي ايميل', - 'accounts' => 'حساب', - 'databases' => 'پایگاه های داده', - 'cron jobs' => 'كارهاي خودكار', - 'backups' => 'پشتيبان ها', - 'quota' => 'سهميه بندي', - 'day of week' => 'روز هفته', - 'cmd' => 'دستور', - 'users' => 'کاربران', - 'domains' => 'دامنه ها', - 'aliases' => 'نام مستعار', - 'records' => 'پیشینه', - 'jobs' => 'كار', - 'username' => 'نام کاربری', - 'password' => 'گذرواژه', - 'type' => 'نوع', - 'charset' => 'مجموعه نویسه', - 'domain' => 'دامنه', - 'ip' => 'آي پي', - 'ip address' => 'آدرس های آی پی', - 'IP address' => 'آدرس آی پی', - 'netmask' => 'نت ماسك', - 'interface' => 'رابط', - 'assigned user' => 'کاربراختصاص یافته', - 'ns1' => 'نام سرور 1', - 'ns2' => 'نام سرور 2', - 'user' => 'کاربر', - 'email' => 'ایمیل', - 'first name' => 'نام', - 'last name' => 'نام خانوادگی', - 'account' => 'حساب', - 'ssl certificate' => 'گواهينامه ssl', - 'ssl key' => 'كليد ssl', - 'stats user password' => 'آمار گذرواژه كاربر', - 'stats username' => 'آمار نام كاربري', - 'stats password' => 'آمار گذرواژه', - 'ftp user password' => 'گذرواژه FTP كاربر', - 'ftp user' => 'نام كاربري FTP', + 'shell' => 'پوسته', + 'web domains' => 'دامنه هاي وب', + 'web aliases' => 'نام مستعارهاي وب', + 'dns records' => 'پيشينه هاي DNS', + 'mail domains' => 'دامنه هاي ايميل', + 'mail accounts' => 'حسابهاي ايميل', + 'accounts' => 'حساب', + 'databases' => 'پایگاه های داده', + 'cron jobs' => 'كارهاي خودكار', + 'backups' => 'پشتيبان ها', + 'quota' => 'سهميه بندي', + 'day of week' => 'روز هفته', + 'cmd' => 'دستور', + 'users' => 'کاربران', + 'domains' => 'دامنه ها', + 'aliases' => 'نام مستعار', + 'records' => 'پیشینه', + 'jobs' => 'كار', + 'username' => 'نام کاربری', + 'password' => 'گذرواژه', + 'type' => 'نوع', + 'charset' => 'مجموعه نویسه', + 'domain' => 'دامنه', + 'ip' => 'آي پي', + 'ip address' => 'آدرس های آی پی', + 'IP address' => 'آدرس آی پی', + 'netmask' => 'نت ماسك', + 'interface' => 'رابط', + 'assigned user' => 'کاربراختصاص یافته', + 'ns1' => 'نام سرور 1', + 'ns2' => 'نام سرور 2', + 'user' => 'کاربر', + 'email' => 'ایمیل', + 'first name' => 'نام', + 'last name' => 'نام خانوادگی', + 'account' => 'حساب', + 'ssl certificate' => 'گواهينامه ssl', + 'ssl key' => 'كليد ssl', + 'stats user password' => 'آمار گذرواژه كاربر', + 'stats username' => 'آمار نام كاربري', + 'stats password' => 'آمار گذرواژه', + 'ftp user password' => 'گذرواژه FTP كاربر', + 'ftp user' => 'نام كاربري FTP', 'Last 70 lines of %s.%s.log' => 'Last 70 lines of %s.%s.log', 'AccessLog' => 'AccessLog', 'ErrorLog' => 'ErrorLog', @@ -403,48 +404,48 @@ $LANG['fa'] = array( 'cron' => 'cron', 'user dir' => 'user dir', - 'unlimited' => 'نامحدود', - '1 account' => 'یک حساب', - '%s accounts' => 'حساب %s', - '1 domain' => 'یک دامنه', - '%s domains' => 'دامنه %s', - '1 record' => 'یک پیشینه', - '%s records' => '%s پيشينه', - '1 mail account' => '1 حساب ايميل', - '%s mail accounts' => '%s حساب ايميل', - '1 database' => '1 پايگاه داده', - '%s databases' => '%s پايگاه داده', - '1 cron job' => '1 كار خودكار', - '%s cron jobs' => '%s كار خودكار', - '1 archive' => '1 بايگاني', - '%s archives' => '%s بايگاني', - '1 item' => '1 item', - '%s items' => '%s items', - '1 package' => '1 بسته', - '%s packages' => '%s بسته', - '1 IP address' => '1 آدرس IP', - '%s IP addresses' => '%s آدرس IP', - '1 month' => '1 ماه', - '%s months' => '%s ماه', - '1 log record' => '1 كرود وقايع', - '%s log records' => '%s ركورد وقايع', - '1 object' => 'یک شیء', - '%s objects' => '%s شيء', + 'unlimited' => 'نامحدود', + '1 account' => 'یک حساب', + '%s accounts' => 'حساب %s', + '1 domain' => 'یک دامنه', + '%s domains' => 'دامنه %s', + '1 record' => 'یک پیشینه', + '%s records' => '%s پيشينه', + '1 mail account' => '1 حساب ايميل', + '%s mail accounts' => '%s حساب ايميل', + '1 database' => '1 پايگاه داده', + '%s databases' => '%s پايگاه داده', + '1 cron job' => '1 كار خودكار', + '%s cron jobs' => '%s كار خودكار', + '1 archive' => '1 بايگاني', + '%s archives' => '%s بايگاني', + '1 item' => '1 item', + '%s items' => '%s items', + '1 package' => '1 بسته', + '%s packages' => '%s بسته', + '1 IP address' => '1 آدرس IP', + '%s IP addresses' => '%s آدرس IP', + '1 month' => '1 ماه', + '%s months' => '%s ماه', + '1 log record' => '1 كرود وقايع', + '%s log records' => '%s ركورد وقايع', + '1 object' => 'یک شیء', + '%s objects' => '%s شيء', 'no exclusions' => 'بدون استثنا', '1 rule' => '1 قانون', '%s rules' => '%s قانون', 'There are no currently banned IP' => 'هم اكنون IP مسدود شده اي وجود ندارد.', - 'USER_CREATED_OK' => 'كاربر %s با موفقيت ايجاد شد.', - 'WEB_DOMAIN_CREATED_OK' => 'دامنه %s با موفقيت ايجاد شد.', - 'DNS_DOMAIN_CREATED_OK' => 'دامنه DNS %s با موفقيت ايجاد شد.', - 'DNS_RECORD_CREATED_OK' => 'پیشینه %s.%s با موفقيت ايجاد شد.', - 'MAIL_DOMAIN_CREATED_OK' => 'دامنه ایمیل %s با موفقيت ايجاد شد.', - 'MAIL_ACCOUNT_CREATED_OK' => 'حساب ایمیل %s@%s با موفقيت ايجاد شد.', - 'DATABASE_CREATED_OK' => 'پايگاه داده %s با موفقيت ايجاد شد.', - 'CRON_CREATED_OK' => 'كار خودكار با موفقيت ايجاد شد.', - 'IP_CREATED_OK' => 'آدرس آی پی %s با موفقيت ايجاد شد.', - 'PACKAGE_CREATED_OK' => 'بسته %s با موفقيت ايجاد شد.', + 'USER_CREATED_OK' => 'كاربر %s با موفقيت ايجاد شد.', + 'WEB_DOMAIN_CREATED_OK' => 'دامنه %s با موفقيت ايجاد شد.', + 'DNS_DOMAIN_CREATED_OK' => 'دامنه DNS %s با موفقيت ايجاد شد.', + 'DNS_RECORD_CREATED_OK' => 'پیشینه %s.%s با موفقيت ايجاد شد.', + 'MAIL_DOMAIN_CREATED_OK' => 'دامنه ایمیل %s با موفقيت ايجاد شد.', + 'MAIL_ACCOUNT_CREATED_OK' => 'حساب ایمیل %s@%s با موفقيت ايجاد شد.', + 'DATABASE_CREATED_OK' => 'پايگاه داده %s با موفقيت ايجاد شد.', + 'CRON_CREATED_OK' => 'كار خودكار با موفقيت ايجاد شد.', + 'IP_CREATED_OK' => 'آدرس آی پی %s با موفقيت ايجاد شد.', + 'PACKAGE_CREATED_OK' => 'بسته %s با موفقيت ايجاد شد.', 'SSL_GENERATED_OK' => 'گواهی با موفقیت تولید شد.', 'RULE_CREATED_OK' => 'قانون با موفقيت ايجاد شد.', 'BANLIST_CREATED_OK' => 'IP address has been banned successfully', // I'm not sure about this text @@ -452,8 +453,8 @@ $LANG['fa'] = array( 'Autoupdate has been successfully disabled' => 'بروزرسانی خودکار با موقیت غیرفعال گردید.', 'Cronjob email reporting has been successfully enabled' => 'گزارش ايميلي كار هاي خودكار با موفقيت فعال گرديد.', 'Cronjob email reporting has been successfully disabled' => 'گزارش ايميلي كار هاي خودكار با موفقيت غيرفعال گرديد.', - 'Changes has been saved.' => 'تغییرات با موفقیت ذخیره گردید.', - 'Confirmation' => 'تایید کردن', + 'Changes has been saved.' => 'تغییرات با موفقیت ذخیره گردید.', + 'Confirmation' => 'تایید کردن', 'DELETE_USER_CONFIRMATION' => 'آیا از حذف کاربر %s اطمینان دارید؟', 'SUSPEND_USER_CONFIRMATION' => 'آیا از تعلیق کاربر %s اطمینان دارید؟', 'UNSUSPEND_USER_CONFIRMATION' => 'آیا از آزاد سازی کاربر %s اطمینان دارید؟', @@ -472,31 +473,31 @@ $LANG['fa'] = array( 'DELETE_CRON_CONFIRMATION' => 'آيا از خذف كار خودكار اطمينان داريد؟', 'SUSPEND_CRON_CONFIRMATION' => 'آيا از تعليق كار خودكار اطمینان داريد؟', 'UNSUSPEND_CRON_CONFIRMATION' => 'آيا از آزاد سازي كار خودكار اطمينان داريد؟', - 'DELETE_BACKUP_CONFIRMATION' => 'آيا از حذف پشتيبان %s اطمينان داريد؟', + 'DELETE_BACKUP_CONFIRMATION' => 'آيا از حذف پشتيبان %s اطمينان داريد؟', 'DELETE_EXCLUSION_CONFIRMATION' => 'آيا از حذف استثناء %s اطمينان داريد؟', - 'DELETE_PACKAGE_CONFIRMATION' => 'آيا از خذف بسته %s اطمينان داريد؟', - 'DELETE_IP_CONFIRMATION' => 'آيا از حذف آدرس آي پي %s اطمينان داريد؟', + 'DELETE_PACKAGE_CONFIRMATION' => 'آيا از خذف بسته %s اطمينان داريد؟', + 'DELETE_IP_CONFIRMATION' => 'آيا از حذف آدرس آي پي %s اطمينان داريد؟', 'DELETE_RULE_CONFIRMATION' => 'آيا از حذف قانون #%s اطمينان داريد؟', 'SUSPEND_RULE_CONFIRMATION' => 'آيا از تعليق قانون #%s اطمينان داريد؟', 'UNSUSPEND_RULE_CONFIRMATION' => 'آيا از آزاد سازي قانون #%s اطمينان داريد؟', 'LEAVE_PAGE_CONFIRMATION' => 'خروج از صفحه؟', 'RESTART_CONFIRMATION' => 'آيا از راه اندازي دوباره %s اطمينان داريد؟', - 'Welcome' => 'خوش آمدید', - 'LOGGED_IN_AS' => 'وارد شده با نام کاربری %s', - 'Error' => 'خطا', - 'Invalid username or password' => 'نام کاربری یا گذرواژه معتبر نیست.', - 'Invalid username or code' => 'نام کاربری یا رمز معتبر نیست.', - 'Passwords not match' => 'گذرواژه مطابقت ندارد.', - 'Please enter valid email address.' => 'لطفا آدرس ایمیل معتبری وارد نمایید.', - 'Field "%s" can not be blank.' => 'قسمت "%s" نمی تواند خالی باشد', - 'Password is too short.' => 'گذرواژه بسیار کوتاه است (حداقل 6 حرف).', - 'Error code:' => 'کد خطای: %s', - 'SERVICE_ACTION_FAILED' => '"%s" "%s" بی نتیجه ماند', + 'Welcome' => 'خوش آمدید', + 'LOGGED_IN_AS' => 'وارد شده با نام کاربری %s', + 'Error' => 'خطا', + 'Invalid username or password' => 'نام کاربری یا گذرواژه معتبر نیست.', + 'Invalid username or code' => 'نام کاربری یا رمز معتبر نیست.', + 'Passwords not match' => 'گذرواژه مطابقت ندارد.', + 'Please enter valid email address.' => 'لطفا آدرس ایمیل معتبری وارد نمایید.', + 'Field "%s" can not be blank.' => 'قسمت "%s" نمی تواند خالی باشد', + 'Password is too short.' => 'گذرواژه بسیار کوتاه است (حداقل 6 حرف).', + 'Error code:' => 'کد خطای: %s', + 'SERVICE_ACTION_FAILED' => '"%s" "%s" بی نتیجه ماند', 'IP address is in use' => 'آدرس آی پی در حال استفاده است.', - 'BACKUP_SCHEDULED' => 'كار به صف انجام افزوده شد.هنگامي كه نسخه پشتيبان براي بارگيري آماده گردد، با ايميل به اطلاع شما خواهد رسيد.', - 'BACKUP_EXISTS' => 'يك پشتيبان گيري در حال اجراست.لطفا تا پايان آن پشتيبان گيري تامل فرماييد.', - 'RESTORE_SCHEDULED' => 'كار به صف انجام افزوده شد. هنگامي كه بازيابي كامل گردد، با ايميل به اطلاع شما خواهد رسيد.', - 'RESTORE_EXISTS' => 'يك بازيابي در حال اجراست.لطفا تا پايان آن بازگرداني تامل فرماييد.', + 'BACKUP_SCHEDULED' => 'كار به صف انجام افزوده شد.هنگامي كه نسخه پشتيبان براي بارگيري آماده گردد، با ايميل به اطلاع شما خواهد رسيد.', + 'BACKUP_EXISTS' => 'يك پشتيبان گيري در حال اجراست.لطفا تا پايان آن پشتيبان گيري تامل فرماييد.', + 'RESTORE_SCHEDULED' => 'كار به صف انجام افزوده شد. هنگامي كه بازيابي كامل گردد، با ايميل به اطلاع شما خواهد رسيد.', + 'RESTORE_EXISTS' => 'يك بازيابي در حال اجراست.لطفا تا پايان آن بازگرداني تامل فرماييد.', 'WEB_EXCLUSIONS' => 'نام هر دامنه را در خطي جداگانه بنويسيد.براي دربرگيري همه نام دامنه ها از * استفاده كنيد. براي دربرگيري پوشه هاي خاص به شكل مقابل عمل كنيد : domain.com:public_html/cache:public_html/tmp', 'DNS_EXCLUSIONS' => 'نام هر دامنه را در خطي جداگانه بنويسيد.براي دربرگيري همه نام دامنه ها از * استفاده كنيد.', @@ -505,27 +506,27 @@ $LANG['fa'] = array( 'CRON_EXCLUSIONS' => 'براي دربرگيري تمامي كار ها از * استفاده كنيد', 'USER_EXCLUSIONS' => 'نام هر پوشه را در خطي جداگانه بنويسيد.براي دربرگيري تمام پوشه ها از * استفاده كنيد.', - 'Welcome to Vesta Control Panel' => 'به وستا کنترل پنل خوش آمدید', - 'MAIL_FROM' => 'كنترل پنل وستا ', + 'Welcome to Vesta Control Panel' => 'به وستا کنترل پنل خوش آمدید', + 'MAIL_FROM' => 'كنترل پنل وستا ', 'GREETINGS_GORDON_FREEMAN' => "درود, %s %s,\n", 'GREETINGS' => "درود,\n", 'ACCOUNT_READY' => "حساب شما ايجاد شد و براي استفاده آماده است.\n\nhttps://%s/login/\nنام كاربري : %s\nگذرواژه : %s\n\n--\nكنترل پنل وستا\n", - 'FTP login credentials' => 'اطلاعات ورود به FTP', + 'FTP login credentials' => 'اطلاعات ورود به FTP', 'FTP_ACCOUNT_READY' => "حساب FTP ساخته شد و براي استفاده آماده است.\n\nنام ميزبان : %s\nنام كاربري : %s_%s\nگذرواژه : %s\n\n--\nكنترل پنل وستا\n", - 'Database Credentials' => 'اطلاعات پايگاه داده', + 'Database Credentials' => 'اطلاعات پايگاه داده', 'DATABASE_READY' => "پايگاه داده با موفقيت ايجاد شد.\n\nDپايگاه داده : %s\nنام كاربري : %s\nگذرواژه : %s\n%s\n\n--\nكنترل پنل وستا\n", - 'forgot password' => 'گذرواژه تان را فراموش كرده ايد؟', - 'Confirm' => 'تاييد', - 'New Password' => 'گذرواژه تازه', - 'Confirm Password' => 'تاييد گذرواژه', - 'Reset' => 'بازيابي', - 'Reset Code' => 'رمز بازيابي', - 'RESET_NOTICE' => '', // should we add something here? - 'RESET_CODE_SENT' => 'رمز بازیابی گذرواژه به ایملتان ارسال گردید.
', - 'MAIL_RESET_SUBJECT' => 'بازیابی گذرواژه در %s', + 'forgot password' => 'گذرواژه تان را فراموش كرده ايد؟', + 'Confirm' => 'تاييد', + 'New Password' => 'گذرواژه تازه', + 'Confirm Password' => 'تاييد گذرواژه', + 'Reset' => 'بازيابي', + 'Reset Code' => 'رمز بازيابي', + 'RESET_NOTICE' => '', // should we add something here? + 'RESET_CODE_SENT' => 'رمز بازیابی گذرواژه به ایملتان ارسال گردید.
', + 'MAIL_RESET_SUBJECT' => 'بازیابی گذرواژه در %s', 'PASSWORD_RESET_REQUEST' => "براي بازيابي گذرواژه كنترل پنلتان, لطفا از اين راهنما :\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nاستفاده كنيد ويا از طريق, اين پيوند https://%s/reset/?action=code&user=%s با وارد كردن دستور:\n%s گذرواژه خود را بازيابي كنيد.\n\nدرصورتي كه شما درخواستبازيابي گذروایه نداده ايد، اين پيغام را ناديده بگيريد و عذر خواهي ما را پزيرا باشيد.\n\n--\nكنترل پنل وستا\n", 'Jan' => 'ژانويه', @@ -578,7 +579,7 @@ $LANG['fa'] = array( 'FileManager' => 'مدیریت پرونده', 'show: CPU / MEM / NET / DISK' => 'نمايش: شبكه / حاقظه / پردازنده / ديسك', - 'sort by' => 'sort by', // please make it as short as "sort by" 'مرتب سازی بر اساس', + 'sort by' => 'sort by', // please make it as short as "sort by" 'مرتب سازی بر اساس', 'Date' => 'تاریخ', 'Starred' => 'ستاره دار', 'Name' => 'نام', @@ -600,7 +601,7 @@ $LANG['fa'] = array( 'ARCHIVE' => 'بايگاني', 'EXTRACT' => 'بيرون كشيدن', 'DOWNLOAD' => 'بارگیری', - 'Are you sure?' => 'Are you sure?', // unused? + 'Are you sure?' => 'آیا اطمینان دارید؟', // unused? 'Hit' => 'اصابت', 'to reload the page' => 'براي بارگذاری تازه صفحه', 'Directory name cannot be empty' => 'نام پوشه نميتواند خالي باشد', @@ -625,8 +626,8 @@ $LANG['fa'] = array( 'YOU ARE COPYING' => 'YOU ARE COPYING', // unused? 'YOU ARE REMOVING' => 'YOU ARE REMOVING', 'Delete items' => 'Delete items', - 'Copy files' => 'Copy files', - 'Move files' => 'Move files', + 'Copy files' => 'کپی فایلها', + 'Move files' => 'انتقال فایلها', 'Are you sure you want to copy' => 'آيا از كپي كردن اطمينان داريد؟', 'Are you sure you want to move' => 'Are you sure you want to move', 'Are you sure you want to delete' => 'آيا از حذف اطمينان داريد؟', @@ -687,7 +688,7 @@ $LANG['fa'] = array( 'Select Bunch of Files' => 'انتخاب دسته اي پرونده ها', 'Add File to the Current Selection' => 'افزودن پرونده به قسمت انتخابي كنوني', 'Select All Files' => 'انتخاب تمامي پرونده ها', - 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => 'ميانبرها الهام گرفته از Midnight Commander مديريت فايل باشكوه GNU است.', 'Licence Key' => 'كليد مجوز', @@ -703,36 +704,53 @@ $LANG['fa'] = array( 'Minutes' => 'Minutes', 'Hourly' => 'Hourly', - 'Daily' => 'Dayly', - 'Weekly' => 'Weekly', - 'Monthly' => 'Monthly', + 'Daily' => 'روزانه', + 'Weekly' => 'هفتگی', + 'Monthly' => 'ماهانه', 'Run Command' => 'Run Command', - 'every month' => 'every month', - 'every odd month' => 'every odd month', - 'every even month' => 'every even month', - 'every day' => 'every day', - 'every odd day' => 'every odd day', - 'every even day' => 'every even day', - 'weekdays (5 days)' => 'weekdays (5 days)', - 'weekend (2 days)' => 'weekend (2 days)', - 'Monday' => 'Monday', - 'Tuesday' => 'Tuesday', - 'Wednesday' => 'Wednesday', - 'Thursday' => 'Thursday', - 'Friday' => 'Friday', - 'Saturday' => 'Saturday', - 'Sunday' => 'Sunday', - 'every hour' => 'every hour', - 'every two hours' => 'every two hours', - 'every minute' => 'every minute', - 'every two minutes' => 'every two minutes', - 'every' => 'every', + 'every month' => 'هر ماه', + 'every odd month' => 'ماه های فرد', + 'every even month' => 'ماه های زوج', + 'every day' => 'هر روز', + 'every odd day' => 'روزهای فرد', + 'every even day' => 'روزهای زوج', + 'weekdays (5 days)' => 'روزهای کاری (۵ روز)', + 'weekend (2 days)' => 'آخر هفته (۲ روز)', + 'Monday' => 'دوشنبه', + 'Tuesday' => 'سه شنبه', + 'Wednesday' => 'چهارشنبه', + 'Thursday' => 'پنج شنبه', + 'Friday' => 'جمعه', + 'Saturday' => 'شنبه', + 'Sunday' => 'یکشنبه', + 'every hour' => 'هر ساعت', + 'every two hours' => 'هر دو ساعت', + 'every minute' => 'هر دقیقه', + 'every two minutes' => 'هر دو دقیقه', + 'every' => 'هر', 'Generate' => 'Generate', 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', // Texts below doesn't exist in en.php '70 خط اخر %s.%s.log' => 'هفتاد خط انتهايي از %s.%s.log', -); +]; diff --git a/web/inc/i18n/fi.php b/web/inc/i18n/fi.php index c692bb0c..9da1cf66 100644 --- a/web/inc/i18n/fi.php +++ b/web/inc/i18n/fi.php @@ -732,6 +732,23 @@ $LANG['fi'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', // Texts below doesn't exist in en.php 'traffic' => 'tiedonsiirto', diff --git a/web/inc/i18n/fr.php b/web/inc/i18n/fr.php index 14271942..0df3c683 100644 --- a/web/inc/i18n/fr.php +++ b/web/inc/i18n/fr.php @@ -730,6 +730,23 @@ $LANG['fr'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', // Texts below doesn't exist in en.php 'disk' => 'disque', diff --git a/web/inc/i18n/hu.php b/web/inc/i18n/hu.php index ad8ba63c..0a503c11 100644 --- a/web/inc/i18n/hu.php +++ b/web/inc/i18n/hu.php @@ -734,6 +734,23 @@ $LANG['hu'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', // Texts below doesn't exist in en.php 'Bandwidth Usage eth1' => 'eth1 sávszélesség használat', diff --git a/web/inc/i18n/id.php b/web/inc/i18n/id.php index 84f436d4..af3b4fe8 100644 --- a/web/inc/i18n/id.php +++ b/web/inc/i18n/id.php @@ -733,4 +733,21 @@ $LANG['id'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/it.php b/web/inc/i18n/it.php index 85ecdcb2..095647b7 100644 --- a/web/inc/i18n/it.php +++ b/web/inc/i18n/it.php @@ -731,4 +731,21 @@ $LANG['it'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/ja.php b/web/inc/i18n/ja.php index 9cebfc67..d6169fcc 100644 --- a/web/inc/i18n/ja.php +++ b/web/inc/i18n/ja.php @@ -730,4 +730,21 @@ $LANG['ja'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/ka.php b/web/inc/i18n/ka.php new file mode 100644 index 00000000..14890c58 --- /dev/null +++ b/web/inc/i18n/ka.php @@ -0,0 +1,750 @@ + 'პაკეტები', + 'IP' => 'IP', + 'Graphs' => 'გრაფები', + 'Statistics' => 'სტატისტიკა', + 'Log' => 'ლოგი', + 'Server' => 'სერვერი', + 'Services' => 'სერვისები', + 'Firewall' => 'ფაირვოლი', + 'Updates' => 'განახლება', + 'Log in' => 'შესვლა', + 'Log out' => 'გამოსვლა', + + 'USER' => 'კლიენტი', + 'WEB' => 'ვები', + 'DNS' => 'დომენები', + 'MAIL' => 'ფოსტა', + 'DB' => 'ბაზები', + 'CRON' => 'კრონი', + 'BACKUP' => 'მარქაფი', + + 'LOGIN' => 'შესვლა', + 'RESET PASSWORD' => 'პაროლის აღდგენა', + 'SEARCH' => 'ძიება', + 'PACKAGE' => 'პაკეტი', + 'RRD' => 'RRD', + 'STATS' => 'სტატისტიკა', + 'LOG' => 'ჟურნალი', + 'UPDATES' => 'განახლებები', + 'FIREWALL' => 'ფაირვოლი', + 'SERVER' => 'სერვერი', + 'MEMORY' => 'მეხსიერება', + 'DISK' => 'დისკი', + 'NETWORK' => 'ქსელი', + 'Web Log Manager' => 'ვებ ჟურნალის მართვა', + + 'Add User' => 'კლიენტის დამატება', + 'Add Domain' => 'დომენის დამატება', + 'Add Web Domain' => 'ვებ დომენის დამატება', + 'Add DNS Domain' => 'DNS დომენის დამატება', + 'Add DNS Record' => 'DNS ჩანაწერის დამატება', + 'Add Mail Domain' => 'ელფოსტის დომენის დამატება', + 'Add Mail Account' => 'ელფოსტის ანგარიშის დამატება', + 'Add Database' => 'ბაზის დამატება', + 'Add Cron Job' => 'კრონის დავალების დამატება', + 'Create Backup' => 'მარქაფის შექმნა', + 'Configure' => 'კონფიგურაცია', + 'Restore All' => 'ყველას აღდგენა', + 'Add Package' => 'პაკეტის დამატება', + 'Add IP' => 'IP მისამართის დამატება', + 'Add Rule' => 'წესის დამატება', + 'Ban IP Address' => 'IP მისამართის დაბლოკვა', + 'Search' => 'ძიება', + 'Add one more FTP Account' => 'ერთი ან მეტი FTP ანგარიშის დამატება', + 'Overall Statistics' => 'საერთო სტატისტიკა', + 'Daily' => 'ყოველდღიური', + 'Weekly' => 'ყოველკვირეული', + 'Monthly' => 'ყოველთვიური', + 'Yearly' => 'ყოველწლიური', + 'Add' => 'დამატება', + 'Back' => 'უკან', + 'Save' => 'შენახვა', + 'Submit' => 'გადაცემა', + + 'toggle all' => 'ყველას ჩართვა', + 'apply to selected' => 'შესრულება', + 'rebuild' => 'აღდგენა', + 'rebuild web' => 'ვების აღდგენა', + 'rebuild dns' => 'dns-ის აღდგენა', + 'rebuild mail' => 'ელფოსტის აღდგენა', + 'rebuild db' => 'ბაზების აღდგენა', + 'rebuild cron' => 'cron-ის აღდგენა', + 'update counters' => 'მთვლელების განახლება', + 'suspend' => 'შეჩერება', + 'unsuspend' => 'ჩართვა', + 'delete' => 'წაშლა', + 'show per user' => 'მომხმარებლის მიხედვით', + 'login as' => 'შესვლა როგორც', + 'logout' => 'გამოსვლა', + 'edit' => 'რედაქტირება', + 'open webstats' => 'webstats-ის გახსნა', + 'view logs' => 'ჟურნალების ნახვა', + 'list records' => '%s ჩანაწერის ჩვენება', + 'add record' => 'ჩანაწერის დამატება', + 'list accounts' => '%s ანგარიშების სია', + 'add account' => 'ანგარიშის დამატება', + 'open webmail' => 'ვებ-ფოსტის გახსნა', + 'list fail2ban' => 'fail2ban-ის სია', + 'open %s' => '%s გახსნა', + 'download' => 'ჩამოტვირთვა', + 'restore' => 'აღდგენა', + 'configure restore settings' => 'აღდგენის პარამეტრების კონფიგურაცია', + 'stop' => 'გაჩერება', + 'start' => 'გაშვება', + 'restart' => 'გადატვირთვა', + 'update' => 'განახლება', + 'generate' => 'გენერაცია', + 'Generate CSR' => 'CSR-ის გენერაცია', + 'reread IP' => 'IP-ის გადაკითხვა', + 'enable autoupdate' => 'ავტომატური განახლების ჩართვა', + 'disable autoupdate' => 'ავტომატური განახლების გამორთვა', + 'turn on notifications' => 'შეტყობინებების ჩართვა', + 'turn off notifications' => 'შტყობინებების გამორთვა', + + 'Adding User' => 'კლიენტის დამატება', + 'Editing User' => 'კლიენტის რედაქტირება', + 'Adding Domain' => 'დომენის დამატება', + 'Editing Domain' => 'დომენის რედაქტირება', + 'Adding DNS Domain' => 'DNS დომენის დამატება', + 'Editing DNS Domain' => 'DNS დომენის რეადაქტირება', + 'Adding DNS Record' => 'DNS ჩანაწერის დამატება', + 'Editing DNS Record' => 'DNS ჩანაწერის რედაქტირება', + 'Adding Mail Domain' => 'ელფოსტის დომენის დამატება', + 'Editing Mail Domain' => 'ელფოსტის დომენის', + 'Adding Mail Account' => 'ელფოსტის ანგარიშის დამატება', + 'Editing Mail Account' => 'ელფოსტის ანგარიშის რედაქტირება', + 'Adding database' => 'მონაცემთა ბაზის დამატება', + 'Editing Cron Job' => 'კრონის დავალების დამატება', + 'Adding Cron Job' => 'კრონის დავალების რედაქტირება', + 'Editing Database' => 'მონაცემთა ბაზის რედაქტირება', + 'Adding Package' => 'პაკეტის დამატება', + 'Editing Package' => 'პაკეტის რედაქტირება', + 'Adding IP address' => 'IP მისამართის დამატება', + 'Editing IP Address' => 'IP მისამართის რედაქტირება', + 'Editing Backup Exclusions' => 'მარქაფის გამონაკლისების რედაქტირება', + 'Generating CSR' => 'CSR-სი გენერაცია', + 'Listing' => 'სია', + 'Search Results' => 'ძიების შედეგები', + 'Adding Firewall Rule' => 'ფაირვოლის წესების დამატება', + 'Editing Firewall Rule' => 'ფაირვოლის წესების რეადაქტირება', + 'Adding IP Address to Banlist' => 'IP მისამართის ბლოკირების სიაში დამატება', + + 'active' => 'აქტიურია', + 'spnd' => 'შეჩერებულია', + 'suspended' => 'შეჩერებულია', + 'running' => 'გაშვებულია', + 'stopped' => 'გამორთულია', + 'outdated' => 'მოძველებულია', + 'updated' => 'განახლებულია', + + 'yes' => 'კი', + 'no' => 'არა', + 'none' => 'არცერთი', + 'pb' => 'პბ', + 'tb' => 'ტბ', + 'gb' => 'გბ', + 'mb' => 'მბ', + 'minute' => 'წუთი', + 'hour' => 'საათი', + 'day' => 'დღე', + 'days' => 'დღე', + 'hours' => 'საათი', + 'minutes' => 'წუთი', + 'month' => 'თვე', + 'package' => 'პაკეტი', + 'Bandwidth' => 'ტრაფიკი', + 'Disk' => 'დისკი', + 'Web' => 'ვები', + 'Mail' => 'ელფოსტა', + 'Databases' => 'ბაზები', + 'User Directories' => 'მოხმარებლის დირექტორიები', + 'Template' => 'შაბლონი', + 'Web Template' => 'ვების შაბლონი', + 'Backend Template' => 'ბექენდის შაბლონი', + 'Proxy Template' =>'პროქსის შაბლონი', + 'DNS Template' => 'DNS-ის შაბლონი', + 'Web Domains' => 'ვებ დომენები', + 'SSL Domains' => 'SSL დომენები', + 'Web Aliases' => 'Web ალიასები', + 'per domain' => 'დომენზე', + 'DNS Domains' => 'DNS დომენები', + 'DNS Domains' => 'DNS დომენები', + 'DNS records' => 'DNS ჩანაწერები' , + 'Name Servers' => 'Name სერვერები', + 'Mail Domains' => 'ელფოსტის დომენები', + 'Mail Accounts' => 'ელფოსტის ანგარიშები', + 'Cron Jobs' => 'კრონის დავალებები', + 'SSH Access' => 'SSH წვდომა', + 'IP Address' => 'IP მისამართი', + 'IP Addresses' => 'IP მისამართები', + 'Backups' => 'მარქაფები', + 'Backup System' => 'მარქაფის სისტემა', + 'backup exclusions' => 'მარქაფის გამონაკლისები', + 'template' => 'შაბლონი', + 'SSL Support' => 'SSL მხარდაჭერა', + 'SSL Home Directory' => 'SSL მთავარი დირექტორია', + 'Proxy Support' => 'პროქსის მხარდაჭერა', + 'Proxy Extensions' => 'პროქსის გაფართოებები', + 'Web Statistics' => 'ვებ სტატისტიკა', + 'Additional FTP Account' => 'დამატებითი FTP', + 'Path' => 'გზა', + 'SOA' => 'SOA', + 'TTL' => 'TTL', + 'Expire' => 'ვადა', + 'Records' => 'ჩანაწერები', + 'Serial' => 'სერიული', + 'Catchall email' => 'Catchall ელფოსტა', + 'AntiVirus Support' => 'AntiVirus-ის მხარდაჭერა', + 'AntiSpam Support' => 'AntiSpam-ის მხარდაჭერა', + 'DKIM Support' => 'DKIM მხარდაჭერა', + 'Accounts' => 'ანგარიშები', + 'Quota' => 'კვოტა', + 'Autoreply' => 'ავტომოპასუხე', + 'Forward to' => 'გადაგზავნა', + 'Do not store forwarded mail' => 'არ შეინახო გადაგზავნილი ელფოსტა', + 'IMAP hostname' => 'IMAP ჰოსტნეიმი', + 'IMAP port' => 'IMAP პორტი', + 'IMAP security' => 'IMAP უსაფრთხოება', + 'IMAP auth method' => 'IMAP ავტორიზაციის მეთოდი', + 'SMTP hostname' => 'SMTP ჰოსტნეიმი', + 'SMTP port' => 'SMTP პორტი', + 'SMTP security' => 'SMTP უსაფრთხოება', + 'SMTP auth method' => 'SMTP ავტორიზაციის მეთოდი', + 'STARTTLS' => 'STARTTLS', + 'Normal password' => 'ჩვეულებრივი პაროლი', + 'database' => 'ბაზა', + 'User' => 'მომხმარებელი', + 'Host' => 'ჰოსტი', + 'Charset' => 'კოდირება', + 'Min' => 'წუთ', + 'Hour' => 'საათი', + 'Day' => 'დღე', + 'Month' => 'თვე', + 'Day of week' => 'კვირის დღე', + 'local' => 'ლოკალური', + 'Run Time' => 'გაშვების დრო', + 'Backup Size' => 'მარქაფის ზომა', + 'SYS' => 'SYS', + 'Domains' => 'დომენები', + 'Status' => 'სტატუსი', + 'shared' => 'გაზიარებული', + 'dedicated' => 'გამოყოფილი', + 'Owner' => 'მფლობელი', + 'Users' => 'კლიენტები', + 'Load Average' => 'საშუალო დატვირთვა', + 'Memory Usage' => 'მეხსიერების მოხმარება', + 'APACHE2 Usage' => 'APACHE2 მოხმარება', + 'HTTPD Usage' => 'HTTPD მოხმარება', + 'NGINX Usage' => 'NGINX მოხმარება', + 'MySQL Usage on localhost' => 'MySQL მოხმარება localhost-ზე', + 'PostgreSQL Usage on localhost' => 'PostgreSQL მოხმარება localhost-ზე', + 'Bandwidth Usage eth0' => 'ტრაფიკის მოხმარება eth0-ზე', + 'FTP Usage' => 'FTP მოხმარება', + 'SSH Usage' => 'SSH მოხმარება', + 'reverse proxy' => 'რევერსული პროქსი', + 'web server' => 'ვებ სერვერი', + 'dns server' => 'dns სერვერი', + 'mail server' => 'ელფოსტის სერვერი', + 'pop/imap server' => 'pop/imap სერვერი', + 'email antivirus' => 'ელფოსტის ანტივირუსი', + 'email antispam' => 'ელფოსტის ანტისპამი', + 'database server' => 'მონაცემთ ბაზის სერვერი', + 'ftp server' => 'ftp სერვერი', + 'job scheduler' => 'დავალებების განრიგი', + 'firewall' => 'ფაირვოლი', + 'brute-force monitor' => 'brute-force მონიტორინგი', + 'CPU' => 'CPU', + 'Memory' => 'მეხსიერება', + 'Uptime' => 'აფთაიმი', + 'core package' => 'საბაზისო პაკეტები', + 'php interpreter' => 'php ინტერპრეტატორი', + 'internal web server' => 'შიდა ვებ სერვერი', + 'Version' => 'ვერსია', + 'Release' => 'რელიზი', + 'Architecture' => 'არქიტექტურა', + 'Object' => 'ობიექტი', + 'Owner' => 'მფლობელი', + 'Username' => 'მომხმარებლის სახელი', + 'Password' => 'პაროლი', + 'Email' => 'ელფოსტა', + 'Package' => 'პაკეტი', + 'Language' => 'ენა', + 'First Name' => 'სახელი', + 'Last Name' => 'გვარი', + 'Send login credentials to email address' => 'შესვლის დეტალების ელფოსტაზე გაგზავნა', + 'Default Template' => 'ნაგულისხმევი შაბლონი', + 'Default Name Servers' => 'ნაგულისხმევი Name Server-ები', + 'Domain' => 'დომენი', + 'DNS Support' => 'DNS-ის მხარდაჭერა', + 'Mail Support' => 'Mail-ის მხარდაჭერა', + 'Advanced options' => 'დამატებითი პარამეტრები', + 'Basic options' => 'მარტივი პარამეტრები', + 'Aliases' => 'ალიასები', + 'SSL Certificate' => 'SSL სერტიფიკატები', + 'SSL Key' => 'SSL გასაღბი', + 'SSL Certificate Authority / Intermediate' => 'SSL სერტიფიკატების ავტორიტეტი / შუამავალი', + 'SSL CSR' => 'SSL CSR', + 'optional' => 'დამატებითი', + 'internal' => 'შიდა', + 'Statistics Authorization' => 'სტატისტიკის ავტორიზაცია', + 'Statistics Auth' => 'სტატისტიკის ავტორიზაც.', + 'Account' => 'ანგარიში', + 'Prefix will be automaticaly added to username' => 'პრეფიქსი %s ავტომატურად დაემატება მომხმარებლის სახელს', + 'Send FTP credentials to email' => 'FTP ანგარიშის დეტალების ელფოსტაზე გაგზავნა', + 'Expiration Date' => 'ვადის გასვლის დრო', + 'YYYY-MM-DD' => 'წწწწ-თთ-დდ', + 'Name servers' => 'Name server-ები', + 'Record' => 'ჩანაწერი', + 'IP or Value' => 'IP ან მნიშვნელობა', + 'Priority' => 'პრიორიტეტი', + 'Record Number' => 'ჩანაწერის ციფრი', + 'in megabytes' => 'მეგაბაიტებში', + 'Message' => 'შეტყობინება', + 'use local-part' => 'local-part-ის გამოყენება', + 'one or more email addresses' => 'ერთი ან მეტი ელფოსტის მისამართი', + 'Prefix will be automaticaly added to database name and database user' => 'პრეფიქსი %s willავტომატურად დაემატრება ბაზის სახელსა და მომხმარებელს.', + 'Database' => 'ბაზა', + 'Type' => 'ტიპი', + 'Minute' => 'წუთი', + 'Command' => 'ბრძანება', + 'Package Name' => 'პაკეტის სახელი', + 'Netmask' => 'მასკა', + 'Interface' => 'ინტერფეისი', + 'Shared' => 'გაზიარებული', + 'Assigned user' => 'მიმაგრებული მომხმარებელი', + 'Assigned domain' => 'მიმაგრებული დომენი', + 'NAT IP association' => 'NAT IP ასოციაცია', + 'shell' => 'შელი', + 'web domains' => 'ვებ დომენები', + 'web aliases' => 'ვებ ალიასები', + 'dns records' => 'dns ჩანაწერები', + 'mail domains' => 'mail დომენები', + 'mail accounts' => 'ელფოსტის ანგარიშები', + 'accounts' => 'ანგარიშები', + 'databases' => 'ბაზები', + 'cron jobs' => 'კრონის დავალებები', + 'backups' => 'მარქაფები', + 'quota' => 'კვოტა', + 'day of week' => 'კვირის დღე', + 'cmd' => 'cmd', + 'users' => 'მომხმარებლები', + 'domains' => 'დომენები', + 'aliases' => 'ალიასები', + 'records' => 'ჩანაწერები', + 'jobs' => 'დავალებები', + 'username' => 'მომხმარებლის სახელი', + 'password' => 'პაროლი', + 'type' => 'ტიპი', + 'charset' => 'კოდირება', + 'domain' => 'დომენი', + 'ip' => 'ip', + 'ip address' => 'ip მისამართი', + 'IP address' => 'IP მისამართი', + 'netmask' => 'მასკა', + 'interface' => 'ინტერფეისი', + 'assigned user' => 'მიმაგრებული მომხმარებელი', + 'ns1' => 'ns1', + 'ns2' => 'ns2', + 'user' => 'მომხმარებელი', + 'email' => 'ელფოსტა', + 'first name' => 'სახლი', + 'last name' => 'გვარი', + 'account' => 'ანგარიში', + 'ssl certificate' => 'ssl სერტიფიკატი', + 'ssl key' => 'ssl გასაღბი', + 'stats user password' => 'სტატისტიკის მომხმარებლის პაროლი', + 'stats username' => 'სტატისტიკის მოხმარებლის სახელი', + 'stats password' => 'სტატისტიკის პაროლი', + 'ftp user password' => 'ftp მომხმარებლის პაროლი', + 'ftp user' => 'ftp მომხმარებელი', + 'Last 70 lines of %s.%s.log' => 'ბოლო 70 ხაზი %s.%s.log - დან', + 'AccessLog' => 'დაშვების ჟურნალი', + 'ErrorLog' => 'შეცდომების ჟურნალი', + 'Download AccessLog' => 'დაშვების ჟურნალის გადმოწერა', + 'Download ErrorLog' => 'შეცდომების ჟურნალის გადმოწერა', + 'Country' => 'ქვეყანა', + '2 letter code' => '2 სიმბოლოიანი კოდი', + 'State / Province' => 'შტატი / პროვინცია', + 'City / Locality' => 'ქალაქი / ლოკაცია', + 'Organization' => 'ორგანიზაცია', + 'Action' => 'მოქმედება', + 'Protocol' => 'პროტოკოლი', + 'Port' => 'პორტი', + 'Comment' => 'კომენტარი', + 'Banlist' => 'ბლოკირების სია', + 'ranges are acceptable' => 'მისაღებია დიაპაზონები', + 'CIDR format is supported' => 'მხარდაჭერილია CIDR ფორმატი', + 'ACCEPT' => 'მიღება', + 'DROP' => 'გადაგდება', + 'TCP' => 'TCP', + 'UDP' => 'UDP', + 'ICMP' => 'ICMP', + 'SSH' => 'SSH', + 'FTP' => 'FTP', + 'VESTA' => 'VESTA', + 'Add one more Name Server' => 'დაამატეთ კიდევ ერთი Name Server', + + 'web domain' => 'ვებ დომენი', + 'dns domain' => 'dns დომენი', + 'dns record' => 'dns ჩანაწერი', + 'mail domain' => 'ელფოსტის დომენი', + 'mail account' => 'ელფოსტის ანგარიში', + 'cron job' => 'კრონის დავალება', + + 'cron' => 'კრონი', + 'user dir' => 'მომხამრებლის დირექტორია', + + 'unlimited' => 'ულიმიტო', + '1 account' => '1 ანგარიში', + '%s accounts' => '%s ანგარიში', + '1 domain' => '1 დომენი', + '%s domains' => '%s დომენი', + '1 record' => '1 ჩანაწერი', + '%s records' => '%s ჩანაწერი', + '1 mail account' => '1 ელფოსტის მისამართი', + '%s mail accounts' => '%s ელფოსტის მისამართი', + '1 database' => '1 ბაზა', + '%s databases' => '%s ბაზა', + '1 cron job' => '1 კრონის დავალება', + '%s cron jobs' => '%s კრონის დავალება', + '1 archive' => '1 არქივი', + '%s archives' => '%s არქივი', + '1 item' => '1 ერთეული', + '%s items' => '%s ერთეული', + '1 package' => '1 პაკეტი', + '%s packages' => '%s პაკეტი', + '1 IP address' => '1 IP მისამართი', + '%s IP addresses' => '%s IP მისამართი', + '1 month' => '1 თვე', + '%s months' => '%s თვე', + '1 log record' => '1 ჟუნრალში ჩანაწერი', + '%s log records' => '%s ჟურნალში ჩანაწერი', + '1 object' => '1 ობიექტი', + '%s objects' => '%s ობიექტი', + 'no exclusions' => 'გამონაკლისების გარეშე', + '1 rule' => '1 წესის', + '%s rules' => '%s წესი', + 'There are no currently banned IP' => 'ამ დროისთვის არ არის დაბლოკილი IP მისამართები', + + 'USER_CREATED_OK' => 'მომხმარებელი %s წარმატებით შეიქმნა.', + 'WEB_DOMAIN_CREATED_OK' => 'დომენი %s წარმატებით შეიქმნა.', + 'DNS_DOMAIN_CREATED_OK' => 'DNS დომენი %s წარმატებით შეიქმნა.', + 'DNS_RECORD_CREATED_OK' => 'ჩანაწერი %s.%s წარმატებით შეიქმნა.', + 'MAIL_DOMAIN_CREATED_OK' => 'ელფოსტის დომენი %s წარმატებით შეიქმნა.', + 'MAIL_ACCOUNT_CREATED_OK' => 'ელფოსტის ანგარისი %s@%s წარმატებით შეიქმნა.', + 'DATABASE_CREATED_OK' => 'ბაზა %s წარმატებით შეიქმნა.', + 'CRON_CREATED_OK' => 'კრონის ამოცანა წარმატებით შეიქმნა.', + 'IP_CREATED_OK' => 'IP მისამართი %s წარმატებით შეიქმნა.', + 'PACKAGE_CREATED_OK' => 'პაკეტი %s წარმატებით შეიქმნა.', + 'SSL_GENERATED_OK' => 'სერტიფიკატი წარმატებით დაგენერირდა.', + 'RULE_CREATED_OK' => 'წესო წარმატებით შეიქმნა.', + 'BANLIST_CREATED_OK' => 'IP წარმატებით დაიბლოკა', // I'm not sure about this text + 'Autoupdate has been successfully enabled' => 'ავტომატური განახლება წარმატებით ჩაირთო.', + 'Autoupdate has been successfully disabled' => 'ავტომატური განახლება წრამატებით გამოირთო.', + 'Cronjob email reporting has been successfully enabled' => 'კრონის დავალებების ელფოსტით დარეპორტება წარმატებით ჩაირთო', + 'Cronjob email reporting has been successfully disabled' => 'კრონის დავალებების ელფოსტით დარეპორტება წარმატებით გამოირთო', + 'Changes has been saved.' => 'ცვლილებები შენახულია.', + 'Confirmation' => 'დასტური', + 'DELETE_USER_CONFIRMATION' => 'ნამდვილად გსურთ წაშალოთ კლიენტი: %s?', + 'SUSPEND_USER_CONFIRMATION' => 'ნამდივლად გსურთ შეუჩეროთ მომსახურება კლიენტს: %s?', + 'UNSUSPEND_USER_CONFIRMATION' => 'ნამდვილად გსურთ გაუგრძელოთ მომსახურება კლიენტს: %s?', + 'DELETE_DOMAIN_CONFIRMATION' => 'ნამდვილად გსურტ წაშალოთ დომენი: %s?', + 'SUSPEND_DOMAIN_CONFIRMATION' => 'ნამდივლად გსურთ შეუჩეროთ მომსახურება დომენს: %s?', + 'UNSUSPEND_DOMAIN_CONFIRMATION' => 'ნამდვილად გსურთ გაუგრძელოთ მომსახურება დომენს: %s?', + 'DELETE_RECORD_CONFIRMATION' => 'ნამდვილად გსურთ წაშალოთ ჩანაწერი: %s?', + 'SUSPEND_RECORD_CONFIRMATION' => 'ნამდივლად გსურთ შეუჩეროთ მომსახურება ჩანაწერს: %s?', + 'UNSUSPEND_RECORD_CONFIRMATION' => 'ნამდვილად გსურთ გაუგრძელოთ მომსახურება ჩანაწერს %s?', + 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'ნამდვილად გსურთ წაშალოთ %s?', + 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'ნამდივლად გსურთ შეუჩეროთ მომსახურება: %s?', + 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'ნამდვილად გსურთ გაუგრძელოთ მომსახურება %s?', + 'DELETE_DATABASE_CONFIRMATION' => 'ნამდვილად გსურთ წაშალოთ ბაზა %s?', + 'SUSPEND_DATABASE_CONFIRMATION' => 'ნამდივლად გსურთ შეაჩეროთ ბაზა: %s?', + 'UNSUSPEND_DATABASE_CONFIRMATION' => 'ნამდივლად გსურთ ჩართოთ ბაზა %s?', + 'DELETE_CRON_CONFIRMATION' => 'ნამდვილად გსურთ კრონის დავალების წაშლა?', + 'SUSPEND_CRON_CONFIRMATION' => 'ნამდვილად გსურთ კრონის დავალების შეჩერება?', + 'UNSUSPEND_CRON_CONFIRMATION' => 'ნამდვილად გსურთ კრონის დავალების ჩართვა?', + 'DELETE_BACKUP_CONFIRMATION' => 'ნადვილად გსურთ წაშალოთ %s მარქაფი?', + 'DELETE_EXCLUSION_CONFIRMATION' => 'ნამდვილად გსურთ წაშალოთ %s გამონაკლისი?', + 'DELETE_PACKAGE_CONFIRMATION' => 'ნამდვილად გსურთ წაშალოთ პაკეტი %s?', + 'DELETE_IP_CONFIRMATION' => 'ნამდივლად გსურთ წაშალოთ IP მისამართი %s?', + 'DELETE_RULE_CONFIRMATION' => 'ნამდილად გსურთ წაშალოთ წესი #%s?', + 'SUSPEND_RULE_CONFIRMATION' => 'ნამდვილად გსურთ შეაჩეროთ წესი #%s?', + 'UNSUSPEND_RULE_CONFIRMATION' => 'ნამდვილად გსურთ ჩართოთ წესი #%s?', + 'LEAVE_PAGE_CONFIRMATION' => 'დავტოვო გვერდი?', + 'RESTART_CONFIRMATION' => 'ნამდვილად გსურთ გადატვირთოთ %s?', + 'Welcome' => 'გამარჯობა', + 'LOGGED_IN_AS' => 'შემოსული ხართ როგორც კლიენტი: %s', + 'Error' => 'შეცდომა', + 'Invalid username or password' => 'არასწორი მომხამრებლის სახელი ან პაროლი.', + 'Invalid username or code' => 'არასწორი მომხმარებლის სახელი ან კოდი.', + 'Passwords not match' => 'პაროლები არ ემთხვევა.', + 'Please enter valid email address.' => 'გთხოვთ შეიყვანოთ სწორი ელფოსტის მისამართი.', + 'Field "%s" can not be blank.' => 'ველი: "%s" არ შეიძლება იყოს ცარიელი.', + 'Password is too short.' => 'პაროლი ძალიან მოკლეა (საჭიროა მინიმუმ 6 სიმბოლო)', + 'Error code:' => 'შეცდომის კოდი: %s', + 'SERVICE_ACTION_FAILED' => '"%s" "%s" ჩაიშალა', + 'IP address is in use' => 'IP უკვე გამოყენებულია', + 'BACKUP_SCHEDULED' => 'დავალება დაემატა განრიგში. თქვენ მიიღებთ შეტყობინებას ელფოსტით როცა ფაილი მზად იქნება ჩამოტვირთვისთვის.', + 'BACKUP_EXISTS' => 'არსებული მარქაფი უკვე მიმდინარეობს, დაელოდეთ მის დასრულებას.', + 'RESTORE_SCHEDULED' => 'დავალება დაემატა განრიგსი. თქვენ მიიღებთ შეტყობინებას ელფოსტით როცა აღდგენა დასრულდება.', + 'RESTORE_EXISTS' => 'არსებული აღდგენის პროცესი უკვე მიმდინარეობს. დაელოდეთ მის დასრულებას სანამ ხელახლა გაუშვებთ.', + + 'WEB_EXCLUSIONS' => "აკრიფეთ დომენის სახელი, თითო ერთ ხაზზე. ყველა დომენის გამოსატოვებლად გამოიყენეთ *. კატალოგების გამოსაყოფად გამოიყენეთ შემდეგი ფორმატი: domain.com:public_html/cache:public_html/tmp", + 'DNS_EXCLUSIONS' => "აკრიფეთ დომენის სახელი, თითო ერთ ხაზზე. ყველა დომენის გამოსატოვებლად გამოიყენეთ *", + 'MAIL_EXCLUSIONS' => "აკრიფეთ დომენის სახელი, თითო ერთ ხაზზე. ყველა დომენის გამოსატოვებლად გამოიყენეთ *. სპეციფიური ანგარიშების გამოსატოვებლად გამოიყენეთ შემდეგი ფორმატი: domain.com:info:support:postmaster", + 'DB_EXCLUSIONS' => "აკრიფეთ ბაზის სრული სახელი, თითო ერთ ხაზზე. ყველა დომენის გამოსატოვებლად გამოიყენეთ *", + 'CRON_EXCLUSIONS' => "ყველა დავალების გამოსატოვებლად გამოიყენეთ *", + 'USER_EXCLUSIONS' => "აკრიფეთ კატალოგის სახელი, თითო ერთ ხაზზე. ყველა კატალოგის გამოსატოვებლად გამოიყენეთ *", + + 'Welcome to Vesta Control Panel' => 'მოგესალმებათ Vesta მართვის პანელი', + 'MAIL_FROM' => 'Vesta მართვის პანელი ', + 'GREETINGS_GORDON_FREEMAN' => "გამარჯობა, %s %s,\n", + 'GREETINGS' => "გამარჯობა,\n", + 'ACCOUNT_READY' => "თქვენი ანგარიში შექმნილია და მისი გამოყენება უკვე შესაძლებელია.\n\nhttps://%s/login/\nმომხმარებელი: %s\nპაროლი: %s\n\n--\nVesta მართვის პანელი\n", + + 'FTP login credentials' => 'FTP ანგარიშის მონაცემები', + 'FTP_ACCOUNT_READY' => "FTP ანგარიში შექმნილია და მისი გამოყენება უკვე შესაძლებელია.\n\nჰოსტნეიმი: %s\nმომხმარებელი: %s_%s\nპაროლი: %s\n\n--\nVesta მართვის პანელი\n", + + 'Database Credentials' => 'ბაზის მონაცემები', + 'DATABASE_READY' => "ბაზა წარმატებით შეიქმნა.\n\nბაზა: %s\nმომხმარებელი: %s\nპაროლი: %s\n%s\n\n--\nVesta მართვის პანელი\n", + + 'forgot password' => 'დაგავიწყდათ პაროლი', + 'Confirm' => 'დამოწმება', + 'New Password' => 'ახალი პაროლი', + 'Confirm Password' => 'პაროლის დამოწმება', + 'Reset' => 'ჩამოყრა', + 'Reset Code' => 'ჩამოსაყრელი კოკი', + 'RESET_NOTICE' => '', + 'RESET_CODE_SENT' => 'პაროლის ჩამოსაყრელი კოდი გაგზავნილია თქვენს ელფოსტაზე
', + 'MAIL_RESET_SUBJECT' => 'პაროლის აღდგენა: %s', + 'PASSWORD_RESET_REQUEST' => "პაროლის აღდგენისთვის, გადაით შემდეგ ბმულზე:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatively, ასევე შეგიძლიათ გადახვიდეთ ბმულზე https://%s/reset/?action=code&user=%s და შეიყვანოთ :\n%s\n\nთუ თქვენ არ მოგითხოვიათ პაროლის ჩამოყრა, ყურადღება არ მიაქციოტ ამ შეტყობინებას და მიიღეთ ჩვენგან ბოდიში.\n\n--\nVesta მართვის პანელი\n", + + 'Jan' => 'იან', + 'Feb' => 'თებ', + 'Mar' => 'მარ', + 'Apr' => 'აპრ', + 'May' => 'მაი', + 'Jun' => 'ივნ', + 'Jul' => 'ივლ', + 'Aug' => 'აგვ', + 'Sep' => 'სექ', + 'Oct' => 'ოქტ', + 'Nov' => 'ნოე', + 'Dec' => 'დეკ', + + 'Configuring Server' => 'სერვერის კონფიგურაცია', + 'Hostname' => 'ჰოსტის სახელი', + 'Time Zone' => 'სასაათო სარტყელი', + 'Default Language' => 'ნაგულისხმევი ენა', + 'Proxy Server' => 'პროქსი სერვერი', + 'Web Server' => 'ვებ სერვერი', + 'Backend Server' => 'ბექენდ სერვერი', + 'Backend Pool Mode' => 'ბექენდის პულის რეჟიმი', + 'DNS Server' => 'DNS სერვერი', + 'DNS Cluster' => 'DNS კლასტერი', + 'MAIL Server' => 'ელფოსტის სერვერი', + 'Antivirus' => 'ანტივირუსი', + 'AntiSpam' => 'ანტისპამი', + 'Webmail URL' => 'ვებფოსტის URL', + 'MySQL Support' => 'MySQL-ის მხარდაჭერა', + 'phpMyAdmin URL' => 'phpMyAdmin-ის URL', + 'PostgreSQL Support' => 'PostgreSQL-ის მხარდაჭერა', + 'phpPgAdmin URL' => 'phpPgAdmin-ის URL', + 'Maximum Number Of Databases' => 'ბაზების მაქსიმალური რაოდენობა', + 'Current Number Of Databases' => 'ბაზების მიმდინარე რაოდენობა', + 'Local backup' => 'ლოკალური მარქაფი', + 'Compression level' => 'შეკუმშვის დონე', + 'Directory' => 'დირექტორია', + 'Remote backup' => 'დაშორებული მარქაფი', + 'ftp' => 'FTP', + 'ftp' => 'FTP', + 'SFTP Chroot' => 'SFTP Chroot', + 'FileSystem Disk Quota ' => 'ფაილური სისტემის დისკის კვოტა ', + 'Vesta Control Panel Plugins' => 'Vesta მართვის პანელის ჩადგმები', + 'preview' => 'გადახედვა', + 'Reseller Role' => 'გადამყიდველის როლი', + 'Web Config Editor' => 'ვების კონფიგურაციის რედაქტორი', + 'Template Manager' => 'შაბლონების მართვა', + 'Backup Migration Manager' => 'მარქაფების მიგრაციის მართვა', + 'FileManager' => 'ფაილები', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', + + 'sort by' => 'დალაგება', + 'Date' => 'თარიღით', + 'Starred' => 'ვარსკვლავებით', + 'Name' => 'სახელით', + + + 'File Manager' => 'ფაილები', + 'type' => 'ტიპი', + 'size' => 'ზომა', + 'date' => 'თარიღი', + 'name' => 'სახელი', + 'Initializing' => 'ინიციალიზაცია', + 'UPLOAD' => 'ატვირთვა', + 'NEW FILE' => 'ახ. ფაილი', + 'NEW DIR' => 'ახ. დირექტორია', + 'DELETE' => 'წაშლა', + 'RENAME' => 'გადარქმევა', + 'RIGHTS' => 'უფლებები', + 'COPY' => 'კოპირება', + 'ARCHIVE' => 'არქივი', + 'EXTRACT' => 'გამოარქივება', + 'DOWNLOAD' => 'ჩამოტვირთვა', + 'Are you sure?' => 'ნამდვილად გსურთ?', // unused? + 'Hit' => 'ჰიტი', + 'to reload the page' => 'გვერდის გადასატრვირთად', + 'Directory name cannot be empty' => 'დირექტორიის სახელი არ შეიძლება ცარიელი იყოს', + 'File name cannot be empty' => 'ფაილის სახელი არ შეიძლება ცარიელი იყოს', + 'No file selected' => 'ფაილი არ არის მონიშნული', + 'No file or folder selected' => 'ფაილი ან საქაღალდე არ არის მონიშნული', + 'File type not supported' => 'ფაილის ტიპი არ არის მხარდაჭერილი', + 'Directory download not available in current version' => 'ამ ვერსიაში არ არის დირექტორიის გადმოწერა შესაძლებელი', + 'Directory not available' => 'დირექტორია მიუწვდომელია', + 'Done' => 'დასრულება', + 'Close' => 'დახურვა', + 'Copy' => 'კოპირება', + 'Cancel' => 'გაუქმება', + 'Rename' => 'გადარქმევა', + 'Move' => 'გადატანა', + 'Change Rights' => 'უფლებების შეცვლა', + 'Delete' => 'წაშლა', + 'Extract' => 'გამოარქივება', + 'Create' => 'შექმნა', + 'Compress' => 'შეკუმშვა', + 'OK' => 'კი', + 'YOU ARE COPYING' => 'თქვენ აკოპირებთ', // unused? + 'YOU ARE REMOVING' => 'თქვენ შლით', + 'Delete items' => 'ერთეულების წაშლა', + 'Copy files' => 'ფაილების კოპირება', + 'Move files' => 'ფაილების გადატანა', + 'Are you sure you want to copy' => 'ნამდვილად გსურთ კოპირება', + 'Are you sure you want to move' => 'ნამდვილად გსურთ გადატანა', + 'Are you sure you want to delete' => 'ნამდვილად გსურთ წაშლა', + 'into' => 'ამაში', + 'existing files will be replaced' => 'არსებული ფაილები ჩანაცვლდება', + 'Original name' => 'ორიგინალური სახელი', + 'File' => 'ფაილი', + 'already exists' => 'უკვე არსებობს', + 'Create file' => 'ფაილის შექმნა', + 'Create directory' => 'დირექტორიის შექმნა', + 'read by owner' => 'წაკითხვა მფლობელისთვის', + 'write by owner' => 'ჩაწერა მფლობელისთვის', + 'execute/search by owner' => 'გაშვება/ძიება მფლობელისთვის', + 'read by group' => 'წაკითხვა ჯგუფისთვის', + 'write by group' => 'ჩაწერა ჯგუფისთვის', + 'execute/search by group' => 'გაშვება/ძიება ჯგუფისთვის', + 'read by others' => 'წაკითხვა სხვებისთვის', + 'write by others' => 'ჩაწერა სხვებისთვის', + 'execute/search by others' => 'გაშვება/ძიება სხვებისთვის', + + ' Shortcuts' => 'მალსახმობები', + 'Add New object' => 'ახალი ობიექტის დამატება', + 'Save Form' => 'ფორმის შენახვა', + 'Cancel saving form' => 'ფორმის შენახვის გაუქმება', + 'Go to USER list' => 'კლიენტებისების სიაზე გადასვლა', + 'Go to WEB list' => 'ვების სიაზე გადასვლა', + 'Go to DNS list' => 'დომენების სიაზე გადასვლა', + 'Go to MAIL list' => 'ელფოსტის სიაზე გადასვლა', + 'Go to DB list' => 'ბაზების სიაზე გადასვლა', + 'Go to CRON list' => 'კრონის სიაზე გადასვლა', + 'Go to BACKUP list' => 'მარქაფების სიაზე გადასვლა', + 'Focus on search' => 'ძიაბაზე ფოკუსირება', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'უკან გადასვლა მთავარ მენიუში', + 'Move forward through top menu' => 'წინ გადასვლა მთავარ მენიუში', + 'Enter focused element' => 'ფოკუსირებულ ელემენტზე გადასვლა', + 'Move up through elements list' => 'ელემენტების სიაში ზევით გადასვლა', + 'Move down through elements list' => 'ელემენტების სიაში ზევით გადასვლა', + + 'Upload' => 'ატვირთვა', + 'New File' => 'ახალი ფაილი', + 'New Folder' => 'ახალი ფოლდერი', + 'Download' => 'ჩამოტვირთვა', + 'Archive' => 'დაარქივება', + 'Save File (in text editor)' => 'ფაილის შენახვა (ტექსტურ რედაქტორში)', + 'Close Popup / Cancel' => 'პოპაპის დახურვა / გაუქმება', + 'Move Cursor Up' => 'კურსორი ზევით', + 'Move Cursor Dow' => 'კურსორი ქვევით', + 'Switch to Left Tab' => 'მარცხენა ჩანართზე გადასვლა', + 'Switch to Right Tab' => 'მარჯვენა ჩანართზე გადასვლა', + 'Switch Tab' => 'ჩანართის გადართვა', + 'Go to the Top of File List' => 'ფაილების სიის თავში გადასვლა', + 'Go to the Last File' => 'ბოლო ფაილზე გადასვლა', + 'Open File/Enter Directory' => 'ფაილის გახსნა/დირექტორიაში შესვლა', + 'Edit File' => 'ფაილის რედაქტირება', + 'Go to Parent Directory' => 'მშობელ დირექტორიაში გადასვლა', + 'Select Current File' => 'მიმდინარე ფაილის მონიშვნა', + 'Select Bunch of Files' => 'ვებრი ფაილის მონიშვნა', + 'Append File to the Current Selection' => 'ფაილის მონიშნულებში დამატება', + 'Select All Files' => 'Select All Files', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'მალსახმობები შექმნილია უძლიერესი GNU Midnight Commander ფაილური მენეჯერის მიხედვით', + + 'Licence Key' => 'ლიცენზიის გასაღები', + 'Enter License Key' => 'შეიყვანეთ ლიცენზიის გასაღები', + 'Buy Licence' => 'ლიცენზიის შეძენა', + 'Buy Lifetime License' => 'სამუდამო ლიცენზიის შეძენა', + 'Disable and Cancel Licence' => 'ლიცენზიის გამორთვა და გაუქმება', + 'Licence Activated' => 'ლიცენზია გააქტიურდა', + 'Licence Deactivated' => 'ლიცენზია გამოირთო', + 'Restrict users so that they cannot use SSH and access only their home directory.' => 'მომხმარებლებისტვის SSH-ზე წვდომის შეზღუდვა და მათი მხოლოდ საკუთარ საშინაო კატალოგში მოქცევა.', + 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'მიმოხილვა, კოპირება, რედაქტირება, ნახვა და ყველა თქვენი დომენის ფაილების მართვა სრულად ფუნქციური ფაილური მენეჯერით.', + 'This is a commercial module, you would need to purchace license key to enable it.' => 'ეს კომერციული მოდულია და მის ჩასართავად საჭიროა ლიცენზიის გასაღების შეძენა.', + + 'Minutes' => 'წუთი', + 'Hourly' => 'საათობრივი', + 'Daily' => 'ყოველდღიური', + 'Weekly' => 'ყოველკვირეული', + 'Monthly' => 'ყოველთვიური', + 'Run Command' => 'ბრძანების გაშვება', + 'every month' => 'თვეში ერთხელ', + 'every odd month' => 'ყოველ ლუწ თვეში', + 'every even month' => 'ყოველ კენტ თვეში', + 'every day' => 'ყოველდღიურად', + 'every odd day' => 'ყოველ ლუწ დღეს', + 'every even day' => 'ყოველ კენტ დღეს', + 'weekdays (5 days)' => 'სამუშაო დღეებში (5 დღე)', + 'weekend (2 days)' => 'დასვენების დღეებში (2 დღე)', + 'Monday' => 'ორშაბათი', + 'Tuesday' => 'სამშაბათი', + 'Wednesday' => 'ოთხშაბათი', + 'Thursday' => 'ხუთშაბათი', + 'Friday' => 'პარასკევი', + 'Saturday' => 'შაბათი', + 'Sunday' => 'კვირა', + 'every hour' => 'საათში ერთხელ', + 'every two hours' => 'ყოველ ორ სააათში', + 'every minute' => 'ყოველ წუთს', + 'every two minutes' => 'ყოველ ორ წუთში', + 'every' => 'ყოველ', + 'Generate' => 'გენერაცია', + + 'webalizer' => 'webalizer', + 'awstats' => 'awstats', + + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', +); diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php index b5a37669..9e33a1b8 100644 --- a/web/inc/i18n/nl.php +++ b/web/inc/i18n/nl.php @@ -731,4 +731,21 @@ $LANG['nl'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/no.php b/web/inc/i18n/no.php index a50377d9..90c6ac77 100644 --- a/web/inc/i18n/no.php +++ b/web/inc/i18n/no.php @@ -731,4 +731,21 @@ $LANG['no'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/pl.php b/web/inc/i18n/pl.php index b542a544..96f3660a 100644 --- a/web/inc/i18n/pl.php +++ b/web/inc/i18n/pl.php @@ -730,4 +730,21 @@ $LANG['pl'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/pt-BR.php b/web/inc/i18n/pt-BR.php index bd813692..25089dfd 100644 --- a/web/inc/i18n/pt-BR.php +++ b/web/inc/i18n/pt-BR.php @@ -25,18 +25,18 @@ $LANG['pt-BR'] = array( 'CRON' => 'TAREFA', 'BACKUP' => 'BACKUP', - 'LOGIN' => 'LOGIN', - 'RESET PASSWORD' => 'RESET PASSWORD', - 'SEARCH' => 'SEARCH', - 'PACKAGE' => 'PACKAGE', - 'RRD' => 'RRD', - 'STATS' => 'STATS', + 'LOGIN' => 'ENTRAR', + 'RESET PASSWORD' => 'RESTAURAR SENHA', + 'SEARCH' => 'PESQUISAR', + 'PACKAGE' => 'PACOTE', + 'RRD' => 'GRÁFICOS', + 'STATS' => 'ESTATÍSTICAS', 'LOG' => 'LOG', - 'UPDATES' => 'UPDATES', + 'UPDATES' => 'ATUALIZAÇÕES', 'FIREWALL' => 'FIREWALL', - 'SERVER' => 'SERVER', - 'MEMORY' => 'MEMORY', - 'DISK' => 'DISK', + 'SERVER' => 'SERVIDOR', + 'MEMORY' => 'MEMÓRIA', + 'DISK' => 'DISCO', 'NETWORK' => 'NETWORK', 'Web Log Manager' => 'Web Log Manager', @@ -210,15 +210,15 @@ $LANG['pt-BR'] = array( 'Forward to' => 'Encaminhar para', 'Do not store forwarded mail' => 'Não armazenar email encaminhado', 'IMAP hostname' => 'IMAP hostname', - 'IMAP port' => 'IMAP port', - 'IMAP security' => 'IMAP security', - 'IMAP auth method' => 'IMAP auth method', + 'IMAP port' => 'Porta IMAP', + 'IMAP security' => 'Segurança IMAP', + 'IMAP auth method' => 'Método de autenticação IMAP', 'SMTP hostname' => 'SMTP hostname', - 'SMTP port' => 'SMTP port', - 'SMTP security' => 'SMTP security', - 'SMTP auth method' => 'SMTP auth method', + 'SMTP port' => 'Porta SMTP', + 'SMTP security' => 'Segurança SMTP', + 'SMTP auth method' => 'Método de autenticação SMTP', 'STARTTLS' => 'STARTTLS', - 'Normal password' => 'Normal password', + 'Normal password' => 'Senha normal', 'database' => 'banco de dados', 'User' => 'Usuário', 'Host' => 'Host', @@ -236,11 +236,11 @@ $LANG['pt-BR'] = array( 'Status' => 'Status', 'shared' => 'compartilhado', 'dedicated' => 'dedicado', - 'Owner' => 'Dono', + 'Owner' => 'Proprietário', 'Users' => 'Usuários', 'Load Average' => 'Carga Média', 'Memory Usage' => 'Uso de Memória', - 'APACHE2 Usage' => 'APACHE2 Usage', + 'APACHE2 Usage' => 'Uso do APACHE2', 'HTTPD Usage' => 'Uso do HTTPD', 'NGINX Usage' => 'Uso do NGINX', 'MySQL Usage on localhost' => 'Uso do MySQL MySQL em localhost', @@ -268,7 +268,7 @@ $LANG['pt-BR'] = array( 'php interpreter' => 'interpretador php', 'internal web server' => 'servidor web interno', 'Version' => 'Versão', - 'Release' => 'Release', + 'Release' => 'Lançamento', 'Architecture' => 'Arquitetura', 'Object' => 'Objeto', 'Username' => 'Usuário', @@ -285,7 +285,7 @@ $LANG['pt-BR'] = array( 'DNS Support' => 'Suporte a DNS', 'Mail Support' => 'Suporte a Email', 'Advanced options' => 'Opções Avançadas', - 'Basic options' => 'Basic options', + 'Basic options' => 'Opções Básicas', 'Aliases' => 'Apelidos', 'SSL Certificate' => 'Certificado SSL', 'SSL Key' => 'Chave SSL', @@ -298,7 +298,7 @@ $LANG['pt-BR'] = array( 'Account' => 'Conta', 'Prefix will be automaticaly added to username' => 'O prefixo %s será automaticamente adicionado ao nome de usuário', 'Send FTP credentials to email' => 'Enviar credenciais ao FTP por email', - 'Expiration Date' => 'data para Expirar', + 'Expiration Date' => 'Data para expirar', 'YYYY-MM-DD' => 'DD-MM-YYYY', 'Name servers' => 'Servidores de Nome', 'Record' => 'Registro', @@ -445,7 +445,7 @@ $LANG['pt-BR'] = array( 'PACKAGE_CREATED_OK' => 'Pacote %s criado com sucesso.', 'SSL_GENERATED_OK' => 'Certificado SSL criado sucesso.', 'RULE_CREATED_OK' => 'Regra criada com sucesso.', - 'BANLIST_CREATED_OK' => 'IP address has been banned successfully', // I'm not sure about this text + 'BANLIST_CREATED_OK' => 'Endereço IP foi banido com sucesso', // I'm not sure about this text 'Autoupdate has been successfully enabled' => 'Atualização automática ativada com sucesso', 'Autoupdate has been successfully disabled' => 'Atualização automática desativado com sucesso', 'Cronjob email reporting has been successfully enabled' => 'Relatórios de tarefas ativado com sucesso', @@ -553,16 +553,16 @@ $LANG['pt-BR'] = array( 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', 'Webmail URL' => 'Webmail URL', - 'MySQL Support' => 'MySQL Support', + 'MySQL Support' => 'Suporte MySQL', 'phpMyAdmin URL' => 'phpMyAdmin URL', 'PostgreSQL Support' => 'PostgreSQL Support', 'phpPgAdmin URL' => 'phpPgAdmin URL', - 'Maximum Number Of Databases' => 'Maximum Number Of Databases', - 'Current Number Of Databases' => 'Current Number Of Databases', - 'Local backup' => 'Local backup', - 'Compression level' => 'Compression level', - 'Directory' => 'Directory', - 'Remote backup' => 'Remote backup', + 'Maximum Number Of Databases' => 'Número máximo de bases de dados', + 'Current Number Of Databases' => 'Número atual de bases de dados', + 'Local backup' => 'Backup local', + 'Compression level' => 'Nível de compressão', + 'Directory' => 'Diretório', + 'Remote backup' => 'Backup remoto', 'ftp' => 'FTP', 'sftp' => 'SFTP', 'SFTP Chroot' => 'SFTP Chroot', @@ -582,23 +582,23 @@ $LANG['pt-BR'] = array( 'Name' => 'Nome', - 'File Manager' => 'File Manager', + 'File Manager' => 'Gerenciador de Arquivos', 'size' => 'tamanho', 'date' => 'data', 'name' => 'nome', 'Initializing' => 'Inicializando', 'UPLOAD' => 'ENVIAR', 'NEW FILE' => 'NOVO ARQUIVO', - 'NEW DIR' => 'NOVO DIR', + 'NEW DIR' => 'NOVA PASTA', 'DELETE' => 'DELETAR', 'RENAME' => 'RENOMEAR', - 'MOVE' => 'MOVE', - 'RIGHTS' => 'RIGHTS', + 'MOVE' => 'MOVER', + 'RIGHTS' => 'PERMISSÕES', 'COPY' => 'COPIAR', 'ARCHIVE' => 'ARQUIVAR', 'EXTRACT' => 'EXTAIR', 'DOWNLOAD' => 'BAIXAR', - 'Are you sure?' => 'Are you sure?', // unused? + 'Are you sure?' => 'Você tem certeza?', // unused? 'Hit' => 'Acertar', 'to reload the page' => 'recarregar a página', 'Directory name cannot be empty' => 'Nome do diretório não pode estar vazio', @@ -613,20 +613,20 @@ $LANG['pt-BR'] = array( 'Copy' => 'Copiar', 'Cancel' => 'Cancelar', 'Rename' => 'Renomear', - 'Move' => 'Move', - 'Change Rights' => 'Change Rights', + 'Move' => 'Mover', + 'Change Rights' => 'Modificar Permissões', 'Delete' => 'Deletar', 'Extract' => 'Extrair', 'Create' => 'Criar', 'Compress' => 'Comprimir', 'OK' => 'OK', - 'YOU ARE COPYING' => 'YOU ARE COPYING', // unused? - 'YOU ARE REMOVING' => 'YOU ARE REMOVING', - 'Delete items' => 'Delete items', - 'Copy files' => 'Copy files', - 'Move files' => 'Move files', + 'YOU ARE COPYING' => 'VOCE ESTA COPIANDO', // unused? + 'YOU ARE REMOVING' => 'VOCE ESTA REMOVENDO', + 'Delete items' => 'Deletar itens', + 'Copy files' => 'Copiar arquivos', + 'Move files' => 'Mover arquivos', 'Are you sure you want to copy' => 'Tem certeza que deseja copiar', - 'Are you sure you want to move' => 'Are you sure you want to move', + 'Are you sure you want to move' => 'Tem certeza de que deseja mover', 'Are you sure you want to delete' => 'Tem certeza que deseja deletar', 'into' => 'dentro', 'existing files will be replaced' => 'arquivos existentes serão substituídos', @@ -635,17 +635,17 @@ $LANG['pt-BR'] = array( 'already exists' => 'já existe', 'Create file' => 'Criar arquivo', 'Create directory' => 'Criar diretório', - 'read by owner' => 'read by owner', - 'write by owner' => 'write by owner', - 'execute/search by owner' => 'execute/search by owner', - 'read by group' => 'read by group', - 'write by group' => 'write by group', - 'execute/search by group' => 'execute/search by group', - 'read by others' => 'read by others', - 'write by others' => 'write by others', - 'execute/search by others' => 'execute/search by others', + 'read by owner' => 'lido pelo proprietário', + 'write by owner' => 'escrever pelo proprietário', + 'execute/search by owner' => 'executar/pesquisar pelo proprietário', + 'read by group' => 'lido por grupo', + 'write by group' => 'escrever por grupo', + 'execute/search by group' => 'executar/pesquisar por grupo', + 'read by others' => 'lido por outros', + 'write by others' => 'escrever por outros', + 'execute/search by others' => 'executar/procurar por outros', - 'Shortcuts' => 'Shortcuts', + 'Shortcuts' => 'Atalhos', 'Add New object' => 'Adicionar novo objeto', 'Save Form' => 'Salvar formulário', 'Cancel saving form' => 'Cancelar salvamento do formulário', @@ -660,9 +660,9 @@ $LANG['pt-BR'] = array( 'Display/Close shortcuts' => 'Mostrar/Fechar atalhos', 'Move backward through top menu' => 'Mover para trás através do menu superior', 'Move forward through top menu' => 'Mover para frente através do menu superior', - 'Enter focused element' => 'Enter focused element', - 'Move up through elements list' => 'Move up through elements list', - 'Move down through elements list' => 'Move down through elements list', + 'Enter focused element' => 'Digite elemento focalizado', + 'Move up through elements list' => 'Mover para cima por meio de elementos de lista', + 'Move down through elements list' => 'Mover para baixo por meio de elementos de lista', 'Upload' => 'Enviar', 'New File' => 'Novo Arquivo', @@ -699,35 +699,52 @@ $LANG['pt-BR'] = array( 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Browse, copiar, editar, ver, e recuperar todos os arquivos de seu domínio web usando o completo Gerenciador de Arquivos.', 'This is a commercial module, you would need to purchace license key to enable it.' => 'Éste é um módulo comercial que você poderia comprar uma chave de licença para habilita-lo.', - 'Minutes' => 'Minutes', - 'Hourly' => 'Hourly', - 'Daily' => 'Dayly', - 'Weekly' => 'Weekly', - 'Monthly' => 'Monthly', - 'Run Command' => 'Run Command', - 'every month' => 'every month', - 'every odd month' => 'every odd month', - 'every even month' => 'every even month', - 'every day' => 'every day', - 'every odd day' => 'every odd day', - 'every even day' => 'every even day', - 'weekdays (5 days)' => 'weekdays (5 days)', - 'weekend (2 days)' => 'weekend (2 days)', - 'Monday' => 'Monday', - 'Tuesday' => 'Tuesday', - 'Wednesday' => 'Wednesday', - 'Thursday' => 'Thursday', - 'Friday' => 'Friday', - 'Saturday' => 'Saturday', - 'Sunday' => 'Sunday', - 'every hour' => 'every hour', - 'every two hours' => 'every two hours', - 'every minute' => 'every minute', - 'every two minutes' => 'every two minutes', - 'every' => 'every', - 'Generate' => 'Generate', + 'Minutes' => 'Minutos', + 'Hourly' => 'Hora', + 'Daily' => 'Dia', + 'Weekly' => 'Semana', + 'Monthly' => 'Mês', + 'Run Command' => 'Executar Comando', + 'every month' => 'todo mês', + 'every odd month' => 'todo mês impar', + 'every even month' => 'cada dois meses', + 'every day' => 'todo dia', + 'every odd day' => 'todo dia impar', + 'every even day' => 'cada dois dias', + 'weekdays (5 days)' => 'dias da semana (5 dias)', + 'weekend (2 days)' => 'final de semana (2 dias)', + 'Monday' => 'Segunda-feira', + 'Tuesday' => 'Terça-feira', + 'Wednesday' => 'Quarta-feira', + 'Thursday' => 'Quinta-feira', + 'Friday' => 'Sexta-feira', + 'Saturday' => 'Sabado', + 'Sunday' => 'Domingo', + 'every hour' => 'toda hora', + 'every two hours' => 'cada duas horas', + 'every minute' => 'todo minuto', + 'every two minutes' => 'cada dois minutos', + 'every' => 'cada', + 'Generate' => 'Gerar', 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/pt.php b/web/inc/i18n/pt.php index 68e676dc..7fb02e7d 100644 --- a/web/inc/i18n/pt.php +++ b/web/inc/i18n/pt.php @@ -730,4 +730,21 @@ $LANG['pt'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/ro.php b/web/inc/i18n/ro.php index b9864792..988fec1b 100644 --- a/web/inc/i18n/ro.php +++ b/web/inc/i18n/ro.php @@ -731,4 +731,21 @@ $LANG['ro'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index 6f971e38..e9fdf667 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -731,4 +731,21 @@ $LANG['ru'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/se.php b/web/inc/i18n/se.php index f474dff0..ceaa4d91 100644 --- a/web/inc/i18n/se.php +++ b/web/inc/i18n/se.php @@ -730,4 +730,21 @@ $LANG['se'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php index 8fa0133e..ba2686e5 100644 --- a/web/inc/i18n/tr.php +++ b/web/inc/i18n/tr.php @@ -731,4 +731,21 @@ $LANG['tr'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/tw.php b/web/inc/i18n/tw.php index 1a313c0b..d4652ad3 100644 --- a/web/inc/i18n/tw.php +++ b/web/inc/i18n/tw.php @@ -753,4 +753,21 @@ $LANG['tw'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php index ac3ec409..2f818389 100644 --- a/web/inc/i18n/ua.php +++ b/web/inc/i18n/ua.php @@ -731,4 +731,21 @@ $LANG['ua'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); \ No newline at end of file diff --git a/web/inc/i18n/vi.php b/web/inc/i18n/vi.php index 6d62be25..47363191 100644 --- a/web/inc/i18n/vi.php +++ b/web/inc/i18n/vi.php @@ -729,4 +729,21 @@ $LANG['vi'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL' => 'Use SSL', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', + + 'maximum 16 characters length, including prefix' => 'maximum 16 characters length, including prefix', ); diff --git a/web/inc/main.php b/web/inc/main.php index e0761013..13a093c9 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -345,3 +345,12 @@ function list_timezones() { } return $timezone_list; } + +function is_it_mysql_or_mariadb() { + exec (VESTA_CMD."v-list-sys-services json", $output, $return_var); + $data = json_decode(implode('', $output), true); + unset($output); + $mysqltype='mysql'; + if (isset($data['mariadb'])) $mysqltype='mariadb'; + return $mysqltype; +} diff --git a/web/js/pages/add_mail_acc.js b/web/js/pages/add_mail_acc.js index d96d0158..bf6c7875 100644 --- a/web/js/pages/add_mail_acc.js +++ b/web/js/pages/add_mail_acc.js @@ -93,6 +93,33 @@ randomString = function() { $('#v_password').text(Array(randomstring.length+1).join('*')); } +use_hostname = function(domain) { + $('#td_imap_hostname').html(domain); + $('#td_smtp_hostname').html(domain); +} + +use_starttls = function() { + $('#td_imap_port').html('143'); + $('#td_imap_encryption').html('STARTTLS'); + $('#td_smtp_port').html('587'); + $('#td_smtp_encryption').html('STARTTLS'); +} + +use_ssl = function() { + $('#td_imap_port').html('993'); + $('#td_imap_encryption').html('SSL'); + $('#td_smtp_port').html('465'); + $('#td_smtp_encryption').html('SSL'); +} + +use_no_encryption = function(domain, no_encryption) { + use_hostname(domain); + $('#td_imap_port').html('143'); + $('#td_imap_encryption').html(no_encryption); + $('#td_smtp_port').html('25'); + $('#td_smtp_encryption').html(no_encryption); +} + $(document).ready(function() { $('#v_account').text($('input[name=v_account]').val()); $('#v_password').text($('input[name=v_password]').val()); diff --git a/web/js/pages/edit_mail_acc.js b/web/js/pages/edit_mail_acc.js index 43220c71..3d1399d1 100644 --- a/web/js/pages/edit_mail_acc.js +++ b/web/js/pages/edit_mail_acc.js @@ -86,6 +86,11 @@ randomString = function() { randomstring += chars.substr(rnum, 1); } document.v_edit_mail_acc.v_password.value = randomstring; + + if($('input[name=v_password]').attr('type') == 'text') + $('#v_password').text(randomstring); + else + $('#v_password').text(Array(randomstring.length+1).join('*')); } $(document).ready(function() { diff --git a/web/templates/admin/add_db.html b/web/templates/admin/add_db.html index 63062690..a618bc1b 100644 --- a/web/templates/admin/add_db.html +++ b/web/templates/admin/add_db.html @@ -42,7 +42,7 @@ @@ -58,7 +58,10 @@ diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html index 725780ee..cbb8f091 100644 --- a/web/templates/admin/add_mail_acc.html +++ b/web/templates/admin/add_mail_acc.html @@ -143,15 +143,15 @@ - + - + - + @@ -159,21 +159,29 @@ - + - + - +
- + ".$user."_");?>
- + (".__('maximum 16 characters length, including prefix').")"; + ?>
:
:143143
:
:
:587587
:
:
+
+ + + + + + +
diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html index b3746db5..d37731d7 100644 --- a/web/templates/admin/edit_mail_acc.html +++ b/web/templates/admin/edit_mail_acc.html @@ -137,6 +137,55 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
:william.cage@
:******
:
:143
:
:
:587
:
:
+
+ + diff --git a/web/templates/admin/edit_server.html b/web/templates/admin/edit_server.html index c7fdcbe9..cbed81f5 100644 --- a/web/templates/admin/edit_server.html +++ b/web/templates/admin/edit_server.html @@ -113,7 +113,7 @@ - + / @@ -125,7 +125,7 @@ - + / @@ -137,7 +137,7 @@ - + / @@ -176,7 +176,7 @@ @@ -234,7 +234,7 @@
- + /
@@ -246,7 +246,7 @@ @@ -259,7 +259,7 @@ @@ -298,7 +298,7 @@
- + /
- + /
- + /
@@ -576,6 +576,106 @@ + + + + + + + + + + + +
- + /
+ + + +
+ + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ : + + +
+ : + + +
+ : + + +
+ : + + +
+ : + + +
+ : + + +
+ + + +
+
+
diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html index 1277b3f4..381f61ac 100644 --- a/web/templates/admin/edit_web.html +++ b/web/templates/admin/edit_web.html @@ -235,6 +235,72 @@
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ : + + +
+ : + + +
+ : + + +
+ : + + +
+ : + + +
+ : + + +
+ + + +
+
@@ -351,6 +417,7 @@ + diff --git a/web/templates/user/edit_web.html b/web/templates/user/edit_web.html index b9e14acf..2f13a764 100644 --- a/web/templates/user/edit_web.html +++ b/web/templates/user/edit_web.html @@ -169,6 +169,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ : + + +
+ : + + +
+ : + + +
+ : + + +
+ : + + +
+ : + + +
+ + + +
+ + @@ -280,7 +345,8 @@ -