Reorganise h's config files

This commit reorganises h's `conf/` directory following a schema that I
plan to apply to our cookiecutter and the rest of our apps.

h's `conf/` directory presents some unique problems that don't apply to
our other apps because it has some extra configuration files that our
other apps don't have:

* Several `conf/*websocket*` config files for h's separate websocket
  app, which even needs an extra set of config files for when it's
  running in "monolithic" mode (used by `make run-docker` in development
  and in the Canada production environment).
* `websocket-newrelic.ini`: a New Relic configuration used by h's
  separate websocket app
* An `nginx.conf` file used by h's "internal" NGINX instance in
  production (there's no NGINX in h's development environment)

.github/workflows/ci.yml

@@ -7,8 +7,8 @@ on:
       - '.github/workflows/deploy.yml'
       - '.github/workflows/redeploy.yml'
       - 'bin/logger'
-      - 'conf/development-app.ini'
-      - 'app.ini'
+      - 'conf/development.ini'
+      - 'production.ini'
       - 'conf/supervisord*.conf'
       - 'docs/*'
       - 'requirements/*.in'

.github/workflows/data_tasks.yml

@@ -55,5 +55,5 @@ jobs:
       Env: ${{ inputs.Environment }}
       Timeout: 7200
       Region: ${{ inputs.Region }}
-      Command: 'newrelic-admin run-program python bin/run_data_task.py --config-file conf/app.ini --task ${{ inputs.Task }}'
+      Command: 'newrelic-admin run-program python bin/run_data_task.py --config-file conf/production.ini --task ${{ inputs.Task }}'
     secrets: inherit

.github/workflows/deploy.yml

@@ -12,7 +12,7 @@ on:
       - '.github/*'
       - 'bin/create-testdb'
       - 'bin/install-python'
-      - 'conf/development-app.ini'
+      - 'conf/development.ini'
       - 'conf/supervisord-dev.conf'
       - 'conf/websocket-dev.ini'
       - 'docs/*'

.github/workflows/report_refresh.yml

@@ -15,5 +15,5 @@ jobs:
       Env: 'prod'
       Timeout: 3600
       Region: 'all'
-      Command: 'newrelic-admin run-program python bin/run_data_task.py --config-file conf/app.ini --task report/refresh'
+      Command: 'newrelic-admin run-program python bin/run_data_task.py --config-file conf/production.ini --task report/refresh'
     secrets: inherit

conf/development-app.ini → conf/development.ini

@@ -22,15 +22,6 @@ secret_key: notverysecretafterall
 
 sqlalchemy.url: postgresql://postgres@localhost/postgres
 
-[server:main]
-use: egg:gunicorn#main
-host: 0.0.0.0
-port: 5000
-proc_name: web
-graceful_timeout: 0
-timeout: 0
-errorlog: -
-
 [loggers]
 keys = root, gunicorn.error, h
 

conf/gunicorn-dev.conf.py

@@ -0,0 +1,3 @@
+bind = "0.0.0.0:5000"
+graceful_timeout = 0
+timeout = 0

conf/gunicorn-websocket-dev.conf.py

@@ -0,0 +1,5 @@
+bind = "localhost:5001"
+worker_class = "h.streamer.Worker"
+graceful_timeout = 0
+workers = 2
+worker_connections = 8

conf/gunicorn-websocket-monolithic.conf.py

@@ -0,0 +1,5 @@
+bind = "unix:/tmp/gunicorn-websocket.sock"
+worker_class = "h.streamer.Worker"
+graceful_timeout = 0
+workers = 2
+worker_connections = 8192

conf/gunicorn-websocket.conf.py

@@ -0,0 +1,5 @@
+bind = "0.0.0.0:5000"
+worker_class = "h.streamer.Worker"
+graceful_timeout = 0
+workers = 2
+worker_connections = 8192

conf/gunicorn.conf.py

@@ -0,0 +1 @@
+bind = "unix:/tmp/gunicorn-web.sock"

conf/app.ini → conf/production.ini

@@ -9,11 +9,6 @@ use: call:h.app:create_app
 [filter:proxy-prefix]
 use: egg:PasteDeploy#prefix
 
-[server:main]
-use: egg:gunicorn#main
-bind: unix:/tmp/gunicorn-web.sock
-proc_name: web
-
 [loggers]
 keys = root, alembic, gunicorn.error, h
 

conf/supervisord-dev.conf

@@ -3,15 +3,15 @@ nodaemon = true
 silent = true
 
 [program:web]
