Added WCF 2.0 package update servers

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index d3e9ab261c56b7fb0dc3752f11c9dcfb5a24d74f..b265efd8f12b434c6ae4306e281f074b5089ba53 100644 (file)
--- 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 87e7948140285496fdaded337c8ebb232b5b6fd9..5684f29ca30a3e93b50a3c30315f7320434c7bf7 100644 (file)
--- 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, '', '');