Merge branch 'master' of ssh://pagure.io/fm-orchestrator into ridad

rida.conf

@@ -9,6 +9,10 @@ pdc_insecure = True
 pdc_develop = True
 scmurls = ["git://pkgs.stg.fedoraproject.org/modules/"]
 
+# Where we should run when running rida.py directly.
+host = 127.0.0.1
+port = 5000
+
 # How often should we resort to polling, in seconds
 # Set to zero to disable polling
 polling_interval = 60

rida.py

@@ -165,6 +165,8 @@ def query_build(id):
         return "No such module found.", 404
 
 def _establish_ssl_context(conf):
+    if conf.ssl_enabled == False:
+        return None
     # First, do some validation of the configuration
     attributes = (
         'ssl_certificate_file',
@@ -190,4 +192,9 @@ def _establish_ssl_context(conf):
 if __name__ == "__main__":
     logging.info("Starting Rida")
     ssl_ctx = _establish_ssl_context(conf)
-    app.run(request_handler = rida.auth.ClientCertRequestHandler, ssl_context=ssl_ctx)
+    app.run(
+        host=conf.host,
+        port=conf.port,
+        request_handler=rida.auth.ClientCertRequestHandler,
+        ssl_context=ssl_ctx,
+    )

rida/config.py

@@ -75,6 +75,10 @@ def from_file(filename=None):
     conf.rpms_default_cache = default.get("rpms_default_cache")
     conf.rpms_allow_cache = asbool(default.get("rpms_allow_cache"))
 
+    conf.port = default.get("port")
+    conf.host = default.get("host")
+
+    conf.ssl_enabled = asbool(default.get("ssl_enabled"))
     conf.ssl_certificate_file = default.get("ssl_certificate_file")
     conf.ssl_certificate_key_file = default.get("ssl_certificate_key_file")
     conf.ssl_ca_certificate_file = default.get("ssl_ca_certificate_file")