summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2023-11-15 14:19:25 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2025-10-10 18:17:41 +0200
commite3c2dbb439ca92917602ec97e7df88e97d5b618e (patch)
tree67f1b33f3a0a2a0532e048b79ba52fb122309cab
parente84ef8910d3b7b4ee389fa44ad018bb071205751 (diff)
downloadIshtar-e3c2dbb439ca92917602ec97e7df88e97d5b618e.tar.bz2
Ishtar-e3c2dbb439ca92917602ec97e7df88e97d5b618e.zip
🚀 Debian package: python-django-ishtar - add man page - fix copyright file
-rw-r--r--debian/copyright8
-rw-r--r--debian/python3-django-ishtar.manpages2
-rw-r--r--debian/python3-django-ishtar.postinst2
-rw-r--r--debian/source/lintian-overrides3
-rw-r--r--install/ishtar-delete-instance.824
-rw-r--r--install/ishtar-prepare-instance.826
6 files changed, 60 insertions, 5 deletions
diff --git a/debian/copyright b/debian/copyright
index 6dee472c6..3eefecea4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,11 +3,11 @@ Upstream-Name: ishtar
Source: https://gitlab.com/iggdrasil/ishtar.git
Files: *
-Copyright: 2013-2022 Étienne Loks <etienne.loks@iggdrasil.net>
-License: AGPL-3.0+
+Copyright: 2013-2023 Étienne Loks <etienne.loks@iggdrasil.net>
+License: AGPL-3.0-only
Files: debian/*
-Copyright: 2013-2022 Étienne Loks <etienne.loks@iggdrasil.net>
+Copyright: 2013-2023 Étienne Loks <etienne.loks@iggdrasil.net>
License: GPL-3.0+
License: GPL-3.0+
@@ -27,7 +27,7 @@ License: GPL-3.0+
On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-License: AGPL-3.0
+License: AGPL-3.0-only
This program is free software: you can use, redistribute, and/or modify
this code under the terms of the GNU Affero General Public License
version 3.
diff --git a/debian/python3-django-ishtar.manpages b/debian/python3-django-ishtar.manpages
new file mode 100644
index 000000000..5a7aa6c84
--- /dev/null
+++ b/debian/python3-django-ishtar.manpages
@@ -0,0 +1,2 @@
+install/ishtar-prepare-instance.8
+install/ishtar-delete-instance.8
diff --git a/debian/python3-django-ishtar.postinst b/debian/python3-django-ishtar.postinst
index ab85cbc76..f892eaddd 100644
--- a/debian/python3-django-ishtar.postinst
+++ b/debian/python3-django-ishtar.postinst
@@ -43,7 +43,7 @@ case "$1" in
if [ -f /usr/sbin/rabbitmqctl ]; then # assume queues are configured
cecho c "Verify rabbitmq queues are empty"
for instance in $instances; do
- for res in `/usr/sbin/rabbitmqctl list_queues -p /ishtar$instance -q messages`; do
+ for res in `rabbitmqctl list_queues -p /ishtar$instance -q messages`; do
if [ $res != 0 ] && [ $res != 'messages' ]; then
cecho r "The queue for $instance is not empty ($res messages)."
cecho y "Wait a few minutes (hours?) for update."
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index c386b3d00..fe4aae0bf 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -4,3 +4,6 @@ python-django-ishtar: source-is-missing bootstrap_datepicker/static/js/locales/*
python-django-ishtar: source-is-missing docs/fr/source/media-src/*
# minimized translations and real js source not provided but with the link to the upstream source
python-django-ishtar: source-is-missing ishtar_common/static/*
+# debian directory is in the upstream package by choice
+python-django-ishtar source: no-debian-changes
+
diff --git a/install/ishtar-delete-instance.8 b/install/ishtar-delete-instance.8
new file mode 100644
index 000000000..310f299a0
--- /dev/null
+++ b/install/ishtar-delete-instance.8
@@ -0,0 +1,24 @@
+.\" Manpage for ishtar-delete-instance.
+.TH man 8 "15 Nov 2023" "1.0" "ishtar-delete-instance man page"
+.SH NAME
+ishtar-delete-instance \- create a new ishtar instance
+.SH SYNOPSIS
+ishtar-delete-instance
+.SH DESCRIPTION
+ishtar-delete-instance remove:
+.IP \[bu] 3
+instance configuration files (python django settings, nginx, uwsgi, supervisor and monit).
+.IP \[bu]
+the associated "/srv/ishtar/instance_name" directory.
+.IP \[bu]
+if relevant the dedicated rabbitmq queue.
+.IP \[bu]
+the associated database.
+.SH OPTIONS
+ishtar-delete-instance does not take any options.
+.SH SEE ALSO
+ishtar-prepare-instance(8)
+.SH BUGS
+No known bugs.
+.SH AUTHOR
+Étienne Loks (etienne.loks@iggdrasil.net) \ No newline at end of file
diff --git a/install/ishtar-prepare-instance.8 b/install/ishtar-prepare-instance.8
new file mode 100644
index 000000000..e1784c5fe
--- /dev/null
+++ b/install/ishtar-prepare-instance.8
@@ -0,0 +1,26 @@
+.\" Manpage for ishtar-prepare-instance.
+.TH man 8 "15 Nov 2023" "1.0" "ishtar-prepare-instance man page"
+.SH NAME
+ishtar-prepare-instance \- create a new ishtar instance
+.SH SYNOPSIS
+ishtar-prepare-instance
+.SH DESCRIPTION
+The script ask for instance name, instance url and max upload size.
+
+Then ishtar-prepare-instance create:
+.IP \[bu] 3
+configuration files (python django settings, nginx, uwsgi, supervisor and monit).
+.IP \[bu]
+an instance dir ("/srv/ishtar/instance_name") from a default template dir.
+.IP \[bu]
+a default database with initial data.
+.IP \[bu]
+if relevant (background task service is available) a dedicated rabbitmq queue.
+.SH OPTIONS
+ishtar-prepare-instance does not take any options
+.SH SEE ALSO
+ishtar-prepare-instance(8)
+.SH BUGS
+No known bugs.
+.SH AUTHOR
+Étienne Loks (etienne.loks@iggdrasil.net) \ No newline at end of file