Skip to content

Commit 2e23c29

Browse files
author
Marius Burkard
committed
Merge branch '3937-optional-disable-quota' into 'develop'
Make disabling webs on overtraffic optional (#3937) Closes #3937 See merge request ispconfig/ispconfig3!1249
2 parents dc3482a + 137ba9a commit 2e23c29

31 files changed

+68
-4
lines changed

‎install/tpl/server.ini.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ connect_userid_to_webid=n
112112
connect_userid_to_webid_start=10000
113113
web_folder_protection=y
114114
php_ini_check_minutes=1
115+
overtraffic_disable_web=y
115116
overquota_notify_admin=y
116117
overquota_notify_client=y
117118
overquota_notify_freq=7

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,6 +1015,12 @@
10151015
'default' => 'y',
10161016
'value' => array(0 => 'n', 1 => 'y')
10171017
),
1018+
'overtraffic_disable_web' => array(
1019+
'datatype' => 'VARCHAR',
1020+
'formtype' => 'CHECKBOX',
1021+
'default' => 'y',
1022+
'value' => array(0 => 'n', 1 => 'y')
1023+
),
10181024
'overquota_notify_admin' => array(
10191025
'datatype' => 'VARCHAR',
10201026
'formtype' => 'CHECKBOX',

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
191191
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
192192
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
193193
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
194+
$wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit';
194195
$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
195196
$wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin';
196197
$wb['overquota_notify_client_txt'] = 'Send quota warnings to client';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ $wb['website_autoalias_txt'] = 'Website auto alias';
191191
$wb['website_autoalias_note_txt'] = 'Placeholders:';
192192
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
193193
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
194+
$wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit';
194195
$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
195196
$wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin';
196197
$wb['overquota_notify_client_txt'] = 'Send quota warnings to client';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ $wb['enable_ip_wildcard_txt'] = 'Habilitar curingas de IP (*)';
198198
$wb['web_folder_protection_txt'] = 'Tornar pastas web imutáveis (atributos estendidos)';
199199
$wb['overtraffic_notify_admin_txt'] = 'Enviar notificação de tráfego excedido para o administrador';
200200
$wb['overtraffic_notify_client_txt'] = 'Enviar notificação de tráfego excedido para o cliente';
201+
$wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit';
201202
$wb['rbl_error_regex'] = 'Por favor, nomes de host válidos para RBLs.';
202203
$wb['overquota_notify_admin_txt'] = 'Enviar alerta da cota para o administrador';
203204
$wb['overquota_notify_client_txt'] = 'Enviar alerta da cota para o cliente';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
194194
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
195195
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
196196
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
197+
$wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit';
197198
$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
198199
$wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin';
199200
$wb['overquota_notify_client_txt'] = 'Send quota warnings to client';

‎interface/web/admin/lib/lang/cz_server_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ $wb['enable_ip_wildcard_txt'] = 'Aktivovat IP wildcard (*)';
177177
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
178178
$wb['overtraffic_notify_admin_txt'] = 'Při překročení limitu přenesených dat, poslat oznámení adminovi';
179179
$wb['overtraffic_notify_client_txt'] = 'Při překročení limitu přenesených dat, poslat oznámení klientovi';
180+
$wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit';
180181
$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
181182
$wb['overquota_notify_admin_txt'] = 'Poslat varování o překročení nebo vyčerpání kvót adminovi';
182183
$wb['overquota_notify_client_txt'] = 'Poslat varování o překročení nebo vyčerpání kvót klientovi';

‎interface/web/admin/lib/lang/de_server_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ $wb['enable_ip_wildcard_txt'] = 'IP Adressen Wildcard (*) aktivieren';
197197
$wb['web_folder_protection_txt'] = 'Webverzeichnis unveränderlich machen (erweiterte Attribute)';
198198
$wb['overtraffic_notify_admin_txt'] = 'Überschreiten des Datentransfer Limits an den Administrator senden';
199199
$wb['overtraffic_notify_client_txt'] = 'Überschreiten des Datentransfer Limits an den Kunden senden';
200+
$wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit';
200201
$wb['rbl_error_regex'] = 'Bitte geben Sie gültige RBL-Hostnamen an.';
201202
$wb['overquota_notify_admin_txt'] = 'Quota-Warnungen an den Administrator senden';
202203
$wb['overquota_notify_client_txt'] = 'Quota-Warnungen an den Kunden senden';

‎interface/web/admin/lib/lang/dk_server_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
180180
$wb['web_folder_protection_txt'] = 'Gør web mapper immume (udvidede attributter)';
181181
$wb['overtraffic_notify_admin_txt'] = 'Send over-trafik meddelelse til admin';
182182
$wb['overtraffic_notify_client_txt'] = 'Send over-trafik meddelelse til kunde';
183+
$wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit';
183184
$wb['rbl_error_regex'] = 'Angiv gyldige RBL værtsnavne.';
184185
$wb['overquota_notify_admin_txt'] = 'Send kvote advarsler til admin';
185186
$wb['overquota_notify_client_txt'] = 'Send kvote advarsler til kunde';

‎interface/web/admin/lib/lang/el_server_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
191191
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
192192
$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
193193
$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
194+
$wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit';
194195
$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
195196
$wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin';
196197
$wb['overquota_notify_client_txt'] = 'Send quota warnings to client';

0 commit comments

Comments
 (0)