[Git][debian-proftpd-team/proftpd][master] Moved systemctl enable/start into postinst, in order to allow installation in inetd mode

[Francesco Paolo Lovergine]

Francesco Paolo Lovergine pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
2799a6a5 by Francesco Paolo Lovergine at 2021-01-01T10:43:14+01:00
Moved systemctl enable/start into postinst, in order to allow installation in inetd mode

- - - - -


5 changed files:

- debian/changelog
- debian/proftpd-core.NEWS
- debian/proftpd-core.README.Debian
- debian/proftpd-core.postinst
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+proftpd-dfsg (1.3.7a+dfsg-6) unstable; urgency=medium
+
+  * In order to avoid breakage at install time in non standalone mode,
+    enable-n-start via systemdi has been moved to postinst.
+  * NEWS file rearranged and updated.
+  * Minor fixes to README.Debian doc.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 01 Jan 2021 10:42:05 +0100
+
 proftpd-dfsg (1.3.7a+dfsg-5) unstable; urgency=medium
 
   * Sigh, removed a spurious line introduced in postinst in the last upload.


=====================================
debian/proftpd-core.NEWS
=====================================
@@ -1,21 +1,20 @@
-proftpd-dfsg (1.3.7a+dfsg-4) unstable; urgency=medium
+proftpd-dfsg (1.3.7a+dfsg-6) unstable; urgency=medium
 
-    Starting from this release, while the default method of installation is
-	the traditional standalone (i.e. daemon), inet/xinetd/socket
-	configurations are supported also, at the admin's will. More information
-	are provided in README.Debian.
+    The default method of installation is the traditional standalone
+    (i.e. daemon) mode, but inet/xinetd/socket configurations are now
+    supported again, at the admin's will. More information about that are
+    provided in README.Debian. Note that the standalone installation
+	is now via systemd, even if the traditional sysv init script
+	is still provided (but not used), for people that eventually would
+	prefer to use it.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 21 Dec 2020 12:01:36 +0100
-
-proftpd-dfsg (1.3.7a+dfsg-3) unstable; urgency=medium
- 
     Starting from this release, a few modules related to libwrap and
-    TLS/SSL moved to new proftpd-mod-crypto and proftpd-mod-tls, in order
-    to reduce the number of libraries to depend on. A transitional
-    package ensure to avoid breakage of existing configurations
-    in upgrade. New installation needs to take the new layout in
-    consideration and usually install proftpd-core instead of
-    proftpd-basic, and only strictly required add-on packages, as well.
+    TLS/SSL moved to new proftpd-mod-crypto and proftpd-mod-wrap,
+    in order to reduce the number of libraries to depend on. A transitional
+    package ensure to avoid breakage of existing configurations in upgrade.
+    New installations need to take the new layout in consideration and usually
+    install proftpd-core instead of proftpd-basic, with strictly required
+    add-on packages, as well.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 14 Dec 2020 11:05:01 +0100
 


=====================================
debian/proftpd-core.README.Debian
=====================================
@@ -3,7 +3,7 @@ ProFTPD Server for Debian
 
 ** Debian is different
 
-Current maintainer (me) of proftpd on Debian has the questionable
+Current maintainers of proftpd on Debian have the questionable
 habit to integrate many cvs-stolen intermediate patches to the official
 proftpd release, to fix known issues and provide preview features.
 The result is that the released program can be quite far from the
@@ -105,6 +105,7 @@ superservers (inetd/xinetd) or systemd socket to run proftpd instances.
 That could be done by running 
 
 	service proftpd stop
+	systemctl disable proftpd.service
 
 then changing from 'standalone' to 'inetd' the ServerType entry in
 /etc/proftpd/proftpd.conf, and: 


=====================================
debian/proftpd-core.postinst
=====================================
@@ -204,6 +204,15 @@ 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
+		if [ -x /usr/bin/systemctl ]
+		then
+			systemctl enable proftpd.service
+			systemctl restart proftpd.service
+		fi
+	fi
 fi
 
 if [ -e "/etc/init.d/proftpd" ]; then


=====================================
debian/rules
=====================================
@@ -94,7 +94,7 @@ override_dh_installinit:
 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) $(NAME).service
+	dh_installsystemd -p$(PACKAGE) --name=$(NAME) --no-enable --no-start $(NAME).service
 
 checkroot:
 	dh_testdir



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/2799a6a58b66a66e51560cd748c7d993666fbc9f

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