Missing properties

.gitignore

@@ -127,8 +127,4 @@ notes
 
 firmware/nrf5x/_build
 firmware/nrf5x/compiled
-webserver/data/*.json
-webserver/anisette-data/*
-!webserver/anisette-data/.gitkeep
-webserver/mh_data/*
-!webserver/mh_data/.gitkeep
+endpoint/data/*.json

endpoint/config.py

@@ -25,9 +25,13 @@ def getUser():
 def getPass():
     return config.get('Settings', 'pass', fallback=None)
 
+
 def getAnisetteServer():
     return config.get('Settings', 'anisette_url', fallback='http://anisette:6969')
 
+def getPort():
+    return int(config.get('Settings', 'port', fallback='6176'))
+
 
 def getConfigFile():
     return getConfigPath() + '/' + CONFIG_FILE

endpoint/mh_endpoint.py

@@ -128,7 +128,7 @@ def getAuth(regenerate=False, second_factor='sms'):
 
 
     Handler = ServerHandler
-    httpd = HTTPServer(('0.0.0.0', config.PORT), Handler)
+    httpd = HTTPServer(('0.0.0.0', config.getPort()), Handler)
     if os.path.isfile(config.getCertFile()):
         logger.info("Certificate file " + config.getCertFile() + " exists, so using SSL")
         ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
@@ -137,11 +137,11 @@ def getAuth(regenerate=False, second_factor='sms'):
 
         httpd.socket = ssl_context.wrap_socket(httpd.socket, server_side=True)
 
-        logger.info("serving at port " + str(config.PORT) + " over HTTPS")
+        logger.info("serving at port " + str(config.getPort()) + " over HTTPS")
     else:
         logger.info("Certificate file " + config.getCertFile() +
               " not found, so not using SSL")
-        logger.info("serving at port " + str(config.PORT) + " over HTTP")
+        logger.info("serving at port " + str(config.getPort()) + " over HTTP")
 
     try:
         httpd.serve_forever()