Release 0.22.0

augur/application.py

@@ -36,13 +36,36 @@ def __init__(self, given_config={}, disable_logs=False, offline_mode=False):
         self.housekeeper = None
         self.manager = None
 
-        self.gunicorn_options = {
-            'bind': '%s:%s' % (self.config.get_value("Server", "host"), self.config.get_value("Server", "port")),
-            'workers': int(self.config.get_value('Server', 'workers')),
-            'timeout': int(self.config.get_value('Server', 'timeout'))
-            ### Group 10 -- put gunicorn options additions here with root certificate.
-            ## curl -ksSL https://team10.guillotine.io:5099
-        }
+        # SSL is a little convoluted because old installations will not have any value
+        # for the 'Server', 'ssl' variable. So, if it doesn't exist that's one condition, 
+        # and if it exists and is false, that's the same result, but another condition.
+        # Only if it exists and is true are the pem keys loaded. 
+        # They should be copied from certbot into augur's ssl directory. 
+
+        if self.config.get_value('Server', 'ssl'): 
+
+            if self.config.get_value('Server', 'ssl') is True: 
+
+                self.gunicorn_options = {
+                    'bind': '%s:%s' % (self.config.get_value("Server", "host"), self.config.get_value("Server", "port")),
+                    'workers': int(self.config.get_value('Server', 'workers')),
+                    'timeout': int(self.config.get_value('Server', 'timeout')),
+                    'certfile': str(self.config.get_value('Server', 'ssl_cert_file')),
+                    'keyfile': str(self.config.get_value('Server', 'ssl_key_file'))
+                }
+            else: 
+                self.gunicorn_options = {
+                    'bind': '%s:%s' % (self.config.get_value("Server", "host"), self.config.get_value("Server", "port")),
+                    'workers': int(self.config.get_value('Server', 'workers')),
+                    'timeout': int(self.config.get_value('Server', 'timeout'))
+                }
+        else: 
+            self.gunicorn_options = {
+                'bind': '%s:%s' % (self.config.get_value("Server", "host"), self.config.get_value("Server", "port")),
+                'workers': int(self.config.get_value('Server', 'workers')),
+                'timeout': int(self.config.get_value('Server', 'timeout'))
+            }
+
         self.logging.configure_logging(self.config)
         self.gunicorn_options.update(self.logging.gunicorn_logging_options)
 

augur/config.py

@@ -412,11 +412,15 @@
             "host": "0.0.0.0",
             "port": main_port,
             "workers": 6,
-            "timeout": 6000
+            "timeout": 6000,
+            "ssl": False,
+            "ssl_cert_file": None, 
+            "ssl_key_file": None 
         },
         "Frontend": {
             "host": "0.0.0.0",
-            "port": main_port
+            "port": main_port,
+            "ssl": False
         },
         "Logging": {
             "logs_directory": "logs/",

augur/routes/contributor_reports.py

@@ -1,4 +1,5 @@
 import psycopg2
+import psycopg2
 import sqlalchemy as salc
 import numpy as np
 import warnings

docs/fedora-install.md

@@ -0,0 +1,29 @@
+# Some notes on installing Augur on Fedora
+
+```
+sudo dnf groupinstall "Development Tools" "Development Libraries"
+
+sudo dnf install postgresql-contrib
+
+sudo yum install gcc openssl-devel bzip2-devel libffi-devel zlib-devel
+
+cd /opt
+
+sudo wget https://www.python.org/ftp/python/3.8.12/Python-3.8.12.tgz
+
+sudo tar xzf Python-3.8.12.tgz
+
+cd Python-3.8.12
+
+sudo ./configure --enable-optimizations
+
+sudo make altinstall
+
+python3.8 -V
+
+python3.8 -m venv augur_env
+
+```
+
+## Known Issue: 
+1. `augur backend kill` does not seem to kill the backend processes on Fedora right now.