-command = pserve --reload conf/development-app.ini
+command = gunicorn --paste conf/development.ini --config conf/gunicorn-dev.conf.py
 stdout_events_enabled=true
 stderr_events_enabled=true
 stopsignal = KILL
 stopasgroup = true
 autostart = %(ENV_ENABLE_WEB)s
 
 [program:websocket]
-command = pserve --reload conf/websocket-dev.ini
+command = gunicorn --paste conf/websocket-dev.ini --config conf/gunicorn-websocket-dev.conf.py
 stdout_events_enabled=true
 stderr_events_enabled=true
 stopsignal = KILL

conf/supervisord.conf

@@ -13,21 +13,30 @@ stderr_events_enabled=true
 autostart = %(ENV_ENABLE_NGINX)s
 
 [program:web]
-command=newrelic-admin run-program pserve conf/app.ini
+command=newrelic-admin run-program gunicorn --paste conf/production.ini --config conf/gunicorn.conf.py
 stdout_logfile=NONE
 stderr_logfile=NONE
 stdout_events_enabled=true
 stderr_events_enabled=true
 autostart = %(ENV_ENABLE_WEB)s
 
 [program:websocket]
-command=pserve %(ENV_WEBSOCKET_CONFIG)s
+command=newrelic-admin run-program gunicorn --paste conf/websocket.ini --config conf/gunicorn-websocket.conf.py
 stdout_logfile=NONE
 stderr_logfile=NONE
 stdout_events_enabled=true
 stderr_events_enabled=true
 autostart = %(ENV_ENABLE_WEBSOCKET)s
 
+[program:websocket-monolithic]
+command=newrelic-admin run-program gunicorn --paste conf/websocket-monolithic.ini --config conf/gunicorn-websocket-monolithic.conf.py
+stdout_logfile=NONE
+stderr_logfile=NONE
+stdout_events_enabled=true
+stderr_events_enabled=true
+autostart = %(ENV_ENABLE_WEBSOCKET_MONOLITHIC)s
+process_name = websocket
+
 [program:worker]
 command=newrelic-admin run-program hypothesis celery worker --loglevel=INFO
 stdout_logfile=NONE

conf/websocket-dev.ini

@@ -10,17 +10,6 @@ secret_key: notverysecretafterall
 # SQLAlchemy configuration -- See SQLAlchemy documentation
 sqlalchemy.url: postgresql://postgres@localhost/postgres
 
-[server:main]
-use: egg:gunicorn#main
-host: localhost
-port: 5001
-worker_class: h.streamer.Worker
-graceful_timeout: 0
-proc_name: websocket
-# This is very low so you can see what happens when we run out
-workers: 2
-worker_connections: 8
-
 [loggers]
 keys = root, gunicorn.error, h
 

conf/websocket-monolithic.ini

@@ -1,15 +1,6 @@
 [app:main]
 use: call:h.streamer:create_app
 
-[server:main]
-use: egg:gunicorn#main
-bind: unix:/tmp/gunicorn-websocket.sock
-worker_class: h.streamer.Worker
-graceful_timeout: 0
-proc_name: websocket
-workers: 2
-worker_connections: 8192
-
 [loggers]
 keys = root, gunicorn.error, h.streamer
 

conf/websocket-separate.ini → conf/websocket.ini

@@ -1,16 +1,6 @@
 [app:main]
 use: call:h.streamer:create_app
 
-[server:main]
-use: egg:gunicorn#main
-host: 0.0.0.0
-port: 5000
-worker_class: h.streamer.Worker
-graceful_timeout: 0
-proc_name: websocket
-workers: 2
-worker_connections: 8192
-
 [loggers]
 keys = root, gunicorn.error, h.streamer
 

h/cli/__init__.py

@@ -40,7 +40,7 @@ def bootstrap(app_url, dev=False):
         else:
             raise click.ClickException("the app URL must be set in production mode!")
 
-    config = "conf/development-app.ini" if dev else "conf/app.ini"
+    config = "conf/development.ini" if dev else "conf/production.ini"
 
     paster.setup_logging(config)
     request = Request.blank("/", base_url=app_url)

tests/functional/bin/run_data_task_test.py

@@ -29,7 +29,7 @@ def test_reporting_tasks(self, environ):
                     sys.executable,
                     "bin/run_data_task.py",
                     "--config-file",
-                    "conf/development-app.ini",
+                    "conf/development.ini",
                     "--task",
                     task_name,
                 ],