From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 14 Dec 2014 02:58:27 +0000 (+0100)
Subject: Added WCF 2.0 package update servers
X-Git-Tag: 2.1.0_Beta_1~15
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=37089cb5c7f3b9619249459d9411197c9c18a09a;p=GitHub%2FWoltLab%2FWCF.git

Added WCF 2.0 package update servers
---

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index d3e9ab261c..b265efd8f1 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -43,12 +43,15 @@
 		<instruction type="script">acp/post_install.php</instruction>
 	</instructions>
 	
+	<!--
+		Update has not been tested with the changes since Alpha 1, disabled for now and will return in a future beta release (NOT beta 1!)
+		
 	<instructions type="update" fromversion="2.0.10">
-		<!-- pre-update check to prevent update from WCF < 2.0.10 -->
+		--><!-- pre-update check to prevent update from WCF < 2.0.10 --><!--
 		<instruction type="file">pre_update_check.tar</instruction>
 		<instruction type="script" run="standalone">acp/pre_update_com.woltlab.wcf_2.1.php</instruction>
 		
-		<!-- the actual update -->
+		--><!-- the actual update --><!--
 		<instruction type="option" run="standalone">option.xml</instruction>
 		
 		<instruction type="file">files_update.tar</instruction>
@@ -84,17 +87,5 @@
 		
 		<instruction type="script" run="standalone">acp/update_mqc_com.woltlab.wcf_2.1.php</instruction>
 	</instructions>
-	
-	<!-- internal update to roll out some changes -->
-	<instructions type="update" fromversion="2.1.0 Alpha 1">
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
-		<instruction type="file">files_update.tar</instruction>
-		<instruction type="template">templates_update.tar</instruction>
-		
-		<instruction type="language" run="standalone">language/*.xml</instruction>
-		
-		<instruction type="style">blue-temptation-style.tgz</instruction>
-		
-		<instruction type="bbcode">bbcode.xml</instruction>
-	</instructions>
+	 -->
 </package>
diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 87e7948140..5684f29ca3 100644
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -1765,6 +1765,8 @@ INSERT INTO wcf1_user_group_option_value (groupID, optionID, optionValue) VALUES
 INSERT INTO wcf1_user_group_option_value (groupID, optionID, optionValue) VALUES (4, 3, '1');	-- Administrators
 
 -- default update servers
+INSERT INTO wcf1_package_update_server (serverURL, status, isDisabled, errorMessage, lastUpdateTime, loginUsername, loginPassword) VALUES ('http://update.woltlab.com/maelstrom/', 'online', 0, NULL, 0, '', '');
+INSERT INTO wcf1_package_update_server (serverURL, status, isDisabled, errorMessage, lastUpdateTime, loginUsername, loginPassword) VALUES ('http://store.woltlab.com/maelstrom/', 'online', 0, NULL, 0, '', '');
 INSERT INTO wcf1_package_update_server (serverURL, status, isDisabled, errorMessage, lastUpdateTime, loginUsername, loginPassword) VALUES ('http://update.woltlab.com/typhoon/', 'online', 0, NULL, 0, '', '');
 INSERT INTO wcf1_package_update_server (serverURL, status, isDisabled, errorMessage, lastUpdateTime, loginUsername, loginPassword) VALUES ('http://store.woltlab.com/typhoon/', 'online', 0, NULL, 0, '', '');