From c38d69374d1bb7cce1664e84a0ff1723ce5adc0b Mon Sep 17 00:00:00 2001
From: Zac Spitzer <zac.spitzer@gmail.com>
Date: Fri, 6 Dec 2024 14:41:24 +0100
Subject: [PATCH] always just write a password.txt

---
 lucee/lucee.xml.template | 95 ++--------------------------------------
 1 file changed, 3 insertions(+), 92 deletions(-)

diff --git a/lucee/lucee.xml.template b/lucee/lucee.xml.template
index 349bf7f..4179fe3 100644
--- a/lucee/lucee.xml.template
+++ b/lucee/lucee.xml.template
@@ -667,59 +667,13 @@ Please review ${installer_installation_log}.</text>
                 <!-- this is needed for linux with 5.4, otherwise the server doesn't finish deploying properly and setting a password fails -->
                 <httpGet>
                     <url>http://127.0.0.1:${tomcatport}/lucee/admin/server.cfm</url>
-                </httpGet>
-                <!--
-                <httpPost>
-                    <filename>${installdir}/tomcat/logs/server_post_result.txt</filename>
-                    <url>http://127.0.0.1:${tomcatport}/lucee/admin/server.cfm</url>
-                    <onErrorActionList>
-                        <logMessage>
-                            <text>${msg(warnings.setLuceeServerPass)}</text>
-                        </logMessage>
-                    </onErrorActionList>
-                    <queryParameterList>
-                        <queryParameter>
-                            <name>new_password</name>
-                            <value>${luceepass}</value>
-                        </queryParameter>
-                        <queryParameter>
-                            <name>new_password_re</name>
-                            <value>${luceepass}</value>
-                        </queryParameter>
-                    </queryParameterList>
-                    <ruleList>
-                        <portTest>
-                            <condition>cannot_bind</condition>
-                            <port>${tomcatport}</port>
-                        </portTest>
-                    </ruleList>
-                </httpPost>
-                <httpPost>
-                    <filename>${installdir}/tomcat/logs/web_post_result.txt</filename>
-                    <url>http://127.0.0.1:${tomcatport}/lucee/admin/web.cfm</url>
-                    <onErrorActionList>
-                        <logMessage>
-                            <text>${msg(warnings.setLuceeWebPass)}</text>
-                        </logMessage>
-                    </onErrorActionList>
-                    <queryParameterList>
-                        <queryParameter>
-                            <name>new_password</name>
-                            <value>${luceepass}</value>
-                        </queryParameter>
-                        <queryParameter>
-                            <name>new_password_re</name>
-                            <value>${luceepass}</value>
-                        </queryParameter>
-                    </queryParameterList>
                     <ruleList>
                         <portTest>
                             <condition>cannot_bind</condition>
                             <port>${tomcatport}</port>
                         </portTest>
                     </ruleList>
-                </httpPost>
-                -->
+                </httpGet>
                 <actionGroup>
                     <progressText>${msg(postInstall.configuringApache)}</progressText>
                     <actionList>
@@ -747,57 +701,14 @@ Please review ${installer_installation_log}.</text>
                     <customErrorMessage>${msg(warnings.LuceePostError)}: ${installer_error_message_original}</customErrorMessage>
                     <progressText>Securing Lucee Web Admins</progressText>
                     <actionList>
-                        <xmlFileGet>
-                            <attribute>hspw</attribute>
-                            <element>/cfLuceeConfiguration</element>
-                            <file>${installdir}/tomcat/lucee-server/context/lucee-server.xml</file>
-                            <variable>hspw</variable>
-                            <ruleList>
-                                <!-- lucee 6 uses json rather than xml -->
-
-                                <fileExists>
-                                    <path>${installdir}/tomcat/lucee-server/context/lucee-server.xml</path>
-                                </fileExists>
-                            </ruleList>
-                        </xmlFileGet>
-                        <xmlFileSet>
-                            <attribute>default-hspw</attribute>
-                            <element>/cfLuceeConfiguration</element>
-                            <file>${installdir}/tomcat/lucee-server/context/lucee-server.xml</file>
-                            <value>${hspw}</value>
-                            <ruleList>
-                                <!-- lucee 6 uses json rather than xml -->
-
-                                <fileExists>
-                                    <path>${installdir}/tomcat/lucee-server/context/lucee-server.xml</path>
-                                </fileExists>
-                                <compareValues>
-                                    <logic>does_not_equal</logic>
-                                    <value1>${hspw}</value1>
-                                    <value2></value2>
-                                </compareValues>
-                                <portTest>
-                                    <condition>can_bind</condition>
-                                    <port>${tomcatport}</port>
-                                </portTest>
-                            </ruleList>
-                        </xmlFileSet>
-
-                        <!-- lucee 6 uses json rather than xml, install builder doesn't support json, so lets drop a password.txt -->
+                        <!-- write out a password.txt -->
                         <createDirectory>
                             <path>${installdir}/tomcat/lucee-server/context/</path>
                         </createDirectory>
-
+                    
                         <writeFile>
                             <path>${installdir}/tomcat/lucee-server/context/password.txt</path>
                             <text>${luceepass}</text>
-                            <ruleList>
-                                <fileExists negate="1">
-                                    <!-- other approach, check for .CFConfig.json -->
-
-                                    <path>${installdir}/tomcat/lucee-server/context/lucee-server.xml</path>
-                                </fileExists>
-                            </ruleList>
                         </writeFile>
                     </actionList>
                 </actionGroup>