Skip to content

Commit 6142aae

Browse files
author
Slyke
committed
Fixed a typo where the password logic was being skipped over, causing the template logic to exit early
1 parent 5e983f7 commit 6142aae

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

.templates/nextcloud/build.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ def preBuild():
129129
with open(r'%s' % buildSettings) as objBuildSettingsFile:
130130
nextCloudYamlBuildOptions = yaml.load(objBuildSettingsFile)
131131
if (
132-
nextCloudYamlBuildOptions["databasePasswordOption"] == "Randomise database passwords for this build"
133-
or nextCloudYamlBuildOptions["databasePasswordOption"] == "Randomise database passwords every build"
132+
nextCloudYamlBuildOptions["databasePasswordOption"] == "Randomise passwords for this build"
133+
or nextCloudYamlBuildOptions["databasePasswordOption"] == "Randomise passwords every build"
134134
or nextCloudYamlBuildOptions["databasePasswordOption"] == "Use default passwords for this build"
135135
):
136136
if nextCloudYamlBuildOptions["databasePasswordOption"] == "Use default passwords for this build":
@@ -148,7 +148,7 @@ def preBuild():
148148
dockerComposeServicesYaml[serviceName]["environment"][envIndex] = envName.replace("%randomPassword%", mySqlRootPassword)
149149

150150
# Ensure you update the "Do nothing" and other 2 strings used for password settings in 'passwords.py'
151-
if (nextCloudYamlBuildOptions["databasePasswordOption"] == "Randomise database passwords for this build"):
151+
if (nextCloudYamlBuildOptions["databasePasswordOption"] == "Randomise passwords for this build"):
152152
nextCloudYamlBuildOptions["databasePasswordOption"] = "Do nothing"
153153
with open(buildSettings, 'w') as outputFile:
154154
yaml.dump(nextCloudYamlBuildOptions, outputFile)
@@ -181,7 +181,6 @@ def preBuild():
181181
with open(buildSettings, 'w') as outputFile:
182182
yaml.dump(nextCloudYamlBuildOptions, outputFile)
183183

184-
185184
return True
186185

187186
# #####################################

0 commit comments

Comments
 (0)