Merge branch 'develop' of git.ispconfig.org:ispconfig/ispconfig3 into develop

Author: florian030

install/dist/tpl/gentoo/apache_ispconfig.vhost.master

@@ -12,6 +12,8 @@
 <VirtualHost _default_:{vhost_port}>
   ServerAdmin webmaster@localhost
 
+  Alias /mail /var/www/ispconfig/mail
+  
   <IfModule mod_fcgid.c>
     DocumentRoot /var/www/ispconfig/
     SuexecUserGroup ispconfig ispconfig

install/tpl/apache_ispconfig.vhost.master

@@ -9,6 +9,8 @@ NameVirtualHost *:<tmpl_var name="vhost_port">
 <VirtualHost _default_:<tmpl_var name="vhost_port">>
   ServerAdmin webmaster@localhost
 
+  Alias /mail /var/www/ispconfig/mail
+
   <Directory /var/www/ispconfig/>
     <FilesMatch "\.ph(p3?|tml)$">
       SetHandler None

install/tpl/server.ini.master

@@ -112,6 +112,7 @@ connect_userid_to_webid=n
 connect_userid_to_webid_start=10000
 web_folder_protection=y
 php_ini_check_minutes=1
+overtraffic_disable_web=y
 overquota_notify_admin=y
 overquota_notify_client=y
 overquota_notify_freq=7

install/tpl/system.ini.master

@@ -36,6 +36,7 @@ reseller_can_use_options=n
 web_php_options=no,fast-cgi,mod,php-fpm
 show_aps_menu=n
 client_protection=y
+ssh_authentication=
 
 
 [tools]
@@ -71,4 +72,3 @@ session_timeout=0
 session_allow_endless=0
 min_password_length=8
 min_password_strength=3
-ssh_authentication=

interface/web/admin/form/server_config.tform.php

@@ -1015,6 +1015,12 @@
 			'default' => 'y',
 			'value' => array(0 => 'n', 1 => 'y')
 		),
+		'overtraffic_disable_web' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value' => array(0 => 'n', 1 => 'y')
+		),
 		'overquota_notify_admin' => array(
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',

interface/web/admin/form/system_config.tform.php

@@ -235,6 +235,12 @@
 			'separator' => ',',
 			'value'  => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM', 'hhvm' => 'HHVM')
 		),
+		'ssh_authentication' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'SELECT',
+			'default' => '',
+			'value'  => array('' => 'ssh_authentication_password_key', 'password' => 'ssh_authentication_password', 'key' => 'ssh_authentication_key')
+		)
 		//#################################
 		// END Datatable fields
 		//#################################
@@ -772,12 +778,6 @@
 			'formtype' => 'SELECT',
 			'default' => '',
 			'value'  => array('' => 'None', '1' => 'strength_1', '2' => 'strength_2', '3' => 'strength_3', '4' => 'strength_4', '5' => 'strength_5')
-		),
-		'ssh_authentication' => array(
-			'datatype' => 'VARCHAR',
-			'formtype' => 'SELECT',
-			'default' => '',
-			'value'  => array('' => 'ssh_authentication_password_key', 'password' => 'ssh_authentication_password', 'key' => 'ssh_authentication_key')
 		)
 		//#################################
 		// END Datatable fields

interface/web/admin/lib/lang/ar_server_config.lng

@@ -191,6 +191,7 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit';
 $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 $wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin';
 $wb['overquota_notify_client_txt'] = 'Send quota warnings to client';

interface/web/admin/lib/lang/bg_server_config.lng

@@ -191,6 +191,7 @@ $wb['website_autoalias_txt'] = 'Website auto alias';
 $wb['website_autoalias_note_txt'] = 'Placeholders:';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit';
 $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 $wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin';
 $wb['overquota_notify_client_txt'] = 'Send quota warnings to client';

interface/web/admin/lib/lang/br_server_config.lng

@@ -198,6 +198,7 @@ $wb['enable_ip_wildcard_txt'] = 'Habilitar curingas de IP (*)';
 $wb['web_folder_protection_txt'] = 'Tornar pastas web imutáveis (atributos estendidos)';
 $wb['overtraffic_notify_admin_txt'] = 'Enviar notificação de tráfego excedido para o administrador';
 $wb['overtraffic_notify_client_txt'] = 'Enviar notificação de tráfego excedido para o cliente';
+$wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit';
 $wb['rbl_error_regex'] = 'Por favor, nomes de host válidos para RBLs.';
 $wb['overquota_notify_admin_txt'] = 'Enviar alerta da cota para o administrador';
 $wb['overquota_notify_client_txt'] = 'Enviar alerta da cota para o cliente';

interface/web/admin/lib/lang/ca_server_config.lng

@@ -194,6 +194,7 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit';
 $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
 $wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin';
 $wb['overquota_notify_client_txt'] = 'Send quota warnings to client';