From 620245b255a78a4de7a702a98f8e576bf0d9db5d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 28 Apr 2024 14:43:12 +0200 Subject: Adding debian version 1.10.2-1. Signed-off-by: Daniel Baumann --- debian/changelog | 65 ++++++++++++++++++++++ debian/control | 38 +++++++++++++ debian/copyright | 28 ++++++++++ debian/icingaweb2-module-director.docs | 2 + debian/icingaweb2-module-director.postinst | 26 +++++++++ debian/icingaweb2-module-director.postrm | 23 ++++++++ debian/icingaweb2-module-director.service | 1 + ...ga-director-service-remove-redhat-entries.patch | 14 +++++ ...-icinga-director-service-adding-condition.patch | 14 +++++ .../0003-icinga-director-service-user-change.patch | 16 ++++++ debian/patches/debian/0004-icinga-agent.patch | 15 +++++ debian/patches/series | 4 ++ debian/rules | 28 ++++++++++ debian/source/format | 1 + debian/watch | 3 + 15 files changed, 278 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/icingaweb2-module-director.docs create mode 100644 debian/icingaweb2-module-director.postinst create mode 100644 debian/icingaweb2-module-director.postrm create mode 120000 debian/icingaweb2-module-director.service create mode 100644 debian/patches/debian/0001-icinga-director-service-remove-redhat-entries.patch create mode 100644 debian/patches/debian/0002-icinga-director-service-adding-condition.patch create mode 100644 debian/patches/debian/0003-icinga-director-service-user-change.patch create mode 100644 debian/patches/debian/0004-icinga-agent.patch create mode 100644 debian/patches/series create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..3986571 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,65 @@ +icingaweb2-module-director (1.10.2-1) unstable; urgency=high + + * Merging upstream version 1.10.2. + * Removing patch to split. + * Removing redhat entries in icinga-director.service. + * Adding condition to icinga-director.service. + * Changing icinga-director.service user and group according debian standard. + * Changing ipl to php-library. + * Remove dublicated field from control. + * Updating Standards-Version to 4.6.2. + * Adding Rules-Requires-Root in control. + * Remove unused doc files. + * Removing unused BSD-3 clause in copyright. + * Updating delimiter in Icinga2Agent.bash confirm to debian policy. + + -- David Kunz Tue, 07 Feb 2023 12:43:53 +0100 + +icingaweb2-module-director (1.8.1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * No source change upload to rebuild with debhelper 13.10. + + -- Michael Biebl Sat, 15 Oct 2022 12:08:58 +0200 + +icingaweb2-module-director (1.8.1-2) unstable; urgency=medium + + * Updating Standards-Version to 4.6.0. + * Remove library/vendor/php-diff/ from copyright. + + -- David Kunz Wed, 22 Dec 2021 11:17:56 +0100 + +icingaweb2-module-director (1.8.1-1) unstable; urgency=medium + + * Adding watch file. + * Updating copyright for David Kunz. + * Updating vcs in control. + * Merging upstream version 1.8.1. + * Updating copyright for Icinga Development Team. + * Changing depends in control. + * Removing .pc files from binary package. + + -- David Kunz Thu, 22 Jul 2021 23:31:21 +0200 + +icingaweb2-module-director (1.8.0-1) unstable; urgency=medium + + * Merging upstream version. + * Updating standard version. + * Adding service. + + -- David Kunz Thu, 05 Jan 2021 13:30:47 +0200 + +icingaweb2-module-director (1.6.0-2) unstable; urgency=medium + + * Updating debhelper. + * Updating standard version. + * Fixing typo in path (Closes: #952980). + * Fixing typo in previous changelog entry. + + -- David Kunz Mon, 22 Jun 2020 07:50:19 +0200 + +icingaweb2-module-director (1.6.0-1) unstable; urgency=medium + + * Initial release (Closes: #920422). + + -- David Kunz Mon, 12 Aug 2019 15:15:36 +0200 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..b9fa205 --- /dev/null +++ b/debian/control @@ -0,0 +1,38 @@ +Source: icingaweb2-module-director +Section: admin +Priority: optional +Maintainer: David Kunz +Build-Depends: + debhelper-compat (= 13), +Rules-Requires-Root: no +Standards-Version: 4.6.2 +Homepage: https://github.com/Icinga/icingaweb2-module-director +Vcs-Browser: https://salsa.debian.org/david.kunz/icingaweb2-module-director +Vcs-Git: https://salsa.debian.org/david.kunz/icingaweb2-module-director.git + +Package: icingaweb2-module-director +Architecture: all +Depends: + icingaweb2, + icingaweb2-module-incubator, + icinga-php-library, + icingaweb2-module-monitoring, + icingaweb2-module-reactbundle, + php, + php-common, + php-curl, + php-iconv, + php-posix, + ${misc:Depends}, +Enhances: + icingaweb2, +Description: simple and responsive web interface for Icinga - director module + Icinga Web 2 is a very modular, fast and simple web interface for your Icinga + monitoring environment. + . + The software will give you a web frontend for your monitoring solution, and + can run additional modules, extending monitoring data, or even supplying + something new to the webinterface. + . + Icinga Director is a configuration tool that has been designed to make Icinga 2 + configuration easy and understandable. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..5622589 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,28 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: icingaweb2-module-director +Upstream-Contact: Icinga Development Team +Source: https://github.com/Icinga/icingaweb2-module-director/releases + +Files: * +Copyright: 2015-2020 Icinga Development Team +License: GPL-2 + +Files: debian/* +Copyright: 2019-2021 David Kunz +License: GPL-2 + +License: GPL-2 + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + The complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. diff --git a/debian/icingaweb2-module-director.docs b/debian/icingaweb2-module-director.docs new file mode 100644 index 0000000..968f11e --- /dev/null +++ b/debian/icingaweb2-module-director.docs @@ -0,0 +1,2 @@ +README.md +doc/* diff --git a/debian/icingaweb2-module-director.postinst b/debian/icingaweb2-module-director.postinst new file mode 100644 index 0000000..cef258c --- /dev/null +++ b/debian/icingaweb2-module-director.postinst @@ -0,0 +1,26 @@ +#!/bin/sh + +set -e + +case "${1}" in + configure) + # creating user + if ! getent passwd _director > /dev/null 2>&1 + then + useradd -c "icingaweb2-module-director,,," -M -s /bin/bash _director + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument '${1}'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/icingaweb2-module-director.postrm b/debian/icingaweb2-module-director.postrm new file mode 100644 index 0000000..c4794ec --- /dev/null +++ b/debian/icingaweb2-module-director.postrm @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +case "${1}" in + remove) + # remove user + userdel _director > /dev/null 2>&1 || true + ;; + + purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + ;; + + *) + echo "postrm called with unknown argument \`${1}'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/icingaweb2-module-director.service b/debian/icingaweb2-module-director.service new file mode 120000 index 0000000..8828d92 --- /dev/null +++ b/debian/icingaweb2-module-director.service @@ -0,0 +1 @@ +../contrib/systemd/icinga-director.service \ No newline at end of file diff --git a/debian/patches/debian/0001-icinga-director-service-remove-redhat-entries.patch b/debian/patches/debian/0001-icinga-director-service-remove-redhat-entries.patch new file mode 100644 index 0000000..b0dfd47 --- /dev/null +++ b/debian/patches/debian/0001-icinga-director-service-remove-redhat-entries.patch @@ -0,0 +1,14 @@ +Author: David Kunz +Description: Removing redhat entries. + +diff -Naurp icingaweb2-module-director.orig/contrib/systemd/icinga-director.service icingaweb2-module-director/contrib/systemd/icinga-director.service +--- icingaweb2-module-director.orig/contrib/systemd/icinga-director.service ++++ icingaweb2-module-director/contrib/systemd/icinga-director.service +@@ -4,7 +4,6 @@ Documentation=https://icinga.com/docs/di + Wants=network.target + + [Service] +-EnvironmentFile=-/etc/default/icinga-director + EnvironmentFile=-/etc/sysconfig/icinga-director + ExecStart=/usr/bin/icingacli director daemon run + ExecReload=/bin/kill -HUP ${MAINPID} diff --git a/debian/patches/debian/0002-icinga-director-service-adding-condition.patch b/debian/patches/debian/0002-icinga-director-service-adding-condition.patch new file mode 100644 index 0000000..7d12aed --- /dev/null +++ b/debian/patches/debian/0002-icinga-director-service-adding-condition.patch @@ -0,0 +1,14 @@ +Author: David Kunz +Description: Adding condition to run service. + +diff -Naurp icingaweb2-module-director.orig/contrib/systemd/icinga-director.service icingaweb2-module-director/contrib/systemd/icinga-director.service +--- icingaweb2-module-director.orig/contrib/systemd/icinga-director.service ++++ icingaweb2-module-director/contrib/systemd/icinga-director.service +@@ -2,6 +2,7 @@ + Description=Icinga Director - Monitoring Configuration + Documentation=https://icinga.com/docs/director/latest/ + Wants=network.target ++ConditionPathExists=/usr/share/icingaweb2/modules/director/ + + [Service] + EnvironmentFile=-/etc/sysconfig/icinga-director diff --git a/debian/patches/debian/0003-icinga-director-service-user-change.patch b/debian/patches/debian/0003-icinga-director-service-user-change.patch new file mode 100644 index 0000000..2f48f9e --- /dev/null +++ b/debian/patches/debian/0003-icinga-director-service-user-change.patch @@ -0,0 +1,16 @@ +Author: David Kunz +Description: Changing service user and adding service group. + +diff -Naurp icingaweb2-module-director.orig/contrib/systemd/icinga-director.service icingaweb2-module-director/contrib/systemd/icinga-director.service +--- icingaweb2-module-director.orig/contrib/systemd/icinga-director.service ++++ icingaweb2-module-director/contrib/systemd/icinga-director.service +@@ -8,7 +8,8 @@ ConditionPathExists=/usr/share/icingaweb2 + EnvironmentFile=-/etc/sysconfig/icinga-director + ExecStart=/usr/bin/icingacli director daemon run + ExecReload=/bin/kill -HUP ${MAINPID} +-User=icingadirector ++User=_director ++Group=icingaweb2 + SyslogIdentifier=icingadirector + Type=notify + diff --git a/debian/patches/debian/0004-icinga-agent.patch b/debian/patches/debian/0004-icinga-agent.patch new file mode 100644 index 0000000..9dc164b --- /dev/null +++ b/debian/patches/debian/0004-icinga-agent.patch @@ -0,0 +1,15 @@ +Author: David Kunz +Description: Updating delimiter confirm to debian policy. + +diff -Naurp icingaweb2-module-director.orig/contrib/linux-agent-installer/Icinga2Agent.bash icingaweb2-module-director/contrib/linux-agent-installer/Icinga2Agent.bash +--- icingaweb2-module-director.orig/contrib/linux-agent-installer/Icinga2Agent.bash ++++ icingaweb2-module-director/contrib/linux-agent-installer/Icinga2Agent.bash +@@ -151,7 +151,7 @@ fi + + if [ ! -d "$ICINGA2_SSLDIR" ]; then + mkdir "$ICINGA2_SSLDIR" +- chown "$ICINGA2_USER.$ICINGA2_GROUP" "$ICINGA2_SSLDIR" ++ chown "$ICINGA2_USER:$ICINGA2_GROUP" "$ICINGA2_SSLDIR" + fi + + if [ -f "${ICINGA2_SSLDIR}/${ICINGA2_NODENAME}.crt" ]; then diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..ddabc01 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +debian/0001-icinga-director-service-remove-redhat-entries.patch +debian/0002-icinga-director-service-adding-condition.patch +debian/0003-icinga-director-service-user-change.patch +debian/0004-icinga-agent.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..7c0c562 --- /dev/null +++ b/debian/rules @@ -0,0 +1,28 @@ +#!/usr/bin/make -f + +MODULE := director +DEBDIR := debian/icingaweb2-module-$(MODULE) + +%: + dh ${@} + +override_dh_auto_install: + mkdir -p $(DEBDIR)/usr/share/icingaweb2/modules/$(MODULE) + find . -maxdepth 1 -mindepth 1 -and -not -name debian -and -not -name ".git*" -and -not -name ".pc" -exec cp -a {} $(DEBDIR)/usr/share/icingaweb2/modules/$(MODULE) \; + + # remove useless files + rm -rf $(DEBDIR)/usr/share/icingaweb2/modules/$(MODULE)/test + rm -f $(DEBDIR)/usr/share/icingaweb2/modules/$(MODULE)/.travis.yml + find $(DEBDIR)/usr/share/icingaweb2/modules/$(MODULE) -name LICENSE -exec rm -f {} \; + +override_dh_fixperms: + dh_fixperms + chmod +x $(DEBDIR)/usr/share/icingaweb2/modules/$(MODULE)/contrib/linux-agent-installer/Icinga2Agent.bash + +execute_after_dh_installdocs: + rm -rf $(DEBDIR)/usr/share/icingaweb2/modules/$(MODULE)/doc + rm -f $(DEBDIR)/usr/share/icingaweb2/modules/$(MODULE)/README.md + + # enable module + mkdir -p $(DEBDIR)/etc/icingaweb2/enabledModules + ln -s /usr/share/icingaweb2/modules/$(MODULE) $(DEBDIR)/etc/icingaweb2/enabledModules/$(MODULE) diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..e255907 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=4 +opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/icingaweb2-module-director-$1\.tar\.gz/ \ + https://github.com/icinga/icingaweb2-module-director/tags .*/v?(\d\S+)\.tar\.gz -- cgit v1.2.3