Add wsgi.py for deployment

deploy/deploy.py

@@ -95,7 +95,6 @@ def main():
     if args.sentry_dsn is not None and \
        args.sentry_dsn[0] is not None:
         config['SENTRY_DSN'] = args.sentry_dsn[0]
-        config['uwsgi']['env'] = 'SENTRY_DSN={}'.format(args.sentry_dsn[0])
 
     if args.identity is not None and args.identity[0] is not None:
         args.identity[0] = os.path.abspath(args.identity[0])

deploy/etc/wsgi.py

@@ -0,0 +1,13 @@
+import pathlib
+
+from cliche.web.app import app, setup_sentry
+from cliche.config import read_config
+
+
+config = read_config(filename=pathlib.Path('/home/cliche/etc/prod.cfg.py'))
+app.config.update(config)
+setup_sentry()
+
+
+if __name__ == "__main__":
+    app.run()

deploy/prod.cfg.yml

@@ -17,5 +17,6 @@ uwsgi:
   chdir: /home/cliche
   chmod-socket: 666
   callable: app
-  module: cliche.web.app
+  module: wsgi
   socket: /tmp/cliche-uwsgi.sock
+  plugins: python34

deploy/scripts/upgrade-common.py

@@ -93,6 +93,7 @@ def main():
         config = load(config_data)
 
     config['uwsgi']['virtualenv'] = str(venv_dir)
+    config['uwsgi']['pythonpath'] = str(venv_dir / 'etc')
 
     with (venv_dir / 'etc' / 'prod.cfg.yml').open('w') as f:
         print(dump(config), file=f)