From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Wed, 10 Mar 2021 15:40:39 +0000 (+0100)
Subject: Deploy the INTERNAL_HOSTNAMES option before deploying files
X-Git-Tag: 5.4.0_Alpha_1~177
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b36f725afaad6489a5be1638930a90b0614c7c01;p=GitHub%2FWoltLab%2FWCF.git

Deploy the INTERNAL_HOSTNAMES option before deploying files

Resolves #4065
---

diff --git a/com.woltlab.wcf/option_5.4.xml b/com.woltlab.wcf/option_5.4.xml
new file mode 100644
index 0000000000..1db06c0fe8
--- /dev/null
+++ b/com.woltlab.wcf/option_5.4.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/2019/option.xsd">
+	<import>
+		<options>
+			<option name="internal_hostnames">
+				<categoryname>general.page</categoryname>
+				<optiontype>textarea</optiontype>
+			</option>
+		</options>
+	</import>
+</data>
diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index da1f40f5d5..712c051f95 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -73,6 +73,9 @@ tar cvf com.woltlab.wcf/files_pre.tar -C wcfsetup/install/files/ \
 	lib/system/package/plugin/FilePackageInstallationPlugin.class.php
 		-->
 		<instruction type="file" run="standalone">files_pre.tar</instruction>
+		
+		<!-- Deploy some of the options before running the upgrade to not brick the login if the upgrade aborts. -->
+		<instruction type="option" run="standalone">option_5.4.xml</instruction>
 
 		<!-- Preparations for the new session system. -->
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_session_1_cookies.php</instruction>
@@ -84,7 +87,7 @@ tar cvf com.woltlab.wcf/files_pre.tar -C wcfsetup/install/files/ \
 		<instruction type="acpTemplate" />
 		<instruction type="template" />
 		
-		<!-- Make the new options available as early as possible. -->
+		<!-- Make all the new options available as early as possible. -->
 		<instruction type="option" run="standalone" />
 		
 		<!-- Cleanup for the new session system. -->