From f7ec00b2f8ba3efc5bdeacef9c813f8a826ae3be Mon Sep 17 00:00:00 2001
From: Patrick Anders <p.anders@timmehosting.de>
Date: Wed, 10 Dec 2014 08:44:26 -0500
Subject: [PATCH] add Spdy option - http://en.wikipedia.org/wiki/SPDY
---
server/scripts/ispconfig_update.php | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/scripts/ispconfig_update.php b/server/scripts/ispconfig_update.php
index 6843e7b..2a5deed 100644
--- a/server/scripts/ispconfig_update.php
+++ b/server/scripts/ispconfig_update.php
@@ -86,21 +86,21 @@
|___/ ";
echo "\n".str_repeat('-', 80)."\n";
echo "\n\n>> Update \n\n";
-echo "Please choose the update method. For production systems select 'stable'. \nThe update from svn is only for development systems and may break your current setup.\nNote: Update all slave server, before you update master server.\n\n";
+echo "Please choose the update method. For production systems select 'stable'. \nWARNING: The update from GIT is only for development systems and may break your current setup. Do not use the GIT version on servers that host any live websites!\nNote: Update all slave server, before you update master server.\n\n";
-$method = simple_query('Select update method', array('stable', 'svn'), 'stable');
+$method = simple_query('Select update method', array('stable', 'git'), 'stable');
if($method == 'stable') {
$new_version = @file_get_contents('http://www.ispconfig.org/downloads/ispconfig3_version.txt') or die('Unable to retrieve version file.');
$new_version = trim($new_version);
- if($new_version != ISPC_APP_VERSION) {
+ if(version_compare($new_version, ISPC_APP_VERSION, '>')) {
passthru('/usr/local/ispconfig/server/scripts/update_from_tgz.sh');
exit;
} else {
echo "There are no updates available for ISPConfig ".ISPC_APP_VERSION."\n";
}
} else {
- passthru('/usr/local/ispconfig/server/scripts/update_from_svn.sh');
+ passthru('/usr/local/ispconfig/server/scripts/update_from_dev.sh');
exit;
}
--
Gitblit v1.9.1