Merge pull request #362 from SensorsIot/nextcloud-pw-fix

Fixed a typo where the password logic was being skipped over, causing…

Author: Slyke

.templates/nextcloud/build.py

@@ -129,8 +129,8 @@ def preBuild():
       with open(r'%s' % buildSettings) as objBuildSettingsFile:
         nextCloudYamlBuildOptions = yaml.load(objBuildSettingsFile)
         if (
-          nextCloudYamlBuildOptions["databasePasswordOption"] == "Randomise database passwords for this build"
-          or nextCloudYamlBuildOptions["databasePasswordOption"] == "Randomise database passwords every build"
+          nextCloudYamlBuildOptions["databasePasswordOption"] == "Randomise passwords for this build"
+          or nextCloudYamlBuildOptions["databasePasswordOption"] == "Randomise passwords every build"
           or nextCloudYamlBuildOptions["databasePasswordOption"] == "Use default passwords for this build"
         ):
           if nextCloudYamlBuildOptions["databasePasswordOption"] == "Use default passwords for this build":
@@ -148,7 +148,7 @@ def preBuild():
                 dockerComposeServicesYaml[serviceName]["environment"][envIndex] = envName.replace("%randomPassword%", mySqlRootPassword)
 
           # Ensure you update the "Do nothing" and other 2 strings used for password settings in 'passwords.py'
-          if (nextCloudYamlBuildOptions["databasePasswordOption"] == "Randomise database passwords for this build"):
+          if (nextCloudYamlBuildOptions["databasePasswordOption"] == "Randomise passwords for this build"):
             nextCloudYamlBuildOptions["databasePasswordOption"] = "Do nothing"
             with open(buildSettings, 'w') as outputFile:
               yaml.dump(nextCloudYamlBuildOptions, outputFile)
@@ -181,7 +181,6 @@ def preBuild():
       with open(buildSettings, 'w') as outputFile:
         yaml.dump(nextCloudYamlBuildOptions, outputFile)
 
-
     return True
 
   # #####################################