Adding new setting for mod_php users to specify content of the global directory options file, fixes #1638
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
@@ -16,7 +16,6 @@
|
|||||||
* @package Settings
|
* @package Settings
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
return array(
|
return array(
|
||||||
'groups' => array(
|
'groups' => array(
|
||||||
'webserver' => array(
|
'webserver' => array(
|
||||||
@@ -29,7 +28,11 @@ return array(
|
|||||||
'type' => 'option',
|
'type' => 'option',
|
||||||
'default' => 'apache2',
|
'default' => 'apache2',
|
||||||
'option_mode' => 'one',
|
'option_mode' => 'one',
|
||||||
'option_options' => array('apache2' => 'Apache 2', 'lighttpd' => 'ligHTTPd', 'nginx' => 'Nginx'),
|
'option_options' => array(
|
||||||
|
'apache2' => 'Apache 2',
|
||||||
|
'lighttpd' => 'ligHTTPd',
|
||||||
|
'nginx' => 'Nginx'
|
||||||
|
),
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField',
|
||||||
'plausibility_check_method' => 'checkPhpInterfaceSetting',
|
'plausibility_check_method' => 'checkPhpInterfaceSetting',
|
||||||
'overview_option' => true
|
'overview_option' => true
|
||||||
@@ -41,7 +44,9 @@ return array(
|
|||||||
'type' => 'bool',
|
'type' => 'bool',
|
||||||
'default' => false,
|
'default' => false,
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField',
|
||||||
'websrv_avail' => array('apache2')
|
'websrv_avail' => array(
|
||||||
|
'apache2'
|
||||||
|
)
|
||||||
),
|
),
|
||||||
'system_apache_itksupport' => array(
|
'system_apache_itksupport' => array(
|
||||||
'label' => $lng['serversettings']['apache_itksupport'],
|
'label' => $lng['serversettings']['apache_itksupport'],
|
||||||
@@ -51,7 +56,9 @@ return array(
|
|||||||
'default' => false,
|
'default' => false,
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField',
|
||||||
'visible' => (Settings::Get('system.mod_fcgid') == 0 && Settings::Get('phpfpm.enabled') == 0),
|
'visible' => (Settings::Get('system.mod_fcgid') == 0 && Settings::Get('phpfpm.enabled') == 0),
|
||||||
'websrv_avail' => array('apache2')
|
'websrv_avail' => array(
|
||||||
|
'apache2'
|
||||||
|
)
|
||||||
),
|
),
|
||||||
'system_httpuser' => array(
|
'system_httpuser' => array(
|
||||||
'label' => $lng['admin']['webserver_user'],
|
'label' => $lng['admin']['webserver_user'],
|
||||||
@@ -59,7 +66,7 @@ return array(
|
|||||||
'varname' => 'httpuser',
|
'varname' => 'httpuser',
|
||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'default' => 'www-data',
|
'default' => 'www-data',
|
||||||
'save_method' => 'storeSettingWebserverFcgidFpmUser',
|
'save_method' => 'storeSettingWebserverFcgidFpmUser'
|
||||||
),
|
),
|
||||||
'system_httpgroup' => array(
|
'system_httpgroup' => array(
|
||||||
'label' => $lng['admin']['webserver_group'],
|
'label' => $lng['admin']['webserver_group'],
|
||||||
@@ -67,7 +74,7 @@ return array(
|
|||||||
'varname' => 'httpgroup',
|
'varname' => 'httpgroup',
|
||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'default' => 'www-data',
|
'default' => 'www-data',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField'
|
||||||
),
|
),
|
||||||
'system_apacheconf_vhost' => array(
|
'system_apacheconf_vhost' => array(
|
||||||
'label' => $lng['serversettings']['apacheconf_vhost'],
|
'label' => $lng['serversettings']['apacheconf_vhost'],
|
||||||
@@ -76,7 +83,7 @@ return array(
|
|||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'string_type' => 'filedir',
|
'string_type' => 'filedir',
|
||||||
'default' => '/etc/apache2/sites-enabled/',
|
'default' => '/etc/apache2/sites-enabled/',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField'
|
||||||
),
|
),
|
||||||
'system_apacheconf_diroptions' => array(
|
'system_apacheconf_diroptions' => array(
|
||||||
'label' => $lng['serversettings']['apacheconf_diroptions'],
|
'label' => $lng['serversettings']['apacheconf_diroptions'],
|
||||||
@@ -85,7 +92,7 @@ return array(
|
|||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'string_type' => 'filedir',
|
'string_type' => 'filedir',
|
||||||
'default' => '/etc/apache2/sites-enabled/',
|
'default' => '/etc/apache2/sites-enabled/',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField'
|
||||||
),
|
),
|
||||||
'system_apacheconf_htpasswddir' => array(
|
'system_apacheconf_htpasswddir' => array(
|
||||||
'label' => $lng['serversettings']['apacheconf_htpasswddir'],
|
'label' => $lng['serversettings']['apacheconf_htpasswddir'],
|
||||||
@@ -94,7 +101,7 @@ return array(
|
|||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'string_type' => 'confdir',
|
'string_type' => 'confdir',
|
||||||
'default' => '/etc/apache2/htpasswd/',
|
'default' => '/etc/apache2/htpasswd/',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField'
|
||||||
),
|
),
|
||||||
'system_logfiles_directory' => array(
|
'system_logfiles_directory' => array(
|
||||||
'label' => $lng['serversettings']['logfiles_directory'],
|
'label' => $lng['serversettings']['logfiles_directory'],
|
||||||
@@ -103,7 +110,7 @@ return array(
|
|||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'string_type' => 'dir',
|
'string_type' => 'dir',
|
||||||
'default' => '/var/customers/logs/',
|
'default' => '/var/customers/logs/',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField'
|
||||||
),
|
),
|
||||||
'system_customersslpath' => array(
|
'system_customersslpath' => array(
|
||||||
'label' => $lng['serversettings']['customerssl_directory'],
|
'label' => $lng['serversettings']['customerssl_directory'],
|
||||||
@@ -112,7 +119,7 @@ return array(
|
|||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'string_type' => 'confdir',
|
'string_type' => 'confdir',
|
||||||
'default' => '/etc/ssl/froxlor-custom/',
|
'default' => '/etc/ssl/froxlor-custom/',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField'
|
||||||
),
|
),
|
||||||
'system_phpappendopenbasedir' => array(
|
'system_phpappendopenbasedir' => array(
|
||||||
'label' => $lng['serversettings']['phpappendopenbasedir'],
|
'label' => $lng['serversettings']['phpappendopenbasedir'],
|
||||||
@@ -121,7 +128,7 @@ return array(
|
|||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'string_emptyallowed' => true,
|
'string_emptyallowed' => true,
|
||||||
'default' => '',
|
'default' => '',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField'
|
||||||
),
|
),
|
||||||
'system_deactivateddocroot' => array(
|
'system_deactivateddocroot' => array(
|
||||||
'label' => $lng['serversettings']['deactivateddocroot'],
|
'label' => $lng['serversettings']['deactivateddocroot'],
|
||||||
@@ -131,7 +138,7 @@ return array(
|
|||||||
'string_type' => 'dir',
|
'string_type' => 'dir',
|
||||||
'string_emptyallowed' => true,
|
'string_emptyallowed' => true,
|
||||||
'default' => '',
|
'default' => '',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField'
|
||||||
),
|
),
|
||||||
'system_default_vhostconf' => array(
|
'system_default_vhostconf' => array(
|
||||||
'label' => $lng['serversettings']['default_vhostconf'],
|
'label' => $lng['serversettings']['default_vhostconf'],
|
||||||
@@ -139,7 +146,19 @@ return array(
|
|||||||
'varname' => 'default_vhostconf',
|
'varname' => 'default_vhostconf',
|
||||||
'type' => 'text',
|
'type' => 'text',
|
||||||
'default' => '',
|
'default' => '',
|
||||||
|
'save_method' => 'storeSettingField'
|
||||||
|
),
|
||||||
|
'system_apache_globaldiropt' => array(
|
||||||
|
'label' => $lng['serversettings']['apache_globaldiropt'],
|
||||||
|
'settinggroup' => 'system',
|
||||||
|
'varname' => 'apacheglobaldiropt',
|
||||||
|
'type' => 'text',
|
||||||
|
'default' => '',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField',
|
||||||
|
'visible' => (Settings::Get('system.mod_fcgid') == 0 && Settings::Get('phpfpm.enabled') == 0),
|
||||||
|
'websrv_avail' => array(
|
||||||
|
'apache2'
|
||||||
|
)
|
||||||
),
|
),
|
||||||
'system_apachereload_command' => array(
|
'system_apachereload_command' => array(
|
||||||
'label' => $lng['serversettings']['apachereload_command'],
|
'label' => $lng['serversettings']['apachereload_command'],
|
||||||
@@ -147,7 +166,7 @@ return array(
|
|||||||
'varname' => 'apachereload_command',
|
'varname' => 'apachereload_command',
|
||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'default' => '/etc/init.d/apache2 reload',
|
'default' => '/etc/init.d/apache2 reload',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField'
|
||||||
),
|
),
|
||||||
'system_phpreload_command' => array(
|
'system_phpreload_command' => array(
|
||||||
'label' => $lng['serversettings']['phpreload_command'],
|
'label' => $lng['serversettings']['phpreload_command'],
|
||||||
@@ -156,7 +175,9 @@ return array(
|
|||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'default' => '',
|
'default' => '',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField',
|
||||||
'websrv_avail' => array('nginx')
|
'websrv_avail' => array(
|
||||||
|
'nginx'
|
||||||
|
)
|
||||||
),
|
),
|
||||||
'system_nginx_php_backend' => array(
|
'system_nginx_php_backend' => array(
|
||||||
'label' => $lng['serversettings']['nginx_php_backend'],
|
'label' => $lng['serversettings']['nginx_php_backend'],
|
||||||
@@ -165,7 +186,9 @@ return array(
|
|||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'default' => '127.0.0.1:8888',
|
'default' => '127.0.0.1:8888',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField',
|
||||||
'websrv_avail' => array('nginx')
|
'websrv_avail' => array(
|
||||||
|
'nginx'
|
||||||
|
)
|
||||||
),
|
),
|
||||||
'nginx_fastcgiparams' => array(
|
'nginx_fastcgiparams' => array(
|
||||||
'label' => $lng['serversettings']['nginx_fastcgiparams'],
|
'label' => $lng['serversettings']['nginx_fastcgiparams'],
|
||||||
@@ -175,7 +198,9 @@ return array(
|
|||||||
'string_type' => 'file',
|
'string_type' => 'file',
|
||||||
'default' => '/etc/nginx/fastcgi_params',
|
'default' => '/etc/nginx/fastcgi_params',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField',
|
||||||
'websrv_avail' => array('nginx')
|
'websrv_avail' => array(
|
||||||
|
'nginx'
|
||||||
|
)
|
||||||
),
|
),
|
||||||
'defaultwebsrverrhandler_enabled' => array(
|
'defaultwebsrverrhandler_enabled' => array(
|
||||||
'label' => $lng['serversettings']['defaultwebsrverrhandler_enabled'],
|
'label' => $lng['serversettings']['defaultwebsrverrhandler_enabled'],
|
||||||
@@ -183,7 +208,7 @@ return array(
|
|||||||
'varname' => 'enabled',
|
'varname' => 'enabled',
|
||||||
'type' => 'bool',
|
'type' => 'bool',
|
||||||
'default' => false,
|
'default' => false,
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField'
|
||||||
),
|
),
|
||||||
'defaultwebsrverrhandler_err401' => array(
|
'defaultwebsrverrhandler_err401' => array(
|
||||||
'label' => $lng['serversettings']['defaultwebsrverrhandler_err401'],
|
'label' => $lng['serversettings']['defaultwebsrverrhandler_err401'],
|
||||||
@@ -192,7 +217,10 @@ return array(
|
|||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'default' => '',
|
'default' => '',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField',
|
||||||
'websrv_avail' => array('apache2', 'nginx')
|
'websrv_avail' => array(
|
||||||
|
'apache2',
|
||||||
|
'nginx'
|
||||||
|
)
|
||||||
),
|
),
|
||||||
'defaultwebsrverrhandler_err403' => array(
|
'defaultwebsrverrhandler_err403' => array(
|
||||||
'label' => $lng['serversettings']['defaultwebsrverrhandler_err403'],
|
'label' => $lng['serversettings']['defaultwebsrverrhandler_err403'],
|
||||||
@@ -201,7 +229,10 @@ return array(
|
|||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'default' => '',
|
'default' => '',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField',
|
||||||
'websrv_avail' => array('apache2', 'nginx')
|
'websrv_avail' => array(
|
||||||
|
'apache2',
|
||||||
|
'nginx'
|
||||||
|
)
|
||||||
),
|
),
|
||||||
'defaultwebsrverrhandler_err404' => array(
|
'defaultwebsrverrhandler_err404' => array(
|
||||||
'label' => $lng['serversettings']['defaultwebsrverrhandler_err404'],
|
'label' => $lng['serversettings']['defaultwebsrverrhandler_err404'],
|
||||||
@@ -209,7 +240,7 @@ return array(
|
|||||||
'varname' => 'err404',
|
'varname' => 'err404',
|
||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'default' => '',
|
'default' => '',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField'
|
||||||
),
|
),
|
||||||
'defaultwebsrverrhandler_err500' => array(
|
'defaultwebsrverrhandler_err500' => array(
|
||||||
'label' => $lng['serversettings']['defaultwebsrverrhandler_err500'],
|
'label' => $lng['serversettings']['defaultwebsrverrhandler_err500'],
|
||||||
@@ -218,7 +249,10 @@ return array(
|
|||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'default' => '',
|
'default' => '',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField',
|
||||||
'websrv_avail' => array('apache2', 'nginx')
|
'websrv_avail' => array(
|
||||||
|
'apache2',
|
||||||
|
'nginx'
|
||||||
|
)
|
||||||
),
|
),
|
||||||
'customredirect_enabled' => array(
|
'customredirect_enabled' => array(
|
||||||
'label' => $lng['serversettings']['customredirect_enabled'],
|
'label' => $lng['serversettings']['customredirect_enabled'],
|
||||||
@@ -227,7 +261,10 @@ return array(
|
|||||||
'type' => 'bool',
|
'type' => 'bool',
|
||||||
'default' => false,
|
'default' => false,
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField',
|
||||||
'websrv_avail' => array('apache2', 'lighttpd')
|
'websrv_avail' => array(
|
||||||
|
'apache2',
|
||||||
|
'lighttpd'
|
||||||
|
)
|
||||||
),
|
),
|
||||||
'customredirect_default' => array(
|
'customredirect_default' => array(
|
||||||
'label' => $lng['serversettings']['customredirect_default'],
|
'label' => $lng['serversettings']['customredirect_default'],
|
||||||
@@ -238,9 +275,12 @@ return array(
|
|||||||
'option_mode' => 'one',
|
'option_mode' => 'one',
|
||||||
'option_options_method' => 'getRedirectCodes',
|
'option_options_method' => 'getRedirectCodes',
|
||||||
'save_method' => 'storeSettingField',
|
'save_method' => 'storeSettingField',
|
||||||
'websrv_avail' => array('apache2', 'lighttpd')
|
'websrv_avail' => array(
|
||||||
|
'apache2',
|
||||||
|
'lighttpd'
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
);
|
)
|
||||||
|
);
|
||||||
|
|||||||
@@ -529,6 +529,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
|
|||||||
('system', 'backupenabled', '0'),
|
('system', 'backupenabled', '0'),
|
||||||
('system', 'dnsenabled', '0'),
|
('system', 'dnsenabled', '0'),
|
||||||
('system', 'dns_server', 'bind'),
|
('system', 'dns_server', 'bind'),
|
||||||
|
('system', 'apacheglobaldiropt', ''),
|
||||||
('panel', 'decimal_places', '4'),
|
('panel', 'decimal_places', '4'),
|
||||||
('panel', 'adminmail', 'admin@SERVERNAME'),
|
('panel', 'adminmail', 'admin@SERVERNAME'),
|
||||||
('panel', 'phpmyadmin_url', ''),
|
('panel', 'phpmyadmin_url', ''),
|
||||||
@@ -560,7 +561,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
|
|||||||
('panel', 'password_special_char_required', '0'),
|
('panel', 'password_special_char_required', '0'),
|
||||||
('panel', 'password_special_char', '!?<>§$%+#=@'),
|
('panel', 'password_special_char', '!?<>§$%+#=@'),
|
||||||
('panel', 'version', '0.9.36'),
|
('panel', 'version', '0.9.36'),
|
||||||
('panel', 'db_version', '201606190');
|
('panel', 'db_version', '201607140');
|
||||||
|
|
||||||
|
|
||||||
DROP TABLE IF EXISTS `panel_tasks`;
|
DROP TABLE IF EXISTS `panel_tasks`;
|
||||||
|
|||||||
@@ -3385,3 +3385,12 @@ if (isDatabaseVersion('201605180')) {
|
|||||||
|
|
||||||
updateToDbVersion('201606190');
|
updateToDbVersion('201606190');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isDatabaseVersion('201606190')) {
|
||||||
|
|
||||||
|
showUpdateStep("Adding new setting for mod_php users to specify content of the global directory options file");
|
||||||
|
Settings::AddNew("system.apacheglobaldiropt", "");
|
||||||
|
lastStepStatus(0);
|
||||||
|
|
||||||
|
updateToDbVersion('201607140');
|
||||||
|
}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
$version = '0.9.36';
|
$version = '0.9.36';
|
||||||
|
|
||||||
// Database version (YYYYMMDDC where C is a daily counter)
|
// Database version (YYYYMMDDC where C is a daily counter)
|
||||||
$dbversion = '201606190';
|
$dbversion = '201607140';
|
||||||
|
|
||||||
// Distribution branding-tag (used for Debian etc.)
|
// Distribution branding-tag (used for Debian etc.)
|
||||||
$branding = '';
|
$branding = '';
|
||||||
|
|||||||
@@ -779,8 +779,11 @@ $lng['message']['noreceipients'] = 'No e-mail has been sent because there are no
|
|||||||
$lng['admin']['sslsettings'] = 'SSL settings';
|
$lng['admin']['sslsettings'] = 'SSL settings';
|
||||||
$lng['cronjobs']['notyetrun'] = 'Not yet run';
|
$lng['cronjobs']['notyetrun'] = 'Not yet run';
|
||||||
$lng['serversettings']['default_vhostconf']['title'] = 'Default vHost-settings';
|
$lng['serversettings']['default_vhostconf']['title'] = 'Default vHost-settings';
|
||||||
$lng['serversettings']['default_vhostconf']['description'] = 'The content of this field will be included into this ip/port vHost container directly. Attention: The code won\'t be checked for any errors. If it contains errors, webserver might not start again!';
|
$lng['admin']['specialsettings_replacements'] = "You can use the following variables:<br/><code>{DOMAIN}</code>, <code>{DOCROOT}</code>, <code>{CUSTOMER}</code>, <code>{IP}</code>, <code>{PORT}</code>, <code>{SCHEME}</code><br/>";
|
||||||
$lng['serversettings']['default_vhostconf_domain']['description'] = 'The content of this field will be included into the domain vHost container directly. Attention: The code won\'t be checked for any errors. If it contains errors, webserver might not start again!';
|
$lng['serversettings']['default_vhostconf']['description'] = 'The content of this field will be included into this ip/port vHost container directly. '.$lng['admin']['specialsettings_replacements'].' Attention: The code won\'t be checked for any errors. If it contains errors, webserver might not start again!';
|
||||||
|
$lng['serversettings']['apache_globaldiropt']['title'] = 'Directory options for customer-prefix';
|
||||||
|
$lng['serversettings']['apache_globaldiropt']['description'] = 'The content of this field will be included into the 05_froxlor_dirfix_nofcgid.conf apache config. If empty, the default value is used:<br><br>apache >=2.4<br><code>Require all granted<br>AllowOverride All</code><br><br>apache <=2.2<br><code>Order allow,deny<br>allow from all</code>';
|
||||||
|
$lng['serversettings']['default_vhostconf_domain']['description'] = 'The content of this field will be included into the domain vHost container directly. '.$lng['admin']['specialsettings_replacements'].' Attention: The code won\'t be checked for any errors. If it contains errors, webserver might not start again!';
|
||||||
$lng['error']['invalidip'] = 'Invalid IP address: %s';
|
$lng['error']['invalidip'] = 'Invalid IP address: %s';
|
||||||
$lng['serversettings']['decimal_places'] = 'Number of decimal places in traffic/webspace output';
|
$lng['serversettings']['decimal_places'] = 'Number of decimal places in traffic/webspace output';
|
||||||
|
|
||||||
@@ -1854,9 +1857,6 @@ $lng['integrity_check']['SubdomainSslRedirect'] = 'False SSL-redirect flag for n
|
|||||||
$lng['integrity_check']['FroxlorLocalGroupMemberForFcgidPhpFpm'] = 'froxlor-user in the customer groups (for FCGID/php-fpm)';
|
$lng['integrity_check']['FroxlorLocalGroupMemberForFcgidPhpFpm'] = 'froxlor-user in the customer groups (for FCGID/php-fpm)';
|
||||||
$lng['integrity_check']['WebserverGroupMemberForFcgidPhpFpm'] = 'Webserver-user in the customer groups (for FCGID/php-fpm)';
|
$lng['integrity_check']['WebserverGroupMemberForFcgidPhpFpm'] = 'Webserver-user in the customer groups (for FCGID/php-fpm)';
|
||||||
$lng['integrity_check']['SubdomainLetsencrypt'] = 'Main domains with no SSL-Port assigned don\'t have any subdomains with active SSL redirect';
|
$lng['integrity_check']['SubdomainLetsencrypt'] = 'Main domains with no SSL-Port assigned don\'t have any subdomains with active SSL redirect';
|
||||||
$lng['admin']['specialsettings_replacements'] = "You can use the following variables:<br/><code>{DOMAIN}</code>, <code>{DOCROOT}</code>, <code>{CUSTOMER}</code>, <code>{IP}</code>, <code>{PORT}</code>, <code>{SCHEME}</code><br/>";
|
|
||||||
$lng['serversettings']['default_vhostconf']['description'] = 'The content of this field will be included into this ip/port vHost container directly. '.$lng['admin']['specialsettings_replacements'].' Attention: The code won\'t be checked for any errors. If it contains errors, webserver might not start again!';
|
|
||||||
$lng['serversettings']['default_vhostconf_domain']['description'] = 'The content of this field will be included into the domain vHost container directly. '.$lng['admin']['specialsettings_replacements'].' Attention: The code won\'t be checked for any errors. If it contains errors, webserver might not start again!';
|
|
||||||
$lng['admin']['mod_fcgid_umask']['title'] = 'Umask (default: 022)';
|
$lng['admin']['mod_fcgid_umask']['title'] = 'Umask (default: 022)';
|
||||||
|
|
||||||
// Added for apcuinfo
|
// Added for apcuinfo
|
||||||
|
|||||||
@@ -775,8 +775,11 @@ $lng['message']['noreceipients'] = 'Es wurde keine E-Mail versendet da sich kein
|
|||||||
$lng['admin']['sslsettings'] = 'SSL-Einstellungen';
|
$lng['admin']['sslsettings'] = 'SSL-Einstellungen';
|
||||||
$lng['cronjobs']['notyetrun'] = 'Bisher nicht gestartet';
|
$lng['cronjobs']['notyetrun'] = 'Bisher nicht gestartet';
|
||||||
$lng['serversettings']['default_vhostconf']['title'] = 'Standard vHost-Einstellungen';
|
$lng['serversettings']['default_vhostconf']['title'] = 'Standard vHost-Einstellungen';
|
||||||
$lng['serversettings']['default_vhostconf']['description'] = 'Der Inhalt dieses Feldes wird direkt in den IP/Port-vHost-Container übernommen.<br /><strong>ACHTUNG:</strong> Der Code wird nicht auf Fehler geprüft. Etwaige Fehler werden also auch übernommen. Der Webserver könnte nicht mehr starten!';
|
$lng['admin']['specialsettings_replacements'] = "Die folgenden Variablen können verwendet werden:<br/><code>{DOMAIN}</code>, <code>{DOCROOT}</code>, <code>{CUSTOMER}</code>, <code>{IP}</code>, <code>{PORT}</code>, <code>{SCHEME}</code><br/>";
|
||||||
$lng['serversettings']['default_vhostconf_domain']['description'] = 'Der Inhalt dieses Feldes wird direkt in jeden Domain-vHost-Container übernommen.<br /><strong>ACHTUNG:</strong> Der Code wird nicht auf Fehler geprüft. Etwaige Fehler werden also auch übernommen. Der Webserver könnte nicht mehr starten!';
|
$lng['serversettings']['default_vhostconf']['description'] = 'Der Inhalt dieses Feldes wird direkt in den IP/Port-vHost-Container übernommen. '.$lng['admin']['specialsettings_replacements'].'<br /><strong>ACHTUNG:</strong> Der Code wird nicht auf Fehler geprüft. Etwaige Fehler werden also auch übernommen. Der Webserver könnte nicht mehr starten!';
|
||||||
|
$lng['serversettings']['default_vhostconf_domain']['description'] = 'Der Inhalt dieses Feldes wird direkt in jeden Domain-vHost-Container übernommen. '. $lng['admin']['specialsettings_replacements'].'<strong>ACHTUNG:</strong> Der Code wird nicht auf Fehler geprüft. Etwaige Fehler werden also auch übernommen. Der Webserver könnte nicht mehr starten!';
|
||||||
|
$lng['serversettings']['apache_globaldiropt']['title'] = 'Kunden-Prefix Ordner-Optionen';
|
||||||
|
$lng['serversettings']['apache_globaldiropt']['description'] = 'Der Inhaltdieses Feldes wird in die 05_froxlor_dirfix_nofcgid.conf Apache Konfigurationsdatei eingefügt. Wenn leer werden folgende Standardwerte verwendet:<br><br>apache >=2.4<br><code>Require all granted<br>AllowOverride All</code><br><br>apache <=2.2<br><code>Order allow,deny<br>allow from all</code>';
|
||||||
$lng['error']['invalidip'] = 'Ungültige IP-Adresse: "%s"';
|
$lng['error']['invalidip'] = 'Ungültige IP-Adresse: "%s"';
|
||||||
$lng['serversettings']['decimal_places'] = 'Nachkommastellen bei der Ausgabe von Traffic/Webspace';
|
$lng['serversettings']['decimal_places'] = 'Nachkommastellen bei der Ausgabe von Traffic/Webspace';
|
||||||
|
|
||||||
@@ -1580,9 +1583,6 @@ $lng['integrity_check']['SubdomainSslRedirect'] = 'Falsches SSL-redirect Flag be
|
|||||||
$lng['integrity_check']['FroxlorLocalGroupMemberForFcgidPhpFpm'] = 'froxlor-Benutzer in Kunden-Gruppen (für FCGID/php-fpm)';
|
$lng['integrity_check']['FroxlorLocalGroupMemberForFcgidPhpFpm'] = 'froxlor-Benutzer in Kunden-Gruppen (für FCGID/php-fpm)';
|
||||||
$lng['integrity_check']['WebserverGroupMemberForFcgidPhpFpm'] = 'Webserver-Benutzer in Kunden-Gruppen (für FCGID/php-fpm)';
|
$lng['integrity_check']['WebserverGroupMemberForFcgidPhpFpm'] = 'Webserver-Benutzer in Kunden-Gruppen (für FCGID/php-fpm)';
|
||||||
$lng['integrity_check']['SubdomainLetsencrypt'] = 'Hauptdomains ohne zugewiesenen SSL-Port haben keine Subdomain mit aktiviertem SSL-Redirect';
|
$lng['integrity_check']['SubdomainLetsencrypt'] = 'Hauptdomains ohne zugewiesenen SSL-Port haben keine Subdomain mit aktiviertem SSL-Redirect';
|
||||||
$lng['admin']['specialsettings_replacements'] = "Die folgenden Variablen können verwendet werden:<br/><code>{DOMAIN}</code>, <code>{DOCROOT}</code>, <code>{CUSTOMER}</code>, <code>{IP}</code>, <code>{PORT}</code>, <code>{SCHEME}</code><br/>";
|
|
||||||
$lng['serversettings']['default_vhostconf']['description'] = 'Der Inhalt dieses Feldes wird direkt in den IP/Port-vHost-Container übernommen. '.$lng['admin']['specialsettings_replacements'].'<br /><strong>ACHTUNG:</strong> Der Code wird nicht auf Fehler geprüft. Etwaige Fehler werden also auch übernommen. Der Webserver könnte nicht mehr starten!';
|
|
||||||
$lng['serversettings']['default_vhostconf_domain']['description'] = 'Der Inhalt dieses Feldes wird direkt in jeden Domain-vHost-Container übernommen. '. $lng['admin']['specialsettings_replacements'].'<strong>ACHTUNG:</strong> Der Code wird nicht auf Fehler geprüft. Etwaige Fehler werden also auch übernommen. Der Webserver könnte nicht mehr starten!';
|
|
||||||
$lng['admin']['mod_fcgid_umask']['title'] = 'Umask (Standard: 022)';
|
$lng['admin']['mod_fcgid_umask']['title'] = 'Umask (Standard: 022)';
|
||||||
|
|
||||||
// Added for let's encrypt
|
// Added for let's encrypt
|
||||||
|
|||||||
Reference in New Issue
Block a user