maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

set version to 0.10.0-rc1 for upcoming release candidate

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2019-04-10 08:24:04 +02:00
parent 13ac7ef66c
commit cbebd0a9ac
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
install/froxlor.sql
View File

@@ -680,8 +680,8 @@ opcache.interned_strings_buffer'),
('panel', 'password_special_char', '!?<>§$%+#=@'), ('panel', 'password_special_char', '!?<>§$%+#=@'),
('panel', 'customer_hide_options', ''), ('panel', 'customer_hide_options', ''),
('panel', 'is_configured', '0'), ('panel', 'is_configured', '0'),
('panel', 'version', '0.10.0'), ('panel', 'version', '0.10.0-rc1'),
('panel', 'db_version', '201902210'); ('panel', 'db_version', '201904100');
DROP TABLE IF EXISTS `panel_tasks`; DROP TABLE IF EXISTS `panel_tasks`;

11
install/updates/froxlor/0.10/update_0.10.inc.php
View File

@@ -24,7 +24,7 @@ if (! defined('_CRON_UPDATE')) {
} }
if (\Froxlor\Froxlor::isFroxlorVersion('0.9.40.1')) { if (\Froxlor\Froxlor::isFroxlorVersion('0.9.40.1')) {
showUpdateStep("Updating from 0.9.40.1 to 0.10.0", false); showUpdateStep("Updating from 0.9.40.1 to 0.10.0-rc1", false);
showUpdateStep("Adding new api keys table"); showUpdateStep("Adding new api keys table");
Database::query("DROP TABLE IF EXISTS `api_keys`;"); Database::query("DROP TABLE IF EXISTS `api_keys`;");
@@ -68,7 +68,7 @@ if (\Froxlor\Froxlor::isFroxlorVersion('0.9.40.1')) {
} }
lastStepStatus(0); lastStepStatus(0);
\Froxlor\Froxlor::updateToVersion('0.10.0'); \Froxlor\Froxlor::updateToVersion('0.10.0-rc1');
} }
if (\Froxlor\Froxlor::isDatabaseVersion('201809280')) { if (\Froxlor\Froxlor::isDatabaseVersion('201809280')) {
@@ -233,3 +233,10 @@ if (\Froxlor\Froxlor::isDatabaseVersion('201902170')) {
\Froxlor\Froxlor::updateToDbVersion('201902210'); \Froxlor\Froxlor::updateToDbVersion('201902210');
} }
if (\Froxlor\Froxlor::isDatabaseVersion('201902210')) {
// set correct version for people that have tested 0.10.0 before
\Froxlor\Froxlor::updateToVersion('0.10.0-rc1');
\Froxlor\Froxlor::updateToDbVersion('201904100');
}

4
lib/Froxlor/Cron/Http/Apache.php
View File

@@ -784,14 +784,14 @@ class Apache extends HttpConfigBase
'DOMAIN' => $domain['domain'], 'DOMAIN' => $domain['domain'],
'CUSTOMER' => $domain['loginname'] 'CUSTOMER' => $domain['loginname']
)); ));
$logfiles_text .= ' ErrorLog "| ' . $command . "\"\n"; $logfiles_text .= ' ErrorLog "|' . $command . "\"\n";
// replace for access_log // replace for access_log
$command = \Froxlor\PhpHelper::replaceVariables(Settings::Get('system.logfiles_script'), array( $command = \Froxlor\PhpHelper::replaceVariables(Settings::Get('system.logfiles_script'), array(
'LOGFILE' => $access_log, 'LOGFILE' => $access_log,
'DOMAIN' => $domain['domain'], 'DOMAIN' => $domain['domain'],
'CUSTOMER' => $domain['loginname'] 'CUSTOMER' => $domain['loginname']
)); ));
$logfiles_text .= ' CustomLog "| ' . $command . '" ' . $logtype . "\n"; $logfiles_text .= ' CustomLog "|' . $command . '" ' . $logtype . "\n";
} else { } else {
// Create the logfile if it does not exist (fixes #46) // Create the logfile if it does not exist (fixes #46)
touch($error_log); touch($error_log);

4
lib/Froxlor/Froxlor.php
View File

@@ -7,10 +7,10 @@ final class Froxlor
{ {
// Main version variable // Main version variable
const VERSION = '0.10.0'; const VERSION = '0.10.0-rc1';
// Database version (YYYYMMDDC where C is a daily counter) // Database version (YYYYMMDDC where C is a daily counter)
const DBVERSION = '201902210'; const DBVERSION = '201904100';
// Distribution branding-tag (used for Debian etc.) // Distribution branding-tag (used for Debian etc.)
const BRANDING = ''; const BRANDING = '';