diff options
Diffstat (limited to 'debian/patches')
5 files changed, 63 insertions, 0 deletions
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 <david.kunz@dknet.ch> +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 <david.kunz@dknet.ch> +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 <david.kunz@dknet.ch> +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 <david.kunz@dknet.ch> +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 |