Merge pull request #85 from NethServer/fixWebserver

Fix the overwrite of database during upgrade NethServer/dev#7194

Author: stephdl

imageroot/actions/create-vhost/10base

@@ -48,10 +48,16 @@ MaxFileUploads = data.get("MaxFileUploads",'20')
 h2hs = data.get("http2https", True)
 le = data.get("lets_encrypt", False)
 
-with open("databases/NextFpmPort", "r+") as fp:
-    NextFpmPort = int(fp.read() or "9000") + 1
-    fp.seek(0)
-    fp.write(str(NextFpmPort))
+# read Netxfpmport, the file could be missing so we need to handle the exception
+try:
+    with open("databases/NextFpmPort", "r+") as fp:
+        NextFpmPort = int(fp.read() or "9000") + 1
+        fp.seek(0)
+        fp.write(str(NextFpmPort))
+except FileNotFoundError:
+    NextFpmPort = 9001
+    with open("databases/NextFpmPort", "w") as fp:
+        fp.write(str(NextFpmPort))
 
 config['vhost'] = {}
 config['vhost']['ServerNames'] = ','.join(ServerNames)

imageroot/actions/get-configuration/20read

@@ -53,10 +53,12 @@ for file in glob.iglob("databases/vhosts/*.ini"):
     vhosts.append(vhost)
 
 configuration['virtualhost'] = vhosts
-# read Netxfpmport
-with open("databases/NextFpmPort", "r") as fp:
-    NextFpmPort = int(fp.read() or "9000") + 1
-fp.close()
+# read Netxfpmport, the file could be missing so we need to handle the exception
+try:
+    with open("databases/NextFpmPort", "r") as fp:
+        NextFpmPort = int(fp.read() or "9000") + 1
+except FileNotFoundError:
+    NextFpmPort = 9001
 
 configuration['NextFpmPort'] = NextFpmPort