Skip to content

Commit 40d783f

Browse files
author
Marius Burkard
committed
Merge branch 'configurable-httpd-init-script' into 'stable-3.1'
Configurable httpd init script See merge request ispconfig/ispconfig3!926
2 parents 08bcffa + 2155708 commit 40d783f

33 files changed

+110
-6
lines changed

‎install/tpl/server.ini.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ website_symlinks_rel=n
7272
network_filesystem=n
7373
vhost_conf_dir=/etc/apache2/sites-available
7474
vhost_conf_enabled_dir=/etc/apache2/sites-enabled
75+
apache_init_script=
7576
nginx_vhost_conf_dir=/etc/nginx/sites-available
7677
nginx_vhost_conf_enabled_dir=/etc/nginx/sites-enabled
7778
security_level=20

‎install/update.php‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,14 @@
567567
if($conf['mailman']['installed'] == true && $conf['mailman']['init_script'] != '') system('nohup '.$inst->getinitcommand($conf['mailman']['init_script'], 'restart').' >/dev/null 2>&1 &');
568568
}
569569
if($conf['services']['web'] || $inst->install_ispconfig_interface) {
570-
if($conf['webserver']['server_type'] == 'apache' && $conf['apache']['init_script'] != '') system($inst->getinitcommand($conf['apache']['init_script'], 'restart'));
570+
if($conf['webserver']['server_type'] == 'apache') {
571+
// If user has configured a custom Apache init script, use that. Otherwise use the default auto-detected init script
572+
if(!empty($conf['server_config']['web']['apache_init_script'])) {
573+
system($inst->getinitcommand($conf['server_config']['web']['apache_init_script'], 'restart'));
574+
} elseif(!empty($conf['apache']['init_script'])) {
575+
system($inst->getinitcommand($conf['apache']['init_script'], 'restart'));
576+
}
577+
}
571578
//* Reload is enough for nginx
572579
if($conf['webserver']['server_type'] == 'nginx'){
573580
if($conf['nginx']['php_fpm_init_script'] != '') system($inst->getinitcommand($conf['nginx']['php_fpm_init_script'], 'reload'));

‎interface/lib/classes/IDS/Config/Config.ini.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
; exceptions[] = POST.website_symlinks
4848
; exceptions[] = POST.vhost_conf_dir
4949
; exceptions[] = POST.vhost_conf_enabled_dir
50+
; exceptions[] = POST.apache_init_script
5051
; exceptions[] = POST.nginx_vhost_conf_dir
5152
; exceptions[] = POST.nginx_vhost_conf_enabled_dir
5253
; exceptions[] = POST.php_open_basedir

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -848,6 +848,18 @@
848848
'width' => '40',
849849
'maxlength' => '255'
850850
),
851+
'apache_init_script' => array(
852+
'datatype' => 'VARCHAR',
853+
'formtype' => 'TEXT',
854+
'default' => '',
855+
'validators' => array( 0 => array('type' => 'REGEX',
856+
'regex' => '/^(|[a-zA-Z0-9\.\-\_]{1,128})$/',
857+
'errmsg' => 'apache_init_script_error_regex'),
858+
),
859+
'value' => '',
860+
'width' => '40',
861+
'maxlength' => '255'
862+
),
851863
'nginx_enable_pagespeed' => array (
852864
'datatype' => 'VARCHAR',
853865
'formtype' => 'CHECKBOX',

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ $wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
99
$wb['website_basedir_txt'] = 'Website basedir';
1010
$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
1111
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
12+
$wb['apache_init_script_txt'] = 'Apache init script';
13+
$wb['apache_init_script_note_txt'] = 'Leaving this empty will auto-detect the Apache init script';
14+
$wb['apache_init_script_error_regex'] = 'Invalid apache init script.';
1215
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
1316
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
1417
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ $wb['website_symlinks_txt'] = 'Website symlinks';
77
$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
88
$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
99
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
10+
$wb['apache_init_script_txt'] = 'Apache init скрипт';
11+
$wb['apache_init_script_note_txt'] = 'Оставянето на това празно ще открие автоматично скрипта за Apache init';
12+
$wb['apache_init_script_error_regex'] = 'Невалиден Apache скрипт за задействане.';
1013
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
1114
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
1215
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ $wb['website_autoalias_txt'] = 'Auto alias - site';
1919
$wb['website_autoalias_note_txt'] = 'Área reservada:';
2020
$wb['vhost_conf_dir_txt'] = 'Diretório de configuração vhost';
2121
$wb['vhost_conf_enabled_dir_txt'] = 'Diretório de configuração vhost habilitado';
22+
$wb['apache_init_script_txt'] = 'Script de inicialização do Apache';
23+
$wb['apache_init_script_note_txt'] = 'Deixando esta vontade vazio detectar automaticamente o script de inicialização do Apache';
24+
$wb["apache_init_script_error_regex"] = 'Script de inicialização do Apache inválido.';
2225
$wb['getmail_config_dir_txt'] = 'Diretório de configuração do getmail';
2326
$wb['fastcgi_starter_path_txt'] = 'Caminho de inicialização do FastCGI';
2427
$wb['fastcgi_starter_script_txt'] = 'Script de inicialização do FastCGI';

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ $wb['website_autoalias_txt'] = 'Website auto alias';
1919
$wb['website_autoalias_note_txt'] = 'Placeholders:';
2020
$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
2121
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
22+
$wb['apache_init_script_txt'] = 'Apache init script';
23+
$wb['apache_init_script_note_txt'] = 'Leaving this empty will auto-detect the Apache init script';
24+
$wb['apache_init_script_error_regex'] = 'Invalid Apache init script.';
2225
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
2326
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
2427
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ $wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
99
$wb['website_basedir_txt'] = 'Website config adresář';
1010
$wb['vhost_conf_dir_txt'] = 'Vhost config adresář';
1111
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled adresář';
12+
$wb['apache_init_script_txt'] = 'Inicializační skript Apache';
13+
$wb['apache_init_script_note_txt'] = 'Ponecháte-li toto prázdné, automaticky detekuje iniciační skript Apache';
14+
$wb['apache_init_script_error_regex'] = 'Neplatný iniciační skript Apache.';
1215
$wb['getmail_config_dir_txt'] = 'Getmail složka pro konfigurace';
1316
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter cesta';
1417
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter skript';

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ $wb['website_symlinks_txt'] = 'Webseiten Symlinks';
88
$wb['website_symlinks_rel_txt'] = 'Erstelle relative Symlinks';
99
$wb['vhost_conf_dir_txt'] = 'vHost Konfigurationsverzeichnis';
1010
$wb['vhost_conf_enabled_dir_txt'] = 'vHost config enabled dir';
11+
$wb['apache_init_script_txt'] = 'Apache-Init-Skript';
12+
$wb['apache_init_script_note_txt'] = 'Wenn Sie dieses Feld leer lassen, wird das Apache-Init-Skript automatisch erkannt';
13+
$wb['apache_init_script_error_regex'] = 'Ungültiges Apache-Init-Skript.';
1114
$wb['getmail_config_dir_txt'] = 'Getmail Konfigurationsverzeichnis';
1215
$wb['fastcgi_starter_path_txt'] = 'FastCGI Starter Pfad';
1316
$wb['fastcgi_starter_script_txt'] = 'FastCGI Starter Script';

0 commit comments

Comments
 (0)