Merge branch 'master' into 'master'

Debian packaging: Address #10 #11 #12 and #13

Closes #13 and #12

See merge request !37

MANIFEST.in

 include LICENSE
-recursive-include config *.conf *.ini *.service
+recursive-include config *.conf *.conf.py *.ini *.service
 recursive-include debian *
 recursive-include tests *
 include python-gwdatafind-server.spec

config/gwdatafind-server.service

@@ -7,7 +7,7 @@ After=network.target
 [Service]
 Type=simple
 User=gwdatafind
-ExecStart=/usr/bin/gunicorn-3 --config /usr/share/gwdatafind-server/gunicorn.conf.py "gwdatafind_server:create_app()"
+ExecStart=/usr/bin/python3 -m gunicorn.app.wsgiapp --config /usr/share/gwdatafind-server/gunicorn.conf.py "gwdatafind_server:create_app()"
 ExecStop=/bin/kill -s TERM $MAINPID
 NoNewPrivileges=true
 PrivateTmp=true

debian/changelog

+gwdatafind-server (1.1.0-3) UNRELEASED; urgency=low
+
+  * use gunicorn module directly to avoid gunicorn* ambiguity
+  * no need for separate Debian service unit
+
+ -- Steffen Grunewald <steffen.grunewald@ligo.org>  Wed, 30 Mar 2022 15:45:00 +0200
+
+gwdatafind-server (1.1.0-2) UNRELEASED; urgency=low
+
+  * add gwdatafind-server package
+  * modify rules for multiple packages
+  * Debian service unit needs different path to gunicorn executable
+  * install files for both packages
+  * add gunicorn.conf.py to tarball
+  * add python3-scitokens to install deps
+  * no need to declare files in /etc/ as conffiles
+  * let dh_systemd (with dh --with systemd) take care of pre/post scripts
+
+ -- Steffen Grunewald <steffen.grunewald@ligo.org>  Tue, 29 Mar 2022 15:35:00 +0200
+
 gwdatafind-server (1.1.0-1) stable; urgency=low
 
   * Updated version numbers

debian/control

@@ -8,6 +8,7 @@ Standards-Version: 3.9.1
 X-Python3-Version: >= 3.6
 Build-Depends:
  debhelper (>= 9),
+ debhelper (>= 9.20160709~) | dh-systemd,
  dh-python,
  python3-all,
  python3-setuptools,
@@ -26,7 +27,26 @@ Depends:
  python3-configobj,
  python3-flask (>= 1.0.0),
  python3-ligo-segments,
+ python3-scitokens,
+Description: Server app for the GWDataFind service
+ The GWDataFind service allows users to query for the location of
+ files containing data from the current
+ gravitational-wave detectors.
+ This package provides the Python 3 server app.
+
+# -- gwdatafind-server ------------------
+
+Package: gwdatafind-server
+Architecture: all
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${python3:Depends},
+ python3-gwdatafind-server (= ${binary:Version}),
+ python3-gunicorn,
 Description: Server app for the GWDataFind service
- The DataFind service allows users to query for the location of
+ The GWDataFind service allows users to query for the location of
  files containing data from the current
  gravitational-wave detectors.
+ This package provides the HTTP app configuration for a GWDataFind
+ Service instance.

debian/gwdatafind-server.docs

+README*
+LICENSE

debian/gwdatafind-server.install

+# web server config examples
+config/*.conf    usr/share/gwdatafind-server/
+config/*.conf.py usr/share/gwdatafind-server/
+# service config file
+config/*.ini     etc/
+# systemd
+config/*.service lib/systemd/system/

debian/python3-gwdatafind-server.docs

+README*
+LICENSE

debian/python3-gwdatafind-server.install

+usr/lib/python3*/*-packages/*

debian/rules

 #!/usr/bin/make -f
 
-export PYBUILD_NAME = gwdatafind-server
-
 %:
-	dh $@ --with python3 --buildsystem=pybuild
+	dh $@ --with python3 --buildsystem=pybuild --with systemd