Fixed deconz setting being overwritten on password update. Updated network IP address to confirm to RFC1918

Author: Slyke

.templates/deconz/build.py

@@ -98,13 +98,6 @@ def preBuild():
     global currentServiceName
     with open("{serviceDir}{buildSettings}".format(serviceDir=serviceService, buildSettings=buildSettingsFileName)) as objHardwareListFile:
       deconzYamlBuildOptions = yaml.load(objHardwareListFile)
-    try:
-      if "deconz" in dockerComposeServicesYaml:
-        dockerComposeServicesYaml["deconz"]["devices"] = deconzYamlBuildOptions["hardware"]
-    except Exception as err:
-      print("Error setting deconz hardware: ", err)
-      return False
-
     # Password randomisation
     # Multi-service:
     with open((r'%s/' % serviceTemplate) + servicesFileName) as objServiceFile:
@@ -126,47 +119,45 @@ def preBuild():
 
     if os.path.exists(buildSettings):
       # Password randomisation
-      with open(r'%s' % buildSettings) as objBuildSettingsFile:
-        deconzYamlBuildOptions = yaml.load(objBuildSettingsFile)
-        if "databasePasswordOption" in deconzYamlBuildOptions:
-          if (
-            deconzYamlBuildOptions["databasePasswordOption"] == "Randomise database password for this build"
-            or deconzYamlBuildOptions["databasePasswordOption"] == "Randomise database password every build"
-            or deconzYamlBuildOptions["databasePasswordOption"] == "Use default password for this build"
-          ):
-            if deconzYamlBuildOptions["databasePasswordOption"] == "Use default password for this build":
-              newPassword = "IOtSt4ckDec0nZ"
-            else:
-              newPassword = generateRandomString()
-            for (index, serviceName) in enumerate(serviceYamlTemplate):
-              dockerComposeServicesYaml[serviceName] = serviceYamlTemplate[serviceName]
-              if "environment" in serviceYamlTemplate[serviceName]:
-                for (envIndex, envName) in enumerate(serviceYamlTemplate[serviceName]["environment"]):
-                  envName = envName.replace("%randomPassword%", newPassword)
-                  dockerComposeServicesYaml[serviceName]["environment"][envIndex] = envName
-
-            # Ensure you update the "Do nothing" and other 2 strings used for password settings in 'passwords.py'
-            if (deconzYamlBuildOptions["databasePasswordOption"] == "Randomise database password for this build"):
-              deconzYamlBuildOptions["databasePasswordOption"] = "Do nothing"
-              with open(buildSettings, 'w') as outputFile:
-                yaml.dump(deconzYamlBuildOptions, outputFile)
-          else: # Do nothing - don't change password
-            for (index, serviceName) in enumerate(buildCacheServices):
-              if serviceName in buildCacheServices: # Load service from cache if exists (to maintain password)
-                dockerComposeServicesYaml[serviceName] = buildCacheServices[serviceName]
-              else:
-                dockerComposeServicesYaml[serviceName] = serviceYamlTemplate[serviceName]
-        else:
-          print("Deconz Warning: Build settings file not found, using default password")
-          time.sleep(1)
-          newPassword = "IOtSt4ckDec0nZ"
+      if "databasePasswordOption" in deconzYamlBuildOptions:
+        if (
+          deconzYamlBuildOptions["databasePasswordOption"] == "Randomise database password for this build"
+          or deconzYamlBuildOptions["databasePasswordOption"] == "Randomise database password every build"
+          or deconzYamlBuildOptions["databasePasswordOption"] == "Use default password for this build"
+        ):
+          if deconzYamlBuildOptions["databasePasswordOption"] == "Use default password for this build":
+            newPassword = "IOtSt4ckDec0nZ"
+          else:
+            newPassword = generateRandomString()
           for (index, serviceName) in enumerate(serviceYamlTemplate):
             dockerComposeServicesYaml[serviceName] = serviceYamlTemplate[serviceName]
             if "environment" in serviceYamlTemplate[serviceName]:
               for (envIndex, envName) in enumerate(serviceYamlTemplate[serviceName]["environment"]):
                 envName = envName.replace("%randomPassword%", newPassword)
                 dockerComposeServicesYaml[serviceName]["environment"][envIndex] = envName
 
+          # Ensure you update the "Do nothing" and other 2 strings used for password settings in 'passwords.py'
+          if (deconzYamlBuildOptions["databasePasswordOption"] == "Randomise database password for this build"):
+            deconzYamlBuildOptions["databasePasswordOption"] = "Do nothing"
+            with open(buildSettings, 'w') as outputFile:
+              yaml.dump(deconzYamlBuildOptions, outputFile)
+        else: # Do nothing - don't change password
+          for (index, serviceName) in enumerate(buildCacheServices):
+            if serviceName in buildCacheServices: # Load service from cache if exists (to maintain password)
+              dockerComposeServicesYaml[serviceName] = buildCacheServices[serviceName]
+            else:
+              dockerComposeServicesYaml[serviceName] = serviceYamlTemplate[serviceName]
+      else:
+        print("Deconz Warning: Build settings file not found, using default password")
+        time.sleep(1)
+        newPassword = "IOtSt4ckDec0nZ"
+        for (index, serviceName) in enumerate(serviceYamlTemplate):
+          dockerComposeServicesYaml[serviceName] = serviceYamlTemplate[serviceName]
+          if "environment" in serviceYamlTemplate[serviceName]:
+            for (envIndex, envName) in enumerate(serviceYamlTemplate[serviceName]["environment"]):
+              envName = envName.replace("%randomPassword%", newPassword)
+              dockerComposeServicesYaml[serviceName]["environment"][envIndex] = envName
+
       deconzYamlBuildOptions["databasePasswordOption"] = "Do nothing"
       with open(buildSettings, 'w') as outputFile:
         yaml.dump(deconzYamlBuildOptions, outputFile)
@@ -187,11 +178,18 @@ def preBuild():
           "service": "Deconz",
           "comment": "Deconz Build Options"
         }
-
+        
       deconzYamlBuildOptions["databasePasswordOption"] = "Do nothing"
       with open(buildSettings, 'w') as outputFile:
         yaml.dump(deconzYamlBuildOptions, outputFile)
 
+    try:
+      if currentServiceName in dockerComposeServicesYaml:
+        dockerComposeServicesYaml[currentServiceName]["devices"] = deconzYamlBuildOptions["hardware"]
+    except Exception as err:
+      print("Error setting deconz hardware: ", err)
+      return False
+
     return True
 
   # #####################################

.templates/env.yml

@@ -6,8 +6,8 @@ networks:
     ipam:
       driver: default
       config:
-        - subnet: 192.16.238.0/24
-        # - gateway: 192.16.238.1
+        - subnet: 10.77.60.0/24
+        # - gateway: 10.77.60.1
 
   iotstack_nw_internal: # For interservice communication. No access to outside
     name: IOTstack_Net_Internal
@@ -16,16 +16,16 @@ networks:
     ipam:
       driver: default
       config:
-        - subnet: 192.16.230.0/24
-        # - gateway: 192.16.238.1
+        - subnet: 10.77.76.0/24
+        # - gateway: 10.77.76.1
 
   vpn_nw: # Network specifically for VPN
     name: IOTstack_VPN
     driver: bridge
     ipam:
       driver: default
       config:
-        - subnet: 192.18.200.0/24
+        - subnet: 10.77.88.0/24
         # - gateway: 192.18.200.1
 
   nextcloud_internal: # Network for NextCloud service