From 9fdb6c416f9cca5685ec81a5ca37eb782912aa74 Mon Sep 17 00:00:00 2001
From: nd <git@notandy.de>
Date: Sun, 1 Aug 2021 01:35:24 +0200
Subject: [PATCH] enable uwsgi app by default and add maintainer script to
restart uwsgi
---
.gitlab-ci.yml | 4 +---
CHANGELOG | 9 +++++++++
debian/control | 4 ++--
debian/links | 2 ++
debian/postinst | 2 ++
5 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45ca0a57..e4002a82 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ build:apt:
script:
- cp CHANGELOG debian/changelog
- export PYBUILD_INSTALL_ARGS="--install-lib=/usr/share/uffd/ --install-scripts=/usr/share/uffd/"
- - gbp dch --ignore-branch --debian-tag=v%\(version\)s
+ - gbp dch --no-git-author --ignore-branch --debian-tag=v%\(version\)s
- dpkg-buildpackage -us -uc
- mkdir build
- mv ../*.deb build/
@@ -114,8 +114,6 @@ test:package:apt:
stage: test
script:
- apt -y install ./build/*.deb
- - 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; )
diff --git a/CHANGELOG b/CHANGELOG
index a73f34f9..445bc783 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+uffd (0.3.0) unstagle; urgency=medium
+
+ * update link to rocketchat in README
+ * add uffd-admin command, cleanup cronjob and needed /run folder
+ * move package build dependencies to docker image
+ * enable uwsgi app by default and add maintainer script to restart uwsgi
+
+ -- CCCV <it@cccv.de> Sat, 31 Jul 2021 23:36:01 +0000
+
uffd (0.2.0) unstable; urgency=medium
* Working debian packages
diff --git a/debian/control b/debian/control
index f0c914ef..cb05aed4 100644
--- a/debian/control
+++ b/debian/control
@@ -24,8 +24,8 @@ Depends:
python3-fido2,
python3-flask-oauthlib,
python3-flask-babel,
-Recommends:
- nginx,
uwsgi,
uwsgi-plugin-python3,
+Recommends:
+ nginx,
Description: UserFerwaltungsFrontend: Ldap based single sign on and user management web software
diff --git a/debian/links b/debian/links
index 21a45dcf..e97982ee 100644
--- a/debian/links
+++ b/debian/links
@@ -1 +1,3 @@
/etc/uffd/uffd.cfg /usr/share/uffd/uffd/instance/config.cfg
+/etc/uffd/uwsgi.ini /etc/uwsgi/apps-available/uffd.ini
+/etc/uwsgi/apps-available/uffd.ini /etc/uwsgi/apps-enabled/uffd.ini
diff --git a/debian/postinst b/debian/postinst
index 9615da0b..0c5816f0 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -12,6 +12,8 @@ case "$1" in
chown root:uffd /etc/uffd/uffd.cfg
chmod 0640 /etc/uffd/uffd.cfg
+
+ invoke-rc.d uwsgi restart uffd
;;
abort-upgrade|abort-remove|abort-deconfigure)
--
GitLab