Fixes #31393 - Drop foreman-proxy sysvinit scripts

theforeman · Nov 27, 2020 · 2f74147 · 2f74147
1 parent 9eaeaa4
commit 2f74147
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 368 deletions.
diff --git a/debian/bionic/foreman-proxy/default b/debian/bionic/foreman-proxy/default
diff --git a/debian/bionic/foreman-proxy/foreman-proxy.init b/debian/bionic/foreman-proxy/foreman-proxy.init
diff --git a/debian/bionic/foreman-proxy/foreman-proxy.preinst b/debian/bionic/foreman-proxy/foreman-proxy.preinst
@@ -0,0 +1,5 @@
+#!/bin/sh
+dpkg-maintscript-helper rm_conffile /etc/init.d/foreman-proxy 2.4.0~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/default/foreman-proxy 2.4.0~ -- "$@"
+
+#DEBHELPER#
diff --git a/debian/bionic/foreman-proxy/logrotate b/debian/bionic/foreman-proxy/logrotate
@@ -11,8 +11,6 @@
   postrotate
     if [ -d /run/systemd/system ] ; then
       /bin/systemctl kill --signal=SIGUSR1 --kill-who=main foreman-proxy >/dev/null 2>&1 || true
-    elif [ -e /etc/init.d/foreman-proxy ] ; then
-      /etc/init.d/foreman-proxy logrotate >/dev/null 2>&1 || true
     fi
   endscript
 }
diff --git a/debian/buster/foreman-proxy/default b/debian/buster/foreman-proxy/default
diff --git a/debian/buster/foreman-proxy/foreman-proxy.init b/debian/buster/foreman-proxy/foreman-proxy.init
diff --git a/debian/buster/foreman-proxy/foreman-proxy.preinst b/debian/buster/foreman-proxy/foreman-proxy.preinst
@@ -0,0 +1,5 @@
+#!/bin/sh
+dpkg-maintscript-helper rm_conffile /etc/init.d/foreman-proxy 2.4.0~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/default/foreman-proxy 2.4.0~ -- "$@"
+
+#DEBHELPER#
diff --git a/debian/buster/foreman-proxy/logrotate b/debian/buster/foreman-proxy/logrotate
@@ -11,8 +11,6 @@
   postrotate
     if [ -d /run/systemd/system ] ; then
       /bin/systemctl kill --signal=SIGUSR1 --kill-who=main foreman-proxy >/dev/null 2>&1 || true
-    elif [ -e /etc/init.d/foreman-proxy ] ; then
-      /etc/init.d/foreman-proxy logrotate >/dev/null 2>&1 || true
     fi
   endscript
 }