File froxlor-suse-config.diff of Package froxlor
diff --git a/actions/admin/settings/130.webserver.php b/actions/admin/settings/130.webserver.php
index 0525726..e963adb 100644
--- a/actions/admin/settings/130.webserver.php
+++ b/actions/admin/settings/130.webserver.php
@@ -109,7 +109,7 @@ return array(
'varname' => 'apacheconf_vhost',
'type' => 'string',
'string_type' => 'filedir',
- 'default' => '/etc/apache2/sites-enabled/',
+ 'default' => '/etc/apache2/vhosts.d/',
'save_method' => 'storeSettingField'
),
'system_apacheconf_diroptions' => array(
@@ -118,7 +118,7 @@ return array(
'varname' => 'apacheconf_diroptions',
'type' => 'string',
'string_type' => 'filedir',
- 'default' => '/etc/apache2/sites-enabled/',
+ 'default' => '/etc/apache2/vhosts.d/',
'save_method' => 'storeSettingField'
),
'system_apacheconf_htpasswddir' => array(
@@ -136,7 +136,7 @@ return array(
'varname' => 'logfiles_directory',
'type' => 'string',
'string_type' => 'dir',
- 'default' => '/var/customers/logs/',
+ 'default' => '/srv/customers/logs/',
'save_method' => 'storeSettingField'
),
'system_logfiles_script' => array(
@@ -285,7 +285,7 @@ return array(
'settinggroup' => 'system',
'varname' => 'apachereload_command',
'type' => 'string',
- 'default' => '/etc/init.d/apache2 reload',
+ 'default' => 'systemctl reload apache2',
'save_method' => 'storeSettingField'
),
'system_phpreload_command' => array(
diff --git a/install/froxlor.sql b/install/froxlor.sql
index 6bb494c..71762e3 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -408,18 +408,18 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('customredirect', 'enabled', '1'),
('customredirect', 'default', '1'),
('perl', 'suexecworkaround', '0'),
- ('perl', 'suexecpath', '/var/www/cgi-bin/'),
+ ('perl', 'suexecpath', '/srv/www/cgi-bin/'),
('login', 'domain_login', '0'),
('login', 'maxloginattempts', '3'),
('login', 'deactivatetime', '900'),
('phpfpm', 'enabled', '0'),
- ('phpfpm', 'tmpdir', '/var/customers/tmp/'),
- ('phpfpm', 'peardir', '/usr/share/php/:/usr/share/php5/'),
+ ('phpfpm', 'tmpdir', '/srv/customers/tmp/'),
+ ('phpfpm', 'peardir', '/usr/share/php/:/usr/share/php7/'),
('phpfpm', 'envpath', '/usr/local/bin:/usr/bin:/bin'),
('phpfpm', 'enabled_ownvhost', '0'),
('phpfpm', 'vhost_httpuser', 'froxlorlocal'),
('phpfpm', 'vhost_httpgroup', 'froxlorlocal'),
- ('phpfpm', 'aliasconfigdir', '/var/www/php-fpm/'),
+ ('phpfpm', 'aliasconfigdir', '/srv/www/php-fpm/'),
('phpfpm', 'defaultini', '1'),
('phpfpm', 'vhost_defaultini', '2'),
('phpfpm', 'fastcgi_ipcdir', '/var/lib/apache2/fastcgi/'),
@@ -454,7 +454,7 @@ default_charset
error_reporting
include_path
log_errors_max_len
-mail.log
+mail
max_execution_time
session.cookie_domain
session.cookie_lifetime
@@ -523,18 +523,18 @@ opcache.interned_strings_buffer'),
('nginx', 'fastcgiparams', '/etc/nginx/fastcgi_params'),
('system', 'lastaccountnumber', '0'),
('system', 'lastguid', '9999'),
- ('system', 'documentroot_prefix', '/var/customers/webs/'),
- ('system', 'logfiles_directory', '/var/customers/logs/'),
+ ('system', 'documentroot_prefix', '/srv/customers/webs/'),
+ ('system', 'logfiles_directory', '/srv/customers/logs/'),
('system', 'ipaddress', 'SERVERIP'),
- ('system', 'apachereload_command', '/etc/init.d/apache2 reload'),
+ ('system', 'apachereload_command', 'systemctl reload apache2'),
('system', 'last_traffic_run', '000000'),
('system', 'vmail_uid', '2000'),
('system', 'vmail_gid', '2000'),
- ('system', 'vmail_homedir', '/var/customers/mail/'),
+ ('system', 'vmail_homedir', '/srv/customers/mail/'),
('system', 'vmail_maildirname', 'Maildir'),
('system', 'bind_enable', '0'),
- ('system', 'bindconf_directory', '/etc/bind/'),
- ('system', 'bindreload_command', '/etc/init.d/bind9 reload'),
+ ('system', 'bindconf_directory', '/etc/named.d/'),
+ ('system', 'bindreload_command', 'systemctl reload bind'),
('system', 'hostname', 'SERVERNAME'),
('system', 'mysql_access_host', 'localhost'),
('system', 'lastcronrun', ''),
@@ -552,9 +552,9 @@ opcache.interned_strings_buffer'),
('system', 'apacheconf_htpasswddir', '/etc/apache2/htpasswd/'),
('system', 'webalizer_quiet', '2'),
('system', 'last_archive_run', '000000'),
- ('system', 'mod_fcgid_configdir', '/var/www/php-fcgi-scripts'),
- ('system', 'mod_fcgid_tmpdir', '/var/customers/tmp'),
- ('system', 'ssl_cert_file', '/etc/apache2/apache2.pem'),
+ ('system', 'mod_fcgid_configdir', '/srv/www/php-fcgi-scripts'),
+ ('system', 'mod_fcgid_tmpdir', '/srv/customers/tmp'),
+ ('system', 'ssl_cert_file', '/etc/apache2/ssl.crt/apache2.pem'),
('system', 'use_ssl', '0'),
('system', 'default_vhostconf', ''),
('system', 'default_sslvhostconf', ''),
@@ -567,10 +567,10 @@ opcache.interned_strings_buffer'),
('system', 'webserver', 'apache2'),
('system', 'mod_fcgid_wrapper', '1'),
('system', 'mod_fcgid_starter', '0'),
- ('system', 'mod_fcgid_peardir', '/usr/share/php/:/usr/share/php5/'),
+ ('system', 'mod_fcgid_peardir', '/usr/share/php/:/usr/share/php7/'),
('system', 'index_file_extension', 'html'),
('system', 'mod_fcgid_maxrequests', '250'),
- ('system', 'ssl_key_file','/etc/apache2/apache2.key'),
+ ('system', 'ssl_key_file','/etc/apache2/ssl.key/apache2.key'),
('system', 'ssl_ca_file', ''),
('system', 'debug_cron', '0'),
('system', 'store_index_file_subs', '1'),
@@ -615,13 +615,13 @@ opcache.interned_strings_buffer'),
('system', 'customer_ssl_path', '/etc/ssl/froxlor-custom/'),
('system', 'allow_error_report_admin', '1'),
('system', 'allow_error_report_customer', '0'),
- ('system', 'mdalog', '/var/log/mail.log'),
- ('system', 'mtalog', '/var/log/mail.log'),
+ ('system', 'mdalog', '/var/log/mail'),
+ ('system', 'mtalog', '/var/log/mail'),
('system', 'mdaserver', 'dovecot'),
('system', 'mtaserver', 'postfix'),
('system', 'mailtraffic_enabled', '1'),
('system', 'cronconfig', '/etc/cron.d/froxlor'),
- ('system', 'crondreload', '/etc/init.d/cron reload'),
+ ('system', 'crondreload', 'systemctl reload cron'),
('system', 'croncmdline', '/usr/bin/nice -n 5 /usr/bin/php -q'),
('system', 'cron_allowautoupdate', '0'),
('system', 'dns_createhostnameentry', '0'),
@@ -632,7 +632,7 @@ opcache.interned_strings_buffer'),
('system', 'letsencryptca', 'letsencrypt'),
('system', 'letsencryptcountrycode', 'DE'),
('system', 'letsencryptstate', 'Hessen'),
- ('system', 'letsencryptchallengepath', '/var/www/froxlor'),
+ ('system', 'letsencryptchallengepath', '/srv/www/froxlor'),
('system', 'letsencryptkeysize', '4096'),
('system', 'letsencryptreuseold', 0),
('system', 'leenabled', '0'),
@@ -645,7 +645,7 @@ opcache.interned_strings_buffer'),
('system', 'available_shells', ''),
('system', 'le_froxlor_enabled', '0'),
('system', 'le_froxlor_redirect', '0'),
- ('system', 'letsencryptacmeconf', '/etc/apache2/conf-enabled/acme.conf'),
+ ('system', 'letsencryptacmeconf', '/etc/apache2/conf.d/acme.conf'),
('system', 'mail_use_smtp', '0'),
('system', 'mail_smtp_host', 'localhost'),
('system', 'mail_smtp_port', '25'),
@@ -863,7 +863,7 @@ CREATE TABLE `panel_fpmdaemons` (
INSERT INTO `panel_fpmdaemons` (`id`, `description`, `reload_cmd`, `config_dir`) VALUES
-(1, 'System default', 'service php7.3-fpm restart', '/etc/php/7.3/fpm/pool.d/');
+(1, 'System default', 'systemctl php-fpm restart', '/etc/php7/fpm/php-fpm.d/');
