[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 5 commits: Move d-e-c-*-for-netgroup-hosts scripts to pkglibexecdir.
Mike Gabriel (@sunweaver)
gitlab at salsa.debian.org
Thu Aug 10 16:30:44 BST 2023
Mike Gabriel pushed to branch master at Debian Edu / debian-edu-config
Commits:
2a3319cc by Mike Gabriel at 2023-08-10T16:58:37+02:00
Move d-e-c-*-for-netgroup-hosts scripts to pkglibexecdir.
- - - - -
a77d163f by Mike Gabriel at 2023-08-10T17:07:30+02:00
debian/debian-edu-config.maintscript: Assure removal of /etc/init.d/fetch-ldap-cert conffile.
- - - - -
f1df1d86 by Mike Gabriel at 2023-08-10T17:08:00+02:00
debian/debian-edu-config.postinst: Assure runlevel de-registering of init script fetch-ldap-cert.
- - - - -
ebc3a021 by Mike Gabriel at 2023-08-10T17:23:33+02:00
debian/debian-edu-config.cron.*: Only run scripts if they exist. Thanks piuparts.
- - - - -
38375cfe by Mike Gabriel at 2023-08-10T17:29:59+02:00
release as 2.12.34
- - - - -
12 changed files:
- Makefile
- debian/changelog
- debian/debian-edu-config.cron.daily
- debian/debian-edu-config.cron.hourly
- debian/debian-edu-config.debian-edu-cups-queue-autoflush.service
- debian/debian-edu-config.debian-edu-cups-queue-autoreenable.service
- debian/debian-edu-config.debian-edu-fsautoresize.service
- debian/debian-edu-config.maintscript
- debian/debian-edu-config.postinst
- sbin/debian-edu-cups-queue-autoflush-for-netgroup-hosts → libexec/debian-edu-cups-queue-autoflush-for-netgroup-hosts
- sbin/debian-edu-cups-queue-autoreenable-for-netgroup-hosts → libexec/debian-edu-cups-queue-autoreenable-for-netgroup-hosts
- sbin/debian-edu-fsautoresize-for-netgroup-hosts → libexec/debian-edu-fsautoresize-for-netgroup-hosts
Changes:
=====================================
Makefile
=====================================
@@ -9,10 +9,7 @@ PROGS = \
$(NULL)
SPROGS = \
- debian-edu-cups-queue-autoflush-for-netgroup-hosts \
- debian-edu-cups-queue-autoreenable-for-netgroup-hosts \
debian-edu-fsautoresize \
- debian-edu-fsautoresize-for-netgroup-hosts \
debian-edu-ltsp-chroot \
debian-edu-ltsp-install \
debian-edu-ltsp-initrd \
@@ -24,6 +21,12 @@ SPROGS = \
update-hostname-from-ip \
$(NULL)
+LIBEXECPROGS = \
+ debian-edu-cups-queue-autoflush-for-netgroup-hosts \
+ debian-edu-cups-queue-autoreenable-for-netgroup-hosts \
+ debian-edu-fsautoresize-for-netgroup-hosts \
+ $(NULL)
+
INSTALL = install -D -p -m 755
INSTALL_DATA = install -D -p -m 644
@@ -237,6 +240,7 @@ install: install-testsuite
install -d $(DESTDIR)$(ldapdir)
install -d $(DESTDIR)$(dhcpdir)
install -d $(DESTDIR)$(libdir)
+ install -d $(DESTDIR)$(pkglibexecdir)
# program's manpages are autodetected.
set -e ; for prog in $(PROGS); do \
@@ -255,6 +259,10 @@ install: install-testsuite
fi \
done
+ set -e ; for libexecprog in $(LIBEXECPROGS); do \
+ $(INSTALL) libexec/$$libexecprog $(DESTDIR)$(pkglibexecdir) ; \
+ done
+
$(INSTALL_DATA) README $(DESTDIR)$(docdir)/README
$(INSTALL_DATA) README.public_html_with_PHP-CGI+suExec.md $(DESTDIR)$(docdir)/README.public_html_with_PHP-CGI+suExec.md
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-debian-edu-config (2.12.34) UNRELEASED; urgency=medium
+debian-edu-config (2.12.34) unstable; urgency=medium
[ Mike Gabriel ]
* Start 2.12.34 development.
@@ -12,6 +12,15 @@ debian-edu-config (2.12.34) UNRELEASED; urgency=medium
* Makefile: Adjust white-spacing in variable declarations.
* Makefile: Use $(NULL) variable at end of file lists. Allow for better git-
patch readability.
+ * Convert CRON configuration to systemd timers.
+ * sbin/*-for-netgroup-hosts: Some noop + white-spacing beautifications.
+ * Move d-e-c-*-for-netgroup-hosts scripts to pkglibexecdir.
+ * debian/debian-edu-config.postinst:
+ + Assure runlevel de-registering of init script fetch-ldap-cert.
+ * debian/debian-edu-config.maintscript:
+ + Assure removal of /etc/init.d/fetch-ldap-cert conffile.
+ * debian/debian-edu-config.cron.*:
+ + Only run scripts if they exist. Thanks piuparts.
[ Daniel Teichmann ]
* etc/dhcp/dhcp-debian-edu.conf:
@@ -57,13 +66,13 @@ debian-edu-config (2.12.34) UNRELEASED; urgency=medium
recognized. (Closes: #1042940).
* Configure gosa not to use STARTTLS since TLS is already used. ldapTLS
configures the use of STARTTLS, not TLS per se which is enabled by the
- use of ldaps: protcol in URLs. (Closes: #1041322).
+ use of ldaps: protocol in URLs. (Closes: #1041322).
* Allow root access to cups via SystemGroups. 'root' access is allowed in
the default configuration and e.g. necessary for services like
debian-edu-cups-queue-autoflush.service to work. (Closes: #1043397).
* cf3/promises.cf: fix typo and allow connections from localhost and network.
- -- Mike Gabriel <sunweaver at debian.org> Mon, 07 Aug 2023 17:02:13 +0200
+ -- Mike Gabriel <sunweaver at debian.org> Thu, 10 Aug 2023 16:47:59 +0200
debian-edu-config (2.12.33) unstable; urgency=medium
=====================================
debian/debian-edu-config.cron.daily
=====================================
@@ -6,4 +6,6 @@ export PATH
[ -d /run/systemd/system ] && exit 0
# regularly run CUPS Queue autoflush if configured via netgroups
-debian-edu-cups-queue-autoflush-for-netgroup-hosts
+if [ -x /usr/libexec/debian-edu-config/debian-edu-cups-queue-autoflush-for-netgroup-hosts ]; then
+ exec /usr/libexec/debian-edu-config/debian-edu-cups-queue-autoflush-for-netgroup-hosts
+fi
=====================================
debian/debian-edu-config.cron.hourly
=====================================
@@ -6,7 +6,11 @@ export PATH
[ -d /run/systemd/system ] && exit 0
# regularly run fsautoresize if configured via netgroups
-debian-edu-fsautoresize-for-netgroup-hosts
+if [ -x /usr/libexec/debian-edu-config/debian-edu-fsautoresize-for-netgroup-hosts ]; then
+ /usr/libexec/debian-edu-config/debian-edu-fsautoresize-for-netgroup-hosts
+fi
# regularly run CUPS Queue autoreenable if configured via netgroups
-debian-edu-cups-queue-autoreenable-for-netgroup-hosts
+if [ -x /usr/libexec/debian-edu-config/debian-edu-cups-queue-autoreenable-for-netgroup-hosts ]; then
+ /usr/libexec/debian-edu-config/debian-edu-cups-queue-autoreenable-for-netgroup-hosts
+fi
=====================================
debian/debian-edu-config.debian-edu-cups-queue-autoflush.service
=====================================
@@ -3,4 +3,4 @@ Description=Auto-flush CUPS queues on hosts configured via the cups-queue-autofl
[Service]
Type=oneshot
-ExecStart=/usr/sbin/debian-edu-cups-queue-autoflush-for-netgroup-hosts
+ExecStart=/usr/libexec/debian-edu-config/debian-edu-cups-queue-autoflush-for-netgroup-hosts
=====================================
debian/debian-edu-config.debian-edu-cups-queue-autoreenable.service
=====================================
@@ -3,4 +3,4 @@ Description=Auto-reenable CUPS queues on hosts configured via the cups-queue-aut
[Service]
Type=oneshot
-ExecStart=/usr/sbin/debian-edu-cups-queue-autoreenable-for-netgroup-hosts
+ExecStart=/usr/libexec/debian-edu-config/debian-edu-cups-queue-autoreenable-for-netgroup-hosts
=====================================
debian/debian-edu-config.debian-edu-fsautoresize.service
=====================================
@@ -3,4 +3,4 @@ Description=Run fsautoresize regularly on hosts configured via the fsautoresize-
[Service]
Type=oneshot
-ExecStart=/usr/sbin/debian-edu-fsautoresize-for-netgroup-hosts
+ExecStart=/usr/libexec/debian-edu-config/debian-edu-fsautoresize-for-netgroup-hosts
=====================================
debian/debian-edu-config.maintscript
=====================================
@@ -2,3 +2,4 @@ rm_conffile /share/debian-edu-config/debian-edu.addmachine.template 2.12.5
rm_conffile /share/debian-edu-config/debian-edu.ldapscripts.passwd 2.12.5
rm_conffile /etc/cfengine3/debian-edu/cf.ldapscripts 2.12.5
dir_to_symlink /etc/debian-edu/host-keytabs /var/lib/debian-edu/host-keytabs 2.12.17
+rm_conffile /etc/init.d/fetch-ldap-cert 2.12.33
=====================================
debian/debian-edu-config.postinst
=====================================
@@ -197,6 +197,10 @@ configure)
rmdir /etc/smbldap-tools
fi
fi
+ # Unregister init script fetch-ldap-cert
+ if dpkg --compare-versions "$2" le "2.12.33"; then
+ update-rc.d -f fetch-ldap-cert remove
+ fi
;;
esac
=====================================
sbin/debian-edu-cups-queue-autoflush-for-netgroup-hosts → libexec/debian-edu-cups-queue-autoflush-for-netgroup-hosts
=====================================
=====================================
sbin/debian-edu-cups-queue-autoreenable-for-netgroup-hosts → libexec/debian-edu-cups-queue-autoreenable-for-netgroup-hosts
=====================================
=====================================
sbin/debian-edu-fsautoresize-for-netgroup-hosts → libexec/debian-edu-fsautoresize-for-netgroup-hosts
=====================================
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/9ec5fe82ad2b5c65ac0284713cbbbb4cf8d25a92...38375cfec0d15c11457dd659c94f51d42b03debd
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/9ec5fe82ad2b5c65ac0284713cbbbb4cf8d25a92...38375cfec0d15c11457dd659c94f51d42b03debd
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20230810/d765f80c/attachment-0001.htm>
More information about the debian-edu-commits
mailing list