Dockerfile

@@ -20,7 +20,7 @@ WORKDIR /app
 COPY ./gmnd/__init__.py .
 COPY ./content content
 COPY ./cgi-bin cgi-bin
-COPY dockerconf.yml ./config.yml
+COPY config.yml .
 COPY --from=build-stage /app/certs certs
 EXPOSE 1965
 CMD ["python", "__init__.py", "--file", "./config.yml" ]

README.md

@@ -10,8 +10,11 @@ curl https://repo.mic.ke/PUBLIC.KEY | sudo apt-key add -
 curl https://repo.mic.ke/debian/debian-micke-unstable.list | sudo tee /etc/apt/sources.list.d/debian-micke-unstable.list
 sudo apt update && sudo apt install gmnd
 ```
-
-
+Unless you are using resolvconf and systemd-resolvd, NetworkManager might empty /etc/resolv.conf when you remove the last tunnel. This step is optional, but recommended:
+```
+sudo apt install resolvconf
+sudo systemctl restart systemd-resolved.service
+```
 
 ### RPM
 ```

dockerconf.yml

@@ -1,15 +0,0 @@
----
-# Uncomment below line to allow automtic directory indexing
-allow_dir_list: true
-# Below is default bas path for your content
-base_path: ./content
-# To allow connectiond from the outside, set listen address below
-listen_addr: '0.0.0.0'
-# To set debug logging, uncomment below line
-logg_level: 'DEBUG'
-# To enable cgi functionality, configure something like below
-cgi_registry:
-     /envtest.*: 
-      - ./cgi-bin/envtest.sh
-server_cert: ./certs/cert.pem
-server_key: ./certs/cert.key

gmnd/__init__.py

@@ -44,10 +44,7 @@ class gMNd:
 
     def read_config(self):
         with open(self.config_file) as configfile:
-            try:
-                config_dict = yaml.load(configfile, Loader=yaml.FullLoader)
-            except AttributeError:
-                config_dict = yaml.safe_load(configfile)
+            config_dict = yaml.load(configfile, Loader=yaml.FullLoader)
             if 'allow_dir_list' in config_dict:
                 self.allow_dir_list = config_dict['allow_dir_list']
             if 'base_path' in config_dict: