[Git][debian-proftpd-team/proftpd][master] 3 commits: Hand over startup to dh_installsystemd.

[Hilmar Preuße (@hilmar-guest)]

Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
1b692300 by Hilmar Preusse at 2022-10-21T23:54:12+02:00
Hand over startup to dh_installsystemd.

- - - - -
a2a4f7ae by Hilmar Preusse at 2022-11-08T23:37:46+01:00
Check if we do configure before check for standalone.

- - - - -
b6024bbc by Hilmar Preuße at 2022-11-09T00:06:20+00:00
Merge branch 'master_start_using_dhinstallsystemd' into 'master'

Master start using dhinstallsystemd

See merge request debian-proftpd-team/proftpd!7
- - - - -


2 changed files:

- debian/proftpd-core.postinst
- debian/rules


Changes:

=====================================
debian/proftpd-core.postinst
=====================================
@@ -204,12 +204,6 @@ if [ "$1" = "configure" ]; then
     # clean run files (pidfile and scoreboard)
     rm -f /run/proftpd/proftpd* /run/proftpd.pid
 
-    # enable and start proftpd daemon via systemctl
-    if egrep -qi "^[[:space:]]*ServerType.*standalone" /etc/proftpd/proftpd.conf
-    then
-	deb-systemd-invoke enable proftpd.service
-	deb-systemd-invoke restart proftpd.service
-    fi
 fi
 
 if [ -e "/etc/init.d/proftpd" ]; then
@@ -222,4 +216,16 @@ if [ -e "/etc/init.d/proftpd" ]; then
     fi
 fi
 
+# Check if we are standalone, before trying to start via systemd.
+
+if [ "$1" = "configure" ]; then
+    if egrep -qi "^[[:space:]]*ServerType.*standalone" /etc/proftpd/proftpd.conf
+    then
+        echo "Server configured as standalone."
+    else
+        echo "Server not configured as standalone, exiting."
+        exit 0
+    fi
+fi
+
 #DEBHELPER#


=====================================
debian/rules
=====================================
@@ -95,8 +95,8 @@ override_dh_installinit:
 	dh_installinit --name=$(NAME)
 
 override_dh_installsystemd:
-	dh_installsystemd -p$(PACKAGE) --name=$(NAME) --no-enable --no-start $(NAME).socket
-	dh_installsystemd -p$(PACKAGE) --name=$(NAME)@ --no-enable --no-start $(NAME)@.service
-	dh_installsystemd -p$(PACKAGE) --name=$(NAME) --no-enable --no-start $(NAME).service
+	dh_installsystemd -p$(PACKAGE) --name=$(NAME) $(NAME).socket
+	dh_installsystemd -p$(PACKAGE) --name=$(NAME)@ $(NAME)@.service
+	dh_installsystemd -p$(PACKAGE) --name=$(NAME) $(NAME).service
 
 .PHONY: debian/proftpd-substvars debian/control



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/cc250f49ab1a979b8e5bf38ab054ddd939f3e30a...b6024bbc0a703bc78c99dace09b6a840fac66a89

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/cc250f49ab1a979b8e5bf38ab054ddd939f3e30a...b6024bbc0a703bc78c99dace09b6a840fac66a89
You're receiving this email because of your account on salsa.debian.org.