diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1b703fac514d4faf76b79d60e54141e21a9c622..95ba69745b5618b065c9b97912e49ffbabd5ee05 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -116,6 +116,14 @@ test:package:apt: stage: test script: - apt -y install ./build/*.deb + - apt -y install curl + - ln -s /etc/uffd/uwsgi.ini /etc/uwsgi/apps-available/uffd.ini + - ln -s /etc/uwsgi/apps-available/uffd.ini /etc/uwsgi/apps-enabled/uffd.ini + - service uwsgi start uffd || ( service uwsgi status uffd ; sleep 15; cat /var/log/uwsgi/app/uffd.log; ) + - echo "server { listen 127.0.0.1:5000 default_server; include /etc/uffd/nginx.include.conf; }" > /etc/nginx/sites-enabled/uffd.ini + - service nginx start || ( service nginx status; nginx -t; exit 1; ) + - sleep 5 + - curl -Lv 127.0.0.1:5000 dependencies: - build:apt diff --git a/debian/uffd.cfg b/debian/uffd.cfg index f3740716faa231228f4aab35a845a05748de677a..954a0a998f5a3bed7e45769f2088c62ef1d4fb8e 100644 --- a/debian/uffd.cfg +++ b/debian/uffd.cfg @@ -1,2 +1,2 @@ -FLASK_ENV=production -SQLALCHEMY_DATABASE_URI=sqlite:///var/lib/uffd/db.sqlite +FLASK_ENV="production" +SQLALCHEMY_DATABASE_URI="sqlite:////var/lib/uffd/db.sqlite" diff --git a/uffd/__init__.py b/uffd/__init__.py index c85436f539d4f881cf489ca4f89c77fc76a1a3e7..6550124caf64b7745995d9fbfa7684d938409c51 100644 --- a/uffd/__init__.py +++ b/uffd/__init__.py @@ -59,7 +59,12 @@ def create_app(test_config=None): # pylint: disable=too-many-locals register_template_helper(app) setup_navbar(app) - os.makedirs(app.instance_path, exist_ok=True) + # We never want to fail here, but at a file access that doesn't work. + # We might only have read access to app.instance_path + try: + os.makedirs(app.instance_path, exist_ok=True) + except: + pass db.init_app(app) Migrate(app, db, render_as_batch=True, directory='uffd/migrations')