Skip to content

Commit c248946

Browse files
jnorelljnorell
committed
add web_domain fields for jailkit management
1 parent bd01b0f commit c248946

29 files changed

+310
-25
lines changed

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ALTER TABLE `web_domain` ADD `jailkit_chroot_app_sections` mediumtext NULL DEFAULT NULL;
2+
ALTER TABLE `web_domain` ADD `jailkit_chroot_app_programs` mediumtext NULL DEFAULT NULL;
3+
ALTER TABLE `web_domain` ADD `delete_unused_jailkit` enum('n','y') NOT NULL DEFAULT 'n';
4+
ALTER TABLE `web_domain` ADD `last_jailkit_update` date NULL DEFAULT NULL;

‎install/sql/ispconfig3.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2084,6 +2084,10 @@ CREATE TABLE `web_domain` (
20842084
`log_retention` int(11) NOT NULL DEFAULT '10',
20852085
`proxy_protocol` enum('n','y') NOT NULL default 'n',
20862086
`server_php_id` INT(11) UNSIGNED NOT NULL DEFAULT 0,
2087+
`jailkit_chroot_app_sections` mediumtext NULL DEFAULT NULL,
2088+
`jailkit_chroot_app_programs` mediumtext NULL DEFAULT NULL,
2089+
`delete_unused_jailkit` enum('n','y') NOT NULL default 'n',
2090+
`last_jailkit_update` date NULL DEFAULT NULL,
20872091
PRIMARY KEY (`domain_id`),
20882092
UNIQUE KEY `serverdomain` ( `server_id` , `ip_address`, `domain` )
20892093
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

‎interface/web/sites/form/web_vhost_domain.tform.php‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,37 @@
10411041
'value' => '',
10421042
'width' => '4',
10431043
'maxlength' => '4'
1044-
)
1044+
),
1045+
'jailkit_chroot_app_sections' => array(
1046+
'datatype' => 'TEXT',
1047+
'formtype' => 'TEXT',
1048+
'default' => '',
1049+
'validators' => array( 0 => array ('type' => 'REGEX',
1050+
'regex' => '/^[a-zA-Z0-9\-\_\ ]{1,512}$/',
1051+
'errmsg'=> 'jailkit_chroot_app_sections_error_regex'),
1052+
),
1053+
'value' => '',
1054+
'width' => '40',
1055+
'maxlength' => '1000'
1056+
),
1057+
'jailkit_chroot_app_programs' => array(
1058+
'datatype' => 'TEXT',
1059+
'formtype' => 'TEXT',
1060+
'default' => '',
1061+
'validators' => array( 0 => array('type' => 'REGEX',
1062+
'regex' => '/^[a-zA-Z0-9\.\-\_\/\ ]{1,}$/',
1063+
'errmsg'=> 'jailkit_chroot_app_programs_error_regex'),
1064+
),
1065+
'value' => '',
1066+
'width' => '40',
1067+
'maxlength' => '1000'
1068+
),
1069+
'delete_unused_jailkit' => array (
1070+
'datatype' => 'VARCHAR',
1071+
'formtype' => 'CHECKBOX',
1072+
'default' => 'n',
1073+
'value' => array(0 => 'n', 1 => 'y')
1074+
),
10451075
//#################################
10461076
// END Datatable fields
10471077
//#################################

