From 3117f2e70389b0a3e03a683ec8b03e4e0a7eea87 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 31 Jan 2016 10:00:34 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/scripts/ispconfig_update.php | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/server/scripts/ispconfig_update.php b/server/scripts/ispconfig_update.php
index 2a5deed..42196cd 100644
--- a/server/scripts/ispconfig_update.php
+++ b/server/scripts/ispconfig_update.php
@@ -88,7 +88,7 @@
echo "\n\n>> Update \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', 'git'), 'stable');
+$method = simple_query('Select update method', array('stable', 'git-stable', 'git-master'), 'stable');
if($method == 'stable') {
$new_version = @file_get_contents('http://www.ispconfig.org/downloads/ispconfig3_version.txt') or die('Unable to retrieve version file.');
@@ -99,6 +99,9 @@
} else {
echo "There are no updates available for ISPConfig ".ISPC_APP_VERSION."\n";
}
+} elseif ($method == 'git-stable') {
+ passthru('/usr/local/ispconfig/server/scripts/update_from_dev_stable.sh');
+ exit;
} else {
passthru('/usr/local/ispconfig/server/scripts/update_from_dev.sh');
exit;
--
Gitblit v1.9.1