made init easier

.gitignore

@@ -1,4 +1,4 @@
-trufi-server-modules
+trufi-*-modules
 modules
 data/nginx/interweb
 data/nginx/intraweb
@@ -11,3 +11,4 @@ data/www
 data/certbot
 .vscode
 test
+.directory

docker-compose.yml

@@ -1,24 +1,21 @@
 version: '3'
 services:
-
   chief-nginx:
-    image: nginx #:1.15-alpine
+    image: nginx
     ports:
-      - "8290:80" # HTTP
-      - "8300:443" # HTTPS
-      - "127.0.0.1:8090:8090" # intraweb port.
+    - 8290:80
+    - 8300:443
+    - 127.0.0.1:8090:8090
     volumes:
-      - ./data/nginx/interweb:/etc/nginx/interweb:ro
-      - ./data/nginx/intraweb:/etc/nginx/intraweb:ro
-      - ./data/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
-      - ./data/nginx/inc:/etc/nginx/inc:ro
-      - ./data/logs/nginx:/var/log/nginx/
-      - ./data/letsencrypt/config:/etc/letsencrypt
-      #- ./data/certbot/www:/var/www/certbot
-      - ./data/nginx/www:/var/www/html:ro
-    command: "nginx -g \"daemon off;\""
+    - ./data/nginx/interweb:/etc/nginx/interweb:ro
+    - ./data/nginx/intraweb:/etc/nginx/intraweb:ro
+    - ./data/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+    - ./data/nginx/inc:/etc/nginx/inc:ro
+    - ./data/logs/nginx:/var/log/nginx/
+    - ./data/letsencrypt/config:/etc/letsencrypt
+    - ./data/nginx/www:/var/www/html:ro
+    command: nginx -g "daemon off;"
     restart: unless-stopped
-
 networks:
   default:
     name: trufi-server-multi

modifyComposes.py

@@ -31,7 +31,6 @@ def orangeprint(text):
 		sfile = open(composefile, "r")
 		dockercompose = yaml.safe_load(sfile.read())
 		sfile.close()
-		os.remove(composefile)
 
 		servicesToRename = []
 		for service in dockercompose["services"]:
@@ -67,6 +66,16 @@ def orangeprint(text):
 		sfile.write(yaml.dump(dockercompose, sort_keys=False, default_flow_style=False))
 		sfile.close()
 
+orangeprint("patching chief")
+sfile = open("docker-compose.yml", "r")
+dockercompose = yaml.safe_load(sfile.read())
+sfile.close()
+dockercompose["networks"]["default"]["name"] = os.path.basename(os.getcwd())
+sfile = open("docker-compose.yml", "w")
+sfile.write(yaml.dump(dockercompose, sort_keys=False, default_flow_style=False))
+sfile.close()
+
+
 orangeprint("patching chief plugins")
 pluginsChiefDir = os.path.join("plugins", "chief")
 for chief in os.listdir(pluginsChiefDir):
@@ -76,7 +85,6 @@ def orangeprint(text):
 		sfile = open(chiefPath, "r")
 		dockercompose = yaml.safe_load(sfile.read())
 		sfile.close()
-		os.remove(chiefPath)
 
 		servicesToRename = []
 		for service in dockercompose["services"]: