From 3d2b249be9d847b3dcdaf40c4c177bc32dab5f0a Mon Sep 17 00:00:00 2001 From: thom Date: Wed, 29 Jul 2020 12:26:30 +0200 Subject: [PATCH 1/6] Fix typo --- server/scripts/ispconfig_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/scripts/ispconfig_update.php b/server/scripts/ispconfig_update.php index 2c77607b65..95652ce747 100644 --- a/server/scripts/ispconfig_update.php +++ b/server/scripts/ispconfig_update.php @@ -86,7 +86,7 @@ echo " _____ ___________ _____ __ _ |___/ "; echo "\n".str_repeat('-', 80)."\n"; 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"; +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 servers, before you update master server.\n\n"; $method = simple_query('Select update method', array('stable', 'git-stable', 'git-master'), 'stable'); -- GitLab From ba75baa71a7f096cbb0691fff02790d20e6654bf Mon Sep 17 00:00:00 2001 From: thom Date: Wed, 29 Jul 2020 12:28:31 +0200 Subject: [PATCH 2/6] Use stable-3.2 branch for git-stable --- server/scripts/update_from_dev_stable.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/scripts/update_from_dev_stable.sh b/server/scripts/update_from_dev_stable.sh index a5dc10605b..693d76fa3b 100644 --- a/server/scripts/update_from_dev_stable.sh +++ b/server/scripts/update_from_dev_stable.sh @@ -10,7 +10,7 @@ exit 1 } -wget -O ispconfig3-dev.tar.gz "https://git.ispconfig.org/ispconfig/ispconfig3/repository/archive.tar.gz?ref=stable-3.1" +wget -O ispconfig3-dev.tar.gz "https://git.ispconfig.org/ispconfig/ispconfig3/repository/archive.tar.gz?ref=stable-3.2" tar xzf ispconfig3-dev.tar.gz echo -n "Latest git version: " -- GitLab From 9f1809cfee90f33a8c24e8e6fbd26a05ea6a7aaa Mon Sep 17 00:00:00 2001 From: thom Date: Wed, 29 Jul 2020 12:30:43 +0200 Subject: [PATCH 3/6] Use stable-3.2 branch --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5c251c0e28..01c6f115de 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # ISPConfig - Hosting Control Panel Nightly (master): [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/master/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/master) -Stable branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/stable-3.1/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/stable-3.1) +Stable branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/stable-3.2/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/stable-3.2) - Manage multiple servers from one control panel @@ -11,4 +11,4 @@ Stable branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig - Virtualization (OpenVZ) - Administrator, reseller and client login - Configuration mirroring and clusters -- Open Source software (BSD license) \ No newline at end of file +- Open Source software (BSD license) -- GitLab From 89aab77789674b771acc52449ec314322e28f32b Mon Sep 17 00:00:00 2001 From: thom Date: Thu, 3 Sep 2020 18:16:41 +0200 Subject: [PATCH 4/6] Change update note --- server/scripts/ispconfig_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/scripts/ispconfig_update.php b/server/scripts/ispconfig_update.php index 95652ce747..ab9ab1a9b0 100644 --- a/server/scripts/ispconfig_update.php +++ b/server/scripts/ispconfig_update.php @@ -86,7 +86,7 @@ echo " _____ ___________ _____ __ _ |___/ "; echo "\n".str_repeat('-', 80)."\n"; 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 servers, 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: Enable maintenance mode and update your master server first. Then update all slave servers, and disable maintenance mode when all servers are updated.\n\n"; $method = simple_query('Select update method', array('stable', 'git-stable', 'git-master'), 'stable'); -- GitLab From 63ae4071a96ce1556fbe34a158ff089a052e4af4 Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Tue, 8 Sep 2020 15:16:53 +0200 Subject: [PATCH 5/6] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 01c6f115de..1ffa151993 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # ISPConfig - Hosting Control Panel -Nightly (master): [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/master/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/master) -Stable branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/stable-3.2/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/stable-3.2) +Development branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/develop/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/develop) - Manage multiple servers from one control panel -- GitLab From ea591d477d281455b0dcc82a135d0ded7c0e4819 Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Thu, 10 Sep 2020 12:37:26 +0200 Subject: [PATCH 6/6] Update ispconfig_update.php --- server/scripts/ispconfig_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/scripts/ispconfig_update.php b/server/scripts/ispconfig_update.php index e0e75e529f..ed416b6efa 100644 --- a/server/scripts/ispconfig_update.php +++ b/server/scripts/ispconfig_update.php @@ -86,7 +86,7 @@ echo " _____ ___________ _____ __ _ |___/ "; echo "\n".str_repeat('-', 80)."\n"; 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: Enable maintenance mode and update your master server first. Then update all slave servers, and disable maintenance mode when all servers are updated.\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: On Multiserver systems, enable maintenance mode and update your master server first. Then update all slave servers, and disable maintenance mode when all servers are updated.\n\n"; $method = simple_query('Select update method', array('stable', 'nightly', 'git-develop'), 'stable'); -- GitLab