‎interface/web/sites/lib/lang/ar_web_vhost_domain.lng‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,4 +186,13 @@ $wb['error_ipv4_change_forbidden'] = 'The IP cannot be changed. Please contact y
186186
$wb['error_ipv6_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv6 address.';
187187
$wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Please contact your administrator if you want to change the domain name.';
188188
$wb['error_server_change_not_possible'] = 'The server cannot be changed.';
189-
?>
189+
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
190+
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
191+
$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
192+
$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
193+
$wb['jailkit_chroot_app_sections_error_regex'] = 'Invalid jaikit chroot sections.';
194+
$wb['jailkit_chroot_app_programs_error_regex'] = 'Invalid jaikit chroot app programs.';
195+
$wb['tooltip_jailkit_chroot_app_sections_txt'] = 'When empty, uses Jailkit chroot app sections from Server Config';
196+
$wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroot applications from Server Config';
197+
$wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
198+
$wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';

‎interface/web/sites/lib/lang/bg_web_vhost_domain.lng‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,4 +186,13 @@ $wb['error_ipv4_change_forbidden'] = 'The IP cannot be changed. Please contact y
186186
$wb['error_ipv6_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv6 address.';
187187
$wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Please contact your administrator if you want to change the domain name.';
188188
$wb['error_server_change_not_possible'] = 'The server cannot be changed.';
189-
?>
189+
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
190+
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
191+
$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
192+
$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
193+
$wb['jailkit_chroot_app_sections_error_regex'] = 'Invalid jaikit chroot sections.';
194+
$wb['jailkit_chroot_app_programs_error_regex'] = 'Invalid jaikit chroot app programs.';
195+
$wb['tooltip_jailkit_chroot_app_sections_txt'] = 'When empty, uses Jailkit chroot app sections from Server Config';
196+
$wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroot applications from Server Config';
197+
$wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
198+
$wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';

‎interface/web/sites/lib/lang/br_web_vhost_domain.lng‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,4 +191,13 @@ $wb['error_ipv4_change_forbidden'] = 'The IP cannot be changed. Please contact y
191191
$wb['error_ipv6_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv6 address.';
192192
$wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Please contact your administrator if you want to change the domain name.';
193193
$wb['error_server_change_not_possible'] = 'The server cannot be changed.';
194-
?>
194+
$wb['jailkit_chroot_app_sections_txt'] = 'Seções de aplicações em chroot no jailkit';
195+
$wb['jailkit_chroot_app_programs_txt'] = 'Aplicações em chroot no jailkit';
196+
$wb['jailkit_chroot_app_sections_error_empty'] = 'Seções de aplicações no jailkit está em branco.';
197+
$wb['jailkit_chroot_app_programs_error_empty'] = 'Aplicações no jailkit está em branco.';
198+
$wb['jailkit_chroot_app_sections_error_regex'] = 'As seções de aplicações no jaikit são inválidas.';
199+
$wb['jailkit_chroot_app_programs_error_regex'] = 'As aplicações em chroot no jailkit são inválidas.';
200+
$wb['tooltip_jailkit_chroot_app_sections_txt'] = 'When empty, uses Jailkit chroot app sections from Server Config';
201+
$wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroot applications from Server Config';
202+
$wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
203+
$wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';

‎interface/web/sites/lib/lang/ca_web_vhost_domain.lng‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,4 +186,13 @@ $wb['error_ipv4_change_forbidden'] = 'The IP cannot be changed. Please contact y
186186
$wb['error_ipv6_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv6 address.';
187187
$wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Please contact your administrator if you want to change the domain name.';
188188
$wb['error_server_change_not_possible'] = 'The server cannot be changed.';
189-
?>
189+
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
190+
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
191+
$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
192+
$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
193+
$wb['jailkit_chroot_app_sections_error_regex'] = 'Invalid jaikit chroot sections.';
194+
$wb['jailkit_chroot_app_programs_error_regex'] = 'Invalid jaikit chroot app programs.';
195+
$wb['tooltip_jailkit_chroot_app_sections_txt'] = 'When empty, uses Jailkit chroot app sections from Server Config';
196+
$wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroot applications from Server Config';
197+
$wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
198+
$wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';

‎interface/web/sites/lib/lang/cz_web_vhost_domain.lng‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,4 +186,13 @@ $wb['error_ipv4_change_forbidden'] = 'The IP cannot be changed. Please contact y
186186
$wb['error_ipv6_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv6 address.';
187187
$wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Please contact your administrator if you want to change the domain name.';
188188
$wb['error_server_change_not_possible'] = 'The server cannot be changed.';
189-
?>
189+
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sekce';
190+
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrootované aplikace';
191+
$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
192+
$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
193+
$wb['jailkit_chroot_app_sections_error_regex'] = 'Invalid jaikit chroot sections.';
194+
$wb['jailkit_chroot_app_programs_error_regex'] = 'Invalid jaikit chroot app programs.';
195+
$wb['tooltip_jailkit_chroot_app_sections_txt'] = 'When empty, uses Jailkit chroot app sections from Server Config';
196+
$wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroot applications from Server Config';
197+
$wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
198+
$wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';

‎interface/web/sites/lib/lang/de_web_vhost_domain.lng‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,4 +186,13 @@ $wb['error_ipv4_change_forbidden'] = 'The IP cannot be changed. Please contact y
186186
$wb['error_ipv6_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv6 address.';
187187
$wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Please contact your administrator if you want to change the domain name.';
188188
$wb['error_server_change_not_possible'] = 'The server cannot be changed.';
189-
?>
189+
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit Chroot Anwendungsbereiche';
190+
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit Chrooted Anwendungen';
191+
$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit Chroot Anwendungsbereiche ist leer.';
192+
$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit Chrooted Anwendungen ist leer.';
193+
$wb['jailkit_chroot_app_sections_error_regex'] = 'Invalid jaikit chroot sections.';
194+
$wb['jailkit_chroot_app_programs_error_regex'] = 'Invalid jaikit chroot app programs.';
195+
$wb['tooltip_jailkit_chroot_app_sections_txt'] = 'When empty, uses Jailkit chroot app sections from Server Config';
196+
$wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroot applications from Server Config';
197+
$wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
198+
$wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';

‎interface/web/sites/lib/lang/dk_web_vhost_domain.lng‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,4 +186,13 @@ $wb['error_ipv4_change_forbidden'] = 'The IP cannot be changed. Please contact y
186186
$wb['error_ipv6_change_forbidden'] = 'The IP cannot be changed. Please contact your administrator if you want to change the IPv6 address.';
187187
$wb['error_domain_change_forbidden'] = 'The domain name cannot be changed. Please contact your administrator if you want to change the domain name.';
188188
$wb['error_server_change_not_possible'] = 'The server cannot be changed.';
189-
?>
189+
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sektioner';
190+
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applikationer';
191+
$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sektioner er tomme.';
192+
$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applikationer er tomme.';
193+
$wb['jailkit_chroot_app_sections_error_regex'] = 'Ugyldigt jaikit chroot sections.';
194+
$wb['jailkit_chroot_app_programs_error_regex'] = 'Ugyldigt jaikit chroot app programs.';
195+
$wb['tooltip_jailkit_chroot_app_sections_txt'] = 'When empty, uses Jailkit chroot app sections from Server Config';
196+
$wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroot applications from Server Config';
197+
$wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
198+
$wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';

0 commit comments

Comments
 (0)