Skip to content

Commit c59b623

Browse files
committed
Release 0.9.8-16
1 parent e49317b commit c59b623

File tree

161 files changed

+521
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+521
-159
lines changed

bin/v-list-sys-services

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ service=$DNS_SYSTEM
170170
if [ ! -z "$service" ] && [ "$service" != 'remote' ]; then
171171
proc_name='named'
172172
get_srv_state $service $proc_name
173-
str="$str\nNAME='$service' SYSTEM='dns server' STATE='$state' CPU='$cpu'"
174-
str="$str MEM='$mem' RTIME='$rtime'"
173+
data="$data\nNAME='$service' SYSTEM='dns server' STATE='$state'"
174+
data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
175175
fi
176176

177177
# Checking MAIL system
@@ -265,8 +265,8 @@ if [ ! -z "$FIREWALL_SYSTEM" ] && [ "$FIREWALL_SYSTEM" != 'remote' ]; then
265265
if [ "$?" -eq 0 ]; then
266266
state="running"
267267
fi
268-
str="$str\nNAME='$FIREWALL_SYSTEM' SYSTEM='firewall'"
269-
str="$str STATE='$state' CPU='0' MEM='0' RTIME='0'"
268+
data="$data\nNAME='$FIREWALL_SYSTEM' SYSTEM='firewall'"
269+
data="$data STATE='$state' CPU='0' MEM='0' RTIME='0'"
270270
fi
271271

272272
# Checking FIREWALL Fail2ban extention

install/debian/7/templates/web/apache2/basedir.stpl

100755100644
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
AllowOverride All
1616
SSLRequireSSL
1717
Options +Includes -Indexes +ExecCGI
18-
php_admin_value open_basedir %docroot%
18+
php_admin_value open_basedir %docroot%:%home%/%user%/tmp
19+
php_admin_value upload_tmp_dir %home%/%user%/tmp
20+
php_admin_value session.save_path %home%/%user%/tmp
21+
php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain%"
1922
</Directory>
2023
<Directory %home%/%user%/web/%domain%/stats>
2124
AllowOverride All

install/debian/7/templates/web/apache2/basedir.tpl

100755100644
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
<Directory %docroot%>
1515
AllowOverride All
1616
Options +Includes -Indexes +ExecCGI
17-
php_admin_value open_basedir %docroot%
17+
php_admin_value open_basedir %docroot%:%home%/%user%/tmp
18+
php_admin_value upload_tmp_dir %home%/%user%/tmp
19+
php_admin_value session.save_path %home%/%user%/tmp
20+
php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain%"
1821
</Directory>
1922
<Directory %home%/%user%/web/%domain%/stats>
2023
AllowOverride All

install/debian/7/templates/web/apache2/default.stpl

100755100644
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
AllowOverride All
1616
SSLRequireSSL
1717
Options +Includes -Indexes +ExecCGI
18+
php_admin_value open_basedir %docroot%:%home%/%user%/tmp
19+
php_admin_value upload_tmp_dir %home%/%user%/tmp
20+
php_admin_value session.save_path %home%/%user%/tmp
1821
</Directory>
1922
<Directory %home%/%user%/web/%domain%/stats>
2023
AllowOverride All

install/debian/7/templates/web/apache2/default.tpl

100755100644
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<Directory %docroot%>
1515
AllowOverride All
1616
Options +Includes -Indexes +ExecCGI
17+
php_admin_value open_basedir %docroot%:%home%/%user%/tmp
18+
php_admin_value upload_tmp_dir %home%/%user%/tmp
19+
php_admin_value session.save_path %home%/%user%/tmp
1720
</Directory>
1821
<Directory %home%/%user%/web/%domain%/stats>
1922
AllowOverride All

install/debian/7/templates/web/apache2/hosting.stpl

100755100644
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
AllowOverride All
1616
SSLRequireSSL
1717
Options +Includes -Indexes +ExecCGI
18-
php_admin_value upload_tmp_dir %home%/%user%/tmp
1918
php_admin_value upload_max_filesize 10M
2019
php_admin_value max_execution_time 20
2120
php_admin_value post_max_size 8M
2221
php_admin_value memory_limit 32M
2322
php_admin_flag mysql.allow_persistent off
2423
php_admin_flag safe_mode off
24+
php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain%"
25+
php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
26+
php_admin_value upload_tmp_dir %home%/%user%/tmp
2527
php_admin_value session.save_path %home%/%user%/tmp
26-
php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%'
2728
</Directory>
2829
<Directory %home%/%user%/web/%domain%/stats>
2930
AllowOverride All
3031
</Directory>
31-
php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
3232
SSLEngine on
3333
SSLVerifyClient none
3434
SSLCertificateFile %ssl_crt%

install/debian/7/templates/web/apache2/hosting.tpl

100755100644
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@
2121
php_admin_value memory_limit 32M
2222
php_admin_flag mysql.allow_persistent off
2323
php_admin_flag safe_mode off
24+
php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain%"
25+
php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
26+
php_admin_value upload_tmp_dir %home%/%user%/tmp
2427
php_admin_value session.save_path %home%/%user%/tmp
25-
php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%'
2628
</Directory>
2729
<Directory %home%/%user%/web/%domain%/stats>
2830
AllowOverride All
2931
</Directory>
30-
php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube
3132
<IfModule mod_ruid2.c>
3233
RMode config
3334
RUidGid %user% %group%

install/debian/7/templates/web/apache2/phpcgi.stpl

100755100644
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
SSLRequireSSL
1616
AllowOverride All
1717
Options +Includes -Indexes +ExecCGI
18+
php_admin_value open_basedir %docroot%:%home%/%user%/tmp
19+
php_admin_value upload_tmp_dir %home%/%user%/tmp
20+
php_admin_value session.save_path %home%/%user%/tmp
1821
Action phpcgi-script /cgi-bin/php
1922
<Files *.php>
2023
SetHandler phpcgi-script

install/debian/7/templates/web/apache2/phpcgi.tpl

100755100644
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<Directory %docroot%>
1515
AllowOverride All
1616
Options +Includes -Indexes +ExecCGI
17+
php_admin_value open_basedir %docroot%:%home%/%user%/tmp
18+
php_admin_value upload_tmp_dir %home%/%user%/tmp
19+
php_admin_value session.save_path %home%/%user%/tmp
1720
Action phpcgi-script /cgi-bin/php
1821
<Files *.php>
1922
SetHandler phpcgi-script

install/debian/7/templates/web/apache2/phpfcgid.stpl

100755100644
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
SSLRequireSSL
1616
AllowOverride All
1717
Options +Includes -Indexes +ExecCGI
18+
php_admin_value open_basedir %docroot%:%home%/%user%/tmp
19+
php_admin_value upload_tmp_dir %home%/%user%/tmp
20+
php_admin_value session.save_path %home%/%user%/tmp
1821
<Files *.php>
1922
SetHandler fcgid-script
2023
</Files>

0 commit comments

Comments
 (0)