diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index 36f157d8e6ef80a5e4029b2c9ac6963e35bc3d60..3786fc2ca35544961c3cdafd25653972e9bbfc1f 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -72,6 +72,7 @@ website_symlinks_rel=n
network_filesystem=n
vhost_conf_dir=/etc/apache2/sites-available
vhost_conf_enabled_dir=/etc/apache2/sites-enabled
+apache_init_script=
nginx_vhost_conf_dir=/etc/nginx/sites-available
nginx_vhost_conf_enabled_dir=/etc/nginx/sites-enabled
security_level=20
diff --git a/install/update.php b/install/update.php
index 11570aa666ece7bd14c272c521f6c29af2c27536..3b3cf969ef3cefa8e8ad76c6eed31a0da75969e0 100644
--- a/install/update.php
+++ b/install/update.php
@@ -567,7 +567,14 @@ if($reconfigure_services_answer == 'yes') {
if($conf['mailman']['installed'] == true && $conf['mailman']['init_script'] != '') system('nohup '.$inst->getinitcommand($conf['mailman']['init_script'], 'restart').' >/dev/null 2>&1 &');
}
if($conf['services']['web'] || $inst->install_ispconfig_interface) {
- if($conf['webserver']['server_type'] == 'apache' && $conf['apache']['init_script'] != '') system($inst->getinitcommand($conf['apache']['init_script'], 'restart'));
+ if($conf['webserver']['server_type'] == 'apache') {
+ // If user has configured a custom Apache init script, use that. Otherwise use the default auto-detected init script
+ if(!empty($conf['server_config']['web']['apache_init_script'])) {
+ system($inst->getinitcommand($conf['server_config']['web']['apache_init_script'], 'restart'));
+ } elseif(!empty($conf['apache']['init_script'])) {
+ system($inst->getinitcommand($conf['apache']['init_script'], 'restart'));
+ }
+ }
//* Reload is enough for nginx
if($conf['webserver']['server_type'] == 'nginx'){
if($conf['nginx']['php_fpm_init_script'] != '') system($inst->getinitcommand($conf['nginx']['php_fpm_init_script'], 'reload'));
diff --git a/interface/lib/classes/IDS/Config/Config.ini.php b/interface/lib/classes/IDS/Config/Config.ini.php
index 080055298d78b6b12fa22c67a9d8a7910d4c1281..19af5d59bdd5331767abfd8f28fb46954bef08d2 100644
--- a/interface/lib/classes/IDS/Config/Config.ini.php
+++ b/interface/lib/classes/IDS/Config/Config.ini.php
@@ -47,6 +47,7 @@
; exceptions[] = POST.website_symlinks
; exceptions[] = POST.vhost_conf_dir
; exceptions[] = POST.vhost_conf_enabled_dir
+ ; exceptions[] = POST.apache_init_script
; exceptions[] = POST.nginx_vhost_conf_dir
; exceptions[] = POST.nginx_vhost_conf_enabled_dir
; exceptions[] = POST.php_open_basedir
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 2663cdd0e0ee38dab40e37ede0a4b5ff96c86869..c6022e6bc2f12c3a9f2f5ed4c171517a4e6b9144 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -848,6 +848,18 @@ $form["tabs"]['web'] = array(
'width' => '40',
'maxlength' => '255'
),
+ 'apache_init_script' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'validators' => array( 0 => array('type' => 'REGEX',
+ 'regex' => '/^(|[a-zA-Z0-9\.\-\_]{1,128})$/',
+ 'errmsg' => 'apache_init_script_error_regex'),
+ ),
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
'nginx_enable_pagespeed' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng
index bccdcc42c05cd94a624c6e6e04ad1aff5f93811a..f271e007d3bc0f89164450e82ae3de3a2c946a12 100644
--- a/interface/web/admin/lib/lang/ar_server_config.lng
+++ b/interface/web/admin/lib/lang/ar_server_config.lng
@@ -9,6 +9,9 @@ $wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
$wb['website_basedir_txt'] = 'Website basedir';
$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['apache_init_script_txt'] = 'Apache init script';
+$wb['apache_init_script_note_txt'] = 'Leaving this empty will auto-detect the Apache init script';
+$wb['apache_init_script_error_regex'] = 'Invalid apache init script.';
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng
index 39531461c3cfcaceff6bc6f57570584e434bfb0e..46c77fe794dc79767d0abbe5a745573134ea6598 100644
--- a/interface/web/admin/lib/lang/bg_server_config.lng
+++ b/interface/web/admin/lib/lang/bg_server_config.lng
@@ -7,6 +7,9 @@ $wb['website_symlinks_txt'] = 'Website symlinks';
$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['apache_init_script_txt'] = 'Apache init скрипт';
+$wb['apache_init_script_note_txt'] = 'Оставянето на това празно ще открие автоматично скрипта за Apache init';
+$wb['apache_init_script_error_regex'] = 'Невалиден Apache скрипт за задействане.';
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng
index f57a2310f23c0ceddc43495d9750377163affa7d..c12a1a7dad6ea7dfd973cfba771f85d59f840077 100644
--- a/interface/web/admin/lib/lang/br_server_config.lng
+++ b/interface/web/admin/lib/lang/br_server_config.lng
@@ -19,6 +19,9 @@ $wb['website_autoalias_txt'] = 'Auto alias - site';
$wb['website_autoalias_note_txt'] = 'Área reservada:';
$wb['vhost_conf_dir_txt'] = 'Diretório de configuração vhost';
$wb['vhost_conf_enabled_dir_txt'] = 'Diretório de configuração vhost habilitado';
+$wb['apache_init_script_txt'] = 'Script de inicialização do Apache';
+$wb['apache_init_script_note_txt'] = 'Deixando esta vontade vazio detectar automaticamente o script de inicialização do Apache';
+$wb["apache_init_script_error_regex"] = 'Script de inicialização do Apache inválido.';
$wb['getmail_config_dir_txt'] = 'Diretório de configuração do getmail';
$wb['fastcgi_starter_path_txt'] = 'Caminho de inicialização do FastCGI';
$wb['fastcgi_starter_script_txt'] = 'Script de inicialização do FastCGI';
diff --git a/interface/web/admin/lib/lang/ca_server_config.lng b/interface/web/admin/lib/lang/ca_server_config.lng
index 14f0b91d3b897404ac226906c8bb9a17529a845b..1dac17eda53b539352fc83bfbfc612fa72ef57fe 100644
--- a/interface/web/admin/lib/lang/ca_server_config.lng
+++ b/interface/web/admin/lib/lang/ca_server_config.lng
@@ -19,6 +19,9 @@ $wb['website_autoalias_txt'] = 'Website auto alias';
$wb['website_autoalias_note_txt'] = 'Placeholders:';
$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['apache_init_script_txt'] = 'Apache init script';
+$wb['apache_init_script_note_txt'] = 'Leaving this empty will auto-detect the Apache init script';
+$wb['apache_init_script_error_regex'] = 'Invalid Apache init script.';
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng
index a97d78b8eb358977b7bc1c4d6dc1c20a330d513d..2b42cf6691e1dd68e8205cac0a301cd8bef0c280 100644
--- a/interface/web/admin/lib/lang/cz_server_config.lng
+++ b/interface/web/admin/lib/lang/cz_server_config.lng
@@ -9,6 +9,9 @@ $wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
$wb['website_basedir_txt'] = 'Website config adresář';
$wb['vhost_conf_dir_txt'] = 'Vhost config adresář';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled adresář';
+$wb['apache_init_script_txt'] = 'Inicializační skript Apache';
+$wb['apache_init_script_note_txt'] = 'Ponecháte-li toto prázdné, automaticky detekuje iniciační skript Apache';
+$wb['apache_init_script_error_regex'] = 'Neplatný iniciační skript Apache.';
$wb['getmail_config_dir_txt'] = 'Getmail složka pro konfigurace';
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter cesta';
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter skript';
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 960381e7c12f9b94347f66d665170145b69eab17..9e0ce6f48fd8ceb3caf7d627e42cd24516d98959 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -8,6 +8,9 @@ $wb['website_symlinks_txt'] = 'Webseiten Symlinks';
$wb['website_symlinks_rel_txt'] = 'Erstelle relative Symlinks';
$wb['vhost_conf_dir_txt'] = 'vHost Konfigurationsverzeichnis';
$wb['vhost_conf_enabled_dir_txt'] = 'vHost config enabled dir';
+$wb['apache_init_script_txt'] = 'Apache-Init-Skript';
+$wb['apache_init_script_note_txt'] = 'Wenn Sie dieses Feld leer lassen, wird das Apache-Init-Skript automatisch erkannt';
+$wb['apache_init_script_error_regex'] = 'Ungültiges Apache-Init-Skript.';
$wb['getmail_config_dir_txt'] = 'Getmail Konfigurationsverzeichnis';
$wb['fastcgi_starter_path_txt'] = 'FastCGI Starter Pfad';
$wb['fastcgi_starter_script_txt'] = 'FastCGI Starter Script';
diff --git a/interface/web/admin/lib/lang/dk_server_config.lng b/interface/web/admin/lib/lang/dk_server_config.lng
index 73e7ef1bfda82d68b86d5f03fd5f364535a9f681..e6d5eaa289f46696b77bef89e613c7889e503521 100644
--- a/interface/web/admin/lib/lang/dk_server_config.lng
+++ b/interface/web/admin/lib/lang/dk_server_config.lng
@@ -19,6 +19,9 @@ $wb['website_autoalias_txt'] = 'Webside auto alias';
$wb['website_autoalias_note_txt'] = 'Pladsholdere:';
$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['apache_init_script_txt'] = 'Apache init script';
+$wb['apache_init_script_note_txt'] = 'Forlader denne tomme vilje automatisk registrering Apache init-script';
+$wb['apache_init_script_error_regex'] = 'Ugyldigt Apache init-script.';
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
index 84992261bb47fbbed509e6741f9190365aa751cc..394ba2bde91296dc3706f0b9b6e741f8df7d01a2 100644
--- a/interface/web/admin/lib/lang/el_server_config.lng
+++ b/interface/web/admin/lib/lang/el_server_config.lng
@@ -9,6 +9,9 @@ $wb['website_symlinks_rel_txt'] = 'Δημιουργία σχετικών symlink
$wb['website_basedir_txt'] = 'Βασικός φάκελος Website';
$wb['vhost_conf_dir_txt'] = 'Φάκελος ρυθμίσεων Vhost';
$wb['vhost_conf_enabled_dir_txt'] = 'Φάκελος ρυθμίσεων (ενεργών) Vhost';
+$wb['apache_init_script_txt'] = 'Apache script init';
+$wb['apache_init_script_note_txt'] = 'Εάν αφήσετε αυτό το κενό, θα ανιχνευθεί αυτόματα το σενάριο εισαγωγής Apache';
+$wb['apache_init_script_error_regex'] = 'Μη έγκυρη δέσμη ενεργειών Apache.';
$wb['getmail_config_dir_txt'] = 'Φάκελος ρυθμίσεων Getmail';
$wb['fastcgi_starter_path_txt'] = 'Διαδρομή εκκίνησης FastCGI';
$wb['fastcgi_starter_script_txt'] = 'Script εκκίνησης FastCGI';
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index 0ba3638a0a06de1f9cd3e914f8a1c44ec569a2ae..1d2bf74ec9c67ff9cfaa89fe629ca310ee53bbb8 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -19,6 +19,9 @@ $wb["website_autoalias_txt"] = 'Website auto alias';
$wb["website_autoalias_note_txt"] = 'Placeholders:';
$wb["vhost_conf_dir_txt"] = 'Vhost config dir';
$wb["vhost_conf_enabled_dir_txt"] = 'Vhost config enabled dir';
+$wb["apache_init_script_txt"] = 'Apache init script';
+$wb["apache_init_script_note_txt"] = 'Leaving this empty will auto-detect the Apache init script';
+$wb["apache_init_script_error_regex"] = 'Invalid Apache init script.';
$wb["getmail_config_dir_txt"] = 'Getmail config dir';
$wb["fastcgi_starter_path_txt"] = 'FastCGI starter path';
$wb["fastcgi_starter_script_txt"] = 'FastCGI starter script';
diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng
index 01350367ae29fb45e74cd7702447a6d0d5e41952..08c80ec80edc9e770381ebc60ce90e8a63f14358 100755
--- a/interface/web/admin/lib/lang/es_server_config.lng
+++ b/interface/web/admin/lib/lang/es_server_config.lng
@@ -2,6 +2,9 @@
$wb['add_web_users_to_sshusers_group_txt'] = 'Añadir usuarios web al grupo -sshusers-';
$wb['admin_notify_events_txt'] = 'Enviar correo al administrador a partir de siguiente nivel';
$wb['apache_group_error_empty'] = 'El grupo de Apache está vacío.';
+$wb['apache_init_script_note_txt'] = 'Dejar esto vacío detectará automáticamente el script de inicio de Apache';
+$wb['apache_init_script_txt'] = 'Apache init script';
+$wb['apache_init_script_error_regex'] = 'Guión de inicio Apache no válido.';
$wb['apache_user_error_empty'] = 'El usuario de Apache está vacío.';
$wb['apps_vhost_enabled_txt'] = 'Host virtual de aplicaciones habilitado';
$wb['apps_vhost_ip_error_empty'] = 'La IP para el host virtual de las aplicaciones está vacía.';
diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index 6caf643abe3a6a4f6df4f379a1eafae81607bdcb..b81f77ac084aaa195f61d5b2bd21d6e115f93515 100755
--- a/interface/web/admin/lib/lang/fi_server_config.lng
+++ b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -7,6 +7,9 @@ $wb['website_symlinks_txt'] = 'Verkkotunnuksen symmetriset linkit';
$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
$wb['vhost_conf_dir_txt'] = 'Virtuaalipalvelimen asetuskansio';
$wb['vhost_conf_enabled_dir_txt'] = 'Virtuaalipalvelimen käyttöönottokansio';
+$wb['apache_init_script_txt'] = 'Apache-aloituskomentosarja';
+$wb['apache_init_script_note_txt'] = 'Jätä tämä tyhjä tunnistaa Apache-aloitusohjelman automaattisesti';
+$wb['apache_init_script_error_regex'] = 'Virheellinen Apache-aloituskomentosarja.';
$wb['getmail_config_dir_txt'] = 'Getmail-asetuskansio';
$wb['fastcgi_starter_path_txt'] = 'FastCGI:n käynnistyspolku';
$wb['fastcgi_starter_script_txt'] = 'FastCGI:n käynnistysskripti';
diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng
index 25f737568867a8d8f1ddbd68c550af1c613dc673..705c376a290c5f83a0b6c426c87a0e88df32640f 100644
--- a/interface/web/admin/lib/lang/fr_server_config.lng
+++ b/interface/web/admin/lib/lang/fr_server_config.lng
@@ -7,6 +7,9 @@ $wb['website_symlinks_txt'] = 'Liens symboliques du site web';
$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
$wb['vhost_conf_dir_txt'] = 'Répertoire de configuration des VHosts';
$wb['vhost_conf_enabled_dir_txt'] = 'Répertoire de configuration des VHosts actifs';
+$wb['apache_init_script_txt'] = 'Script d\'initiation Apache';
+$wb['apache_init_script_note_txt'] = 'Si vous laissez ce champ vide, le script init Apache sera automatiquement détecté.';
+$wb['apache_init_script_error_regex'] = 'Script d\'initialisation Apache non valide.';
$wb['getmail_config_dir_txt'] = 'Répertoire de configuration de Getmail';
$wb['fastcgi_starter_path_txt'] = 'Chemin du lanceur de FastCGI';
$wb['fastcgi_starter_script_txt'] = 'Script lanceur de FastCGI';
diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng
index faf08f4201b64d73d4f1ce505f33eca865664dcf..609d9ab889d2b20f614d11b9bc0049775a521dc9 100644
--- a/interface/web/admin/lib/lang/hr_server_config.lng
+++ b/interface/web/admin/lib/lang/hr_server_config.lng
@@ -8,6 +8,9 @@ $wb['website_symlinks_txt'] = 'Symlinkovi Web stranice';
$wb['website_basedir_txt'] = 'Bazni direktorij Web stranice';
$wb['vhost_conf_dir_txt'] = 'Vhost konfiguracijski direktorij';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost dozvoljeni konfiguracijski direktorij';
+$wb['apache_init_script_txt'] = 'Apache init skripta';
+$wb['apache_init_script_note_txt'] = 'Ostavite ovo prazno automatski će otkriti skriptu Apache init';
+$wb['apache_init_script_error_regex'] = 'Nevažeća skripta Apache init.';
$wb['getmail_config_dir_txt'] = 'Getmail konfiguracijski direktorij';
$wb['fastcgi_starter_path_txt'] = 'Put do FastCGI-a';
$wb['fastcgi_starter_script_txt'] = 'FastCGI početna skripta';
diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng
index 6347afb7da1107e5f21ebd3144be196d7b5b43f3..0bd058a5bc160ecca27472cd6e265418031effd6 100644
--- a/interface/web/admin/lib/lang/hu_server_config.lng
+++ b/interface/web/admin/lib/lang/hu_server_config.lng
@@ -7,6 +7,9 @@ $wb['website_symlinks_txt'] = 'Website symlinks';
$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['apache_init_script_txt'] = 'Apache init parancsfájl';
+$wb['apache_init_script_note_txt'] = 'Ha üresen hagyja, az automatikusan felismeri az Apache init parancsfájlját';
+$wb['apache_init_script_error_regex'] = 'Érvénytelen Apache init parancsfájl.';
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng
index 9a28dff300ade469f23a57d44590428ba6fc8ef2..e4c1e47ce59eadd0b81de1e8e23da00118f093d4 100644
--- a/interface/web/admin/lib/lang/id_server_config.lng
+++ b/interface/web/admin/lib/lang/id_server_config.lng
@@ -9,6 +9,9 @@ $wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
$wb['website_basedir_txt'] = 'Basedir Situs web';
$wb['vhost_conf_dir_txt'] = 'Direktori konfigurasi vhost';
$wb['vhost_conf_enabled_dir_txt'] = 'Direktori konfigurasi vhost yang aktif';
+$wb['apache_init_script_txt'] = 'Skrip init Apache';
+$wb['apache_init_script_note_txt'] = 'Membiarkan ini kosong akan secara otomatis mendeteksi skrip init Apache';
+$wb['apache_init_script_error_regex'] = 'Skrip init Apache tidak valid.';
$wb['getmail_config_dir_txt'] = 'Direktori konfigurasi getmail';
$wb['fastcgi_starter_path_txt'] = 'Path pemicu FastCGI';
$wb['fastcgi_starter_script_txt'] = 'Skrip pemicu FastCGI';
diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng
index 3dc37a3c1d4664076f251417a922c7b0e2879df0..2d7d9e9ddb6513aec59e84737f35003de876940f 100644
--- a/interface/web/admin/lib/lang/it_server_config.lng
+++ b/interface/web/admin/lib/lang/it_server_config.lng
@@ -6,6 +6,9 @@ $wb['website_path_txt'] = 'Percorso Sito Web';
$wb['website_symlinks_txt'] = 'Sito Web symlinks';
$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config dir abilitata';
+$wb['apache_init_script_txt'] = 'Apache init script';
+$wb['apache_init_script_note_txt'] = 'Lasciare questo vuoto rileverà automaticamente lo script init di Apache';
+$wb['apache_init_script_error_regex'] = 'Script init Apache non valido.';
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
$wb['fastcgi_starter_path_txt'] = 'Percorso FastCGI starter';
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng
index 72bef72c4b5feb545cad3dcabd18701eaa1290a3..4d1d36250217ee547f6f8ca5224aa030adcd7716 100644
--- a/interface/web/admin/lib/lang/ja_server_config.lng
+++ b/interface/web/admin/lib/lang/ja_server_config.lng
@@ -9,6 +9,9 @@ $wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
$wb['website_basedir_txt'] = 'ウェブサイトのベースディレクトリ';
$wb['vhost_conf_dir_txt'] = 'バーチャルホスト設定ディレクトリ';
$wb['vhost_conf_enabled_dir_txt'] = 'バーチャルホスト設定ディレクトリ（有効）';
+$wb['apache_init_script_txt'] = 'Apache initスクリプト';
+$wb['apache_init_script_note_txt'] = 'これを空のままにすると、Apache initスクリプトが自動検出されます';
+$wb['apache_init_script_error_regex'] = '無効なApache initスクリプト。';
$wb['getmail_config_dir_txt'] = 'Getmail 設定ディレクトリ';
$wb['fastcgi_starter_path_txt'] = 'FastCGIスターターのパス';
$wb['fastcgi_starter_script_txt'] = 'FastCGIスタータースクリプト';
diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng
index 2884f304ec448dc52523bf935c1cce3c08f84e43..542add696bbcd4f2397a1e51ad65750b0055bd93 100644
--- a/interface/web/admin/lib/lang/nl_server_config.lng
+++ b/interface/web/admin/lib/lang/nl_server_config.lng
@@ -9,6 +9,9 @@ $wb['website_symlinks_rel_txt'] = 'Maak relative symlinks';
$wb['website_basedir_txt'] = 'Website basedir';
$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['apache_init_script_txt'] = 'Apache init script';
+$wb['apache_init_script_note_txt'] = 'Als u dit leeg laat, wordt het Apache init-script automatisch gedetecteerd';
+$wb['apache_init_script_error_regex'] = 'Ongeldig Apache init-script.';
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter pad';
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng
index 29cb94e96c2ca30e8464c0edd4e9efaa4cf4336b..61509f30cf3b9671b0c9220816f3fce9db3e0cc5 100644
--- a/interface/web/admin/lib/lang/pl_server_config.lng
+++ b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -9,6 +9,9 @@ $wb['website_symlinks_rel_txt'] = 'Twórz linki relatywne';
$wb['website_basedir_txt'] = 'Ścieżka bazowa strony WWW';
$wb['vhost_conf_dir_txt'] = 'Ścieżka do konfiguracyji wirtualnego serwera';
$wb['vhost_conf_enabled_dir_txt'] = 'Ścieżka do aktywnej konfiguracyji Vhost';
+$wb['apache_init_script_txt'] = 'Skrypt inicjujący Apache';
+$wb['apache_init_script_note_txt'] = 'Pozostawienie tego pustego spowoduje automatyczne wykrycie skryptu inicjującego Apache';
+$wb['apache_init_script_error_regex'] = 'Niepoprawny skrypt inicjujący Apache.';
$wb['getmail_config_dir_txt'] = 'Ścieżka do konfiguracyji Getmail';
$wb['fastcgi_starter_path_txt'] = 'Adres startowy FastCGI';
$wb['fastcgi_starter_script_txt'] = 'Startowy skrypt FastCGI';
diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng
index 3703c759ed1c28348fed478677debf813ae82800..98bf41a283e4bdab1d68b52cf29b246ae5f21df2 100644
--- a/interface/web/admin/lib/lang/pt_server_config.lng
+++ b/interface/web/admin/lib/lang/pt_server_config.lng
@@ -8,6 +8,9 @@ $wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
$wb['website_basedir_txt'] = 'Website basedir: pasta base ';
$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost pasta de configuração activo';
+$wb['apache_init_script_txt'] = 'Script de inicialização do Apache';
+$wb['apache_init_script_note_txt'] = 'Deixando esta vontade vazio detectar automaticamente o script de inicialização do Apache';
+$wb['apache_init_script_error_regex'] = 'Script de inicialização do Apache inválido.';
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
$wb['fastcgi_starter_path_txt'] = 'FastCGI: Pasta inicial';
$wb['fastcgi_starter_script_txt'] = 'FastCGI: Script inicial';
diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng
index 32514761262ca0566d695b17ce12c943a5ef99d6..27926c44a8192368c22586a014d484a5a4088d74 100644
--- a/interface/web/admin/lib/lang/ro_server_config.lng
+++ b/interface/web/admin/lib/lang/ro_server_config.lng
@@ -8,6 +8,9 @@ $wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
$wb['website_basedir_txt'] = 'Website basedir';
$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['apache_init_script_txt'] = 'Scriptul Apache init';
+$wb['apache_init_script_note_txt'] = 'Lăsând acest gol, va detecta automat scriptul inițial Apache';
+$wb['apache_init_script_error_regex'] = 'Scriptul inițial de Apache nevalid.';
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index b2f0b407d67f0e5837f10401abd793c6418242b9..db17e9ac5a889e74bf7cf3f84d4c288f15f37f25 100644
--- a/interface/web/admin/lib/lang/ru_server_config.lng
+++ b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -6,6 +6,9 @@ $wb['website_path_txt'] = 'Путь к web-сайту';
$wb['website_symlinks_txt'] = 'Симлинки Web-сайта';
$wb['vhost_conf_dir_txt'] = 'Каталог config Vhost';
$wb['vhost_conf_enabled_dir_txt'] = 'Каталог Vhost conf enabled';
+$wb['apache_init_script_txt'] = 'Apache init script';
+$wb['apache_init_script_note_txt'] = 'Если оставить это поле пустым, будет автоматически обнаружен скрипт инициализации Apache.';
+$wb['apache_init_script_error_regex'] = 'Недопустимый скрипт инициализации Apache.';
$wb['getmail_config_dir_txt'] = 'Папка конфига Getmail';
$wb['fastcgi_starter_path_txt'] = 'Стартовый путь FastCGI';
$wb['fastcgi_starter_script_txt'] = 'Стартовый скрипт FastCGI';
diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng
index 1103baa4d2081d2d1b47a64f492d4c4e91418535..afaac777963face164a734509c2a476cba894e10 100644
--- a/interface/web/admin/lib/lang/se_server_config.lng
+++ b/interface/web/admin/lib/lang/se_server_config.lng
@@ -7,6 +7,9 @@ $wb['website_symlinks_txt'] = 'Website symlinks';
$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
$wb['vhost_conf_dir_txt'] = 'Vhost config dir';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['apache_init_script_txt'] = 'Apache init-skript';
+$wb['apache_init_script_note_txt'] = 'Om du lämnar detta tomt kommer det automatiskt att upptäcka Apache-init-skriptet';
+$wb['apache_init_script_error_regex'] = 'Ogiltigt Apache-init-skript.';
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng
index 125e0b1ea22c12167a3fa6c2b3c4a297b1c65648..f97bc7f86fd7232c671965414a392bf183d844c9 100644
--- a/interface/web/admin/lib/lang/sk_server_config.lng
+++ b/interface/web/admin/lib/lang/sk_server_config.lng
@@ -9,6 +9,9 @@ $wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
$wb['website_basedir_txt'] = 'Website základny adresár';
$wb['vhost_conf_dir_txt'] = 'Vhost konfig adresár';
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost konfig odblokovaný adresár';
+$wb['apache_init_script_txt'] = 'Inicializačný skript Apache';
+$wb['apache_init_script_note_txt'] = 'Ak ponecháte toto pole prázdne, automaticky zistí iniciačný skript Apache';
+$wb['apache_init_script_error_regex'] = 'Neplatný iniciačný skript Apache.';
$wb['getmail_config_dir_txt'] = 'Getmail konfig adresár';
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter cesta';
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter skript';
diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng
index 3b63e881f906e277ed46c8ec13b368c4fdb98976..7d664b6947d309f30bc99d5a16941037036761f9 100644
--- a/interface/web/admin/lib/lang/tr_server_config.lng
+++ b/interface/web/admin/lib/lang/tr_server_config.lng
@@ -19,6 +19,9 @@ $wb['website_autoalias_txt'] = 'Otomatik Web Sitesi Takma Adı';
$wb['website_autoalias_note_txt'] = 'Kodlar:';
$wb['vhost_conf_dir_txt'] = 'Sanal Sunucu Ayarları Klasörü';
$wb['vhost_conf_enabled_dir_txt'] = 'Etkin Sanal Sunucu Ayarları Klasörü';
+$wb['apache_init_script_txt'] = 'Apache init betiği';
+$wb['apache_init_script_note_txt'] = 'Bu değerin boş bırakılması Apache init betiğini otomatik olarak algılar';
+$wb['apache_init_script_error_regex'] = 'Geçersiz Apache init betiği.';
$wb['getmail_config_dir_txt'] = 'Getmail Ayarları Klasörü';
$wb['fastcgi_starter_path_txt'] = 'FastCGI Başlatıcı Yolu';
$wb['fastcgi_starter_script_txt'] = 'FastCGI Başlatıcı Betiği';
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index eb285bbc078c6663ad4681e16493d4f131088555..97dc0557fcf4f6181d5a63746230d417eed3f98f 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -60,6 +60,9 @@
+
diff --git a/security/ids.whitelist b/security/ids.whitelist
index a9b045e15f52b2bb8d4d6d6d0d09b92bd3319d73..6a953f45cf4216b4fef56ec565676b4dd2f8990a 100644
--- a/security/ids.whitelist
+++ b/security/ids.whitelist
@@ -7,6 +7,7 @@ admin:/admin/server_config_edit.php:POST.website_path
admin:/admin/server_config_edit.php:POST.website_symlinks
admin:/admin/server_config_edit.php:POST.vhost_conf_dir
admin:/admin/server_config_edit.php:POST.vhost_conf_enabled_dir
+admin:/admin/server_config_edit.php:POST.apache_init_script
admin:/admin/server_config_edit.php:POST.nginx_vhost_conf_dir
admin:/admin/server_config_edit.php:POST.nginx_vhost_conf_enabled_dir
admin:/admin/server_config_edit.php:POST.php_open_basedir
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index d95d810ad3b4a04491d20a920aeaf50052e94888..e45634e9b208df0fd6a6a74fd1d4151dcfdf3167 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -379,10 +379,12 @@
- ProxyFCGISetEnvIf "true" DOCUMENT_ROOT ""
- ProxyFCGISetEnvIf "true" CONTEXT_DOCUMENT_ROOT "%{reqenv:DOCUMENT_ROOT}"
- ProxyFCGISetEnvIf "true" HOME "%{reqenv:DOCUMENT_ROOT}"
- ProxyFCGISetEnvIf "true" SCRIPT_FILENAME "%{reqenv:DOCUMENT_ROOT}%{reqenv:SCRIPT_NAME}"
+ = 2.4.26>
+ ProxyFCGISetEnvIf "true" DOCUMENT_ROOT ""
+ ProxyFCGISetEnvIf "true" CONTEXT_DOCUMENT_ROOT "%{reqenv:DOCUMENT_ROOT}"
+ ProxyFCGISetEnvIf "true" HOME "%{reqenv:DOCUMENT_ROOT}"
+ ProxyFCGISetEnvIf "true" SCRIPT_FILENAME "%{reqenv:DOCUMENT_ROOT}%{reqenv:SCRIPT_NAME}"
+
#ProxyPassMatch ^/(.*\.php[345]?(/.*)?)$ fcgi://127.0.0.1:/$1
diff --git a/server/mods-available/web_module.inc.php b/server/mods-available/web_module.inc.php
index aecec10579e37e1b4160dc2ac57d924f12936f49..02f31510c2a2001c3c2ef4cada45cfa3c1a76377 100644
--- a/server/mods-available/web_module.inc.php
+++ b/server/mods-available/web_module.inc.php
@@ -203,7 +203,9 @@ class web_module {
$daemon = $web_config['server_type'];
break;
default:
- if(is_file($conf['init_scripts'] . '/' . 'httpd') || is_dir('/etc/httpd')) {
+ if (!empty($web_config['apache_init_script'])) {
+ $daemon = $web_config['apache_init_script'];
+ } elseif(is_file($conf['init_scripts'] . '/' . 'httpd') || is_dir('/etc/httpd')) {
$daemon = 'httpd';
} else {
$daemon = 'apache2';