diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 022ed52628d35811bb143a160dba06b222b8523a..869d52259d8704b93bf903531fcc1ab6d914118b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -124,6 +124,7 @@ test:package:apt: - 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 + - uffd-admin routes - curl -Lv 127.0.0.1:5000 dependencies: - build:apt diff --git a/debian/contrib/uffd-admin b/debian/contrib/uffd-admin new file mode 100755 index 0000000000000000000000000000000000000000..5e214e07088f239eff764c5872770e16f5a73ccc --- /dev/null +++ b/debian/contrib/uffd-admin @@ -0,0 +1,17 @@ +#!/bin/bash -x + +set -e + +export FLASK_APP=/usr/share/uffd/uffd +export CONFIG_FILENAME=/etc/uffd/uffd.cfg + +if [ "$(whoami)" = "uffd" ]; then + flask $@ +elif command -v sudo &> /dev/null; then + exec sudo --preserve-env=FLASK_APP,CONFIG_FILENAME -u uffd flask $@ +elif command -v su &> /dev/null; then + exec su -s /bin/sh --preserve-environment uffd -c flask $@ +else + echo "Could not not become 'uffd' user, exiting" + exit 255 +fi diff --git a/debian/cron.d b/debian/cron.d new file mode 100644 index 0000000000000000000000000000000000000000..4b9e06d09c17096332b5af489dedd7e8fc7e3d7f --- /dev/null +++ b/debian/cron.d @@ -0,0 +1,3 @@ +# Cronjobs for uffd + +@daily uffd [ -f /usr/bin/uffd-admin ] && flock -n /var/run/uffd/cron.roles-update-all.lock /usr/bin/uffd-admin roles-update-all --check-only 2> /dev/null diff --git a/debian/install b/debian/install index 7d684bb988d82f9a134bcffb8f1cb515fec140bd..ac4a56f24427bff23d20b42cfe3541bd101d7666 100644 --- a/debian/install +++ b/debian/install @@ -1,3 +1,4 @@ -uwsgi.ini /etc/uffd/ -nginx.include.conf /etc/uffd/ -debian/uffd.cfg /etc/uffd/ +uwsgi.ini /etc/uffd/ +nginx.include.conf /etc/uffd/ +debian/uffd.cfg /etc/uffd/ +debian/contrib/uffd-admin /usr/bin/ diff --git a/debian/tmpfile b/debian/tmpfile new file mode 100644 index 0000000000000000000000000000000000000000..8b1b0db187c4a887cbcec5a6c3a48c871faf7ab3 --- /dev/null +++ b/debian/tmpfile @@ -0,0 +1,2 @@ +#Type Path Mode UID GID Age Argument +d /run/uffd 0755 uffd uffd - -