diff --git a/actions/admin/settings/131.ssl.php b/actions/admin/settings/131.ssl.php index 6717e1b8..a9f3c091 100644 --- a/actions/admin/settings/131.ssl.php +++ b/actions/admin/settings/131.ssl.php @@ -128,7 +128,7 @@ return array( 'settinggroup' => 'system', 'varname' => 'leapiversion', 'type' => 'option', - 'default' => '1', + 'default' => '2', 'option_mode' => 'one', 'option_options' => array( '1' => 'ACME v1', diff --git a/actions/admin/settings/136.phpfpm.php b/actions/admin/settings/136.phpfpm.php index db1839ce..eca70ba4 100644 --- a/actions/admin/settings/136.phpfpm.php +++ b/actions/admin/settings/136.phpfpm.php @@ -99,7 +99,7 @@ return array( 'settinggroup' => 'phpfpm', 'varname' => 'use_mod_proxy', 'type' => 'bool', - 'default' => false, + 'default' => true, 'visible' => \Froxlor\Settings::Get('system.apache24'), 'save_method' => 'storeSettingField' ), diff --git a/install/froxlor.sql b/install/froxlor.sql index b09e50c3..a000ed3e 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -405,7 +405,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'defaultini', '1'), ('phpfpm', 'vhost_defaultini', '2'), ('phpfpm', 'fastcgi_ipcdir', '/var/lib/apache2/fastcgi/'), - ('phpfpm', 'use_mod_proxy', '0'), + ('phpfpm', 'use_mod_proxy', '1'), ('phpfpm', 'ini_flags', 'asp_tags display_errors display_startup_errors @@ -615,7 +615,7 @@ opcache.interned_strings_buffer'), ('system', 'letsencryptkeysize', '4096'), ('system', 'letsencryptreuseold', 0), ('system', 'leenabled', '0'), - ('system', 'leapiversion', '1'), + ('system', 'leapiversion', '2'), ('system', 'backupenabled', '0'), ('system', 'dnsenabled', '0'), ('system', 'dns_server', 'Bind'), @@ -683,7 +683,7 @@ opcache.interned_strings_buffer'), ('panel', 'customer_hide_options', ''), ('panel', 'is_configured', '0'), ('panel', 'version', '0.10.0-rc2'), - ('panel', 'db_version', '201907270'); + ('panel', 'db_version', '201909150'); DROP TABLE IF EXISTS `panel_tasks`; diff --git a/install/updates/froxlor/0.10/update_0.10.inc.php b/install/updates/froxlor/0.10/update_0.10.inc.php index f4f764ca..78624fdd 100644 --- a/install/updates/froxlor/0.10/update_0.10.inc.php +++ b/install/updates/froxlor/0.10/update_0.10.inc.php @@ -276,4 +276,39 @@ if (\Froxlor\Froxlor::isDatabaseVersion('201904250')) { lastStepStatus(0); \Froxlor\Froxlor::updateToDbVersion('201907270'); -} \ No newline at end of file +} + +if (\Froxlor\Froxlor::isDatabaseVersion('201907270')) { + + showUpdateStep("Cleaning up old files"); + $to_clean = array( + "actions/admin/settings/000.version.php", + "actions/admin/settings/190.ticket.php", + "admin_tickets.php", + "customer_tickets.php", + "install/scripts/language-check.php", + "install/updates/froxlor/upgrade_syscp.inc.php", + "lib/classes", + "lib/configfiles/precise.xml", + "lib/cron_init.php", + "lib/cron_shutdown.php", + "lib/formfields/admin/tickets", + "lib/formfields/customer/tickets", + "lib/functions.php", + "lib/functions", + "lib/navigation/10.tickets.php", + "scripts/classes", + "scripts/jobs", + "templates/Sparkle/admin/tickets", + "templates/Sparkle/customer/tickets" + ); + foreach ($to_clean as $filedir) { + $complete_filedir = \Froxlor\Froxlor::getInstallDir() . $filedir; + if (file_exsts($complete_filedir)) { + Froxlor\FileDir::safe_exec("rm -rf " . escapeshellarg($complete_filedir)); + } + } + lastStepStatus(0); + + \Froxlor\Froxlor::updateToDbVersion('201909150'); +} diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php index eff34ca5..f9a63b59 100644 --- a/lib/Froxlor/Froxlor.php +++ b/lib/Froxlor/Froxlor.php @@ -10,7 +10,7 @@ final class Froxlor const VERSION = '0.10.0-rc2'; // Database version (YYYYMMDDC where C is a daily counter) - const DBVERSION = '201907270'; + const DBVERSION = '201909150'; // Distribution branding-tag (used for Debian etc.) const BRANDING = '';