diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-02-17 18:40:37 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-01-09 18:05:36 +0100 |
| commit | 3d147e2786c48d2fe84deb6f1a44ea3966ee8563 (patch) | |
| tree | fdabcfc9292f93b770e5e2611d63b5dc9d94b971 | |
| parent | 38f3f05f598185e979a23e1a245f175e0f892c9d (diff) | |
| download | Ishtar-3d147e2786c48d2fe84deb6f1a44ea3966ee8563.tar.bz2 Ishtar-3d147e2786c48d2fe84deb6f1a44ea3966ee8563.zip | |
Debian: manage conf for tasks and librefiice with conf.d dir
| -rw-r--r-- | debian.libreoffice/changelog | 5 | ||||
| -rw-r--r-- | debian.libreoffice/ishtar-libreoffice.install | 1 | ||||
| -rw-r--r-- | debian.tasks/changelog | 5 | ||||
| -rw-r--r-- | debian.tasks/ishtar-tasks.install | 1 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | install/celery | 1 | ||||
| -rw-r--r-- | install/libreoffice | 1 |
8 files changed, 20 insertions, 1 deletions
diff --git a/debian.libreoffice/changelog b/debian.libreoffice/changelog index 3f6f1df78..c2bf4a4ba 100644 --- a/debian.libreoffice/changelog +++ b/debian.libreoffice/changelog @@ -1,3 +1,8 @@ +ishtar-libreoffice (3.0.2-1) UNRELEASED; urgency=low + + * Add config in conf.d dir + + -- Étienne Loks <etienne.loks@iggdrasil.net> Mon, 17 Feb 2020 18:40:00 +0200 ishtar-libreoffice (3.0.1-1) UNRELEASED; urgency=low * Do not depend on strict equality of python3-django-ishtar version diff --git a/debian.libreoffice/ishtar-libreoffice.install b/debian.libreoffice/ishtar-libreoffice.install index 4ec4c71b1..b06b20834 100644 --- a/debian.libreoffice/ishtar-libreoffice.install +++ b/debian.libreoffice/ishtar-libreoffice.install @@ -1,2 +1,3 @@ install/libreoffice_settings.py etc/ishtar/ +install/libreoffice etc/ishtar/conf.d/ install/libreoffice.service etc/systemd/system/ diff --git a/debian.tasks/changelog b/debian.tasks/changelog index ada99f78d..e6245a54f 100644 --- a/debian.tasks/changelog +++ b/debian.tasks/changelog @@ -1,3 +1,8 @@ +ishtar-tasks (3.0.2-1) UNRELEASED; urgency=low + + * Add config in conf.d dir + + -- Étienne Loks <etienne.loks@iggdrasil.net> Mon, 17 Feb 2020 18:40:00 +0200 ishtar-tasks (3.0.1-1) UNRELEASED; urgency=low * Do not depend on strict equality of python3-django-ishtar version diff --git a/debian.tasks/ishtar-tasks.install b/debian.tasks/ishtar-tasks.install index 61d39728a..e59e52322 100644 --- a/debian.tasks/ishtar-tasks.install +++ b/debian.tasks/ishtar-tasks.install @@ -1 +1,2 @@ install/tasks_settings.py etc/ishtar/ +install/celery etc/ishtar/conf.d/ diff --git a/debian/changelog b/debian/changelog index d94ae63fb..3b1d3227c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,8 @@ +python-django-ishtar (3.0.2-2) UNRELEASED; urgency=low + + * conf.d dir in /etc/ishtar + + -- Étienne Loks <etienne.loks@iggdrasil.net> Mon, 17 Feb 2020 18:40:00 +0200 python-django-ishtar (3.0.2-1) UNRELEASED; urgency=low * New upstream version cf. CHANGES.md diff --git a/debian/rules b/debian/rules index 8a11173e1..af39e2fa5 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ export PYBUILD_NAME = ishtar override_dh_auto_install: dh_auto_install mkdir -p debian/tmp/usr/sbin - mkdir -p debian/tmp/etc/ishtar + mkdir -p debian/tmp/etc/ishtar/conf.d touch debian/tmp/etc/ishtar/instances mkdir -p debian/tmp/srv/ishtar touch debian/tmp/srv/ishtar/__init__.py diff --git a/install/celery b/install/celery new file mode 100644 index 000000000..11d8ae58d --- /dev/null +++ b/install/celery @@ -0,0 +1 @@ +USE_CELERY=yes diff --git a/install/libreoffice b/install/libreoffice new file mode 100644 index 000000000..4c93de704 --- /dev/null +++ b/install/libreoffice @@ -0,0 +1 @@ +USE_LIBREOFFICE=yes |