[debian-edu-commits] [Git][debian-edu/debian-edu-config][personal/gber/cf-serverd-config] 7 commits: debian/debian-edu-config.lintian-overrides: Update existing overrides (line numbers and such).
Guido Berhörster (@gber)
gitlab at salsa.debian.org
Wed Aug 9 09:55:30 BST 2023
Guido Berhörster pushed to branch personal/gber/cf-serverd-config at Debian Edu / debian-edu-config
Commits:
f49c8ba1 by Mike Gabriel at 2023-08-07T17:33:00+02:00
debian/debian-edu-config.lintian-overrides: Update existing overrides (line numbers and such).
- - - - -
02d1a793 by Mike Gabriel at 2023-08-07T17:33:00+02:00
debian/debian-edu-config.lintian-overrides: Drop missing-systemd-service-for-init.d-script overrides. Systemd service files are now provided.
- - - - -
d86055e6 by Mike Gabriel at 2023-08-07T17:33:00+02:00
debian/debian-edu-config.lintian-overrides: Drop init.d-script-does-not-implement-status-option override for fetch-ldap-cert. Init script is now gone.
- - - - -
006738c6 by Mike Gabriel at 2023-08-07T17:33:00+02:00
testsuite: Install to pkglibexecdir rather than libexecdir. Thanks lintian.
- - - - -
a5a05dcd by Mike Gabriel at 2023-08-07T17:33:00+02:00
Makefile: Adjust white-spacing in variable declarations.
- - - - -
abde700b by Mike Gabriel at 2023-08-07T18:32:10+02:00
Makefile: Use $(NULL) variable at end of file lists. Allow for better git-patch readability.
- - - - -
a7d49106 by Guido Berhoerster at 2023-08-09T10:55:04+02:00
cf3/promises.cf: fix typo and allow connections from localhost and network
- - - - -
4 changed files:
- Makefile
- cf3/promises.cf
- debian/debian-edu-config.lintian-overrides
- sbin/debian-edu-test-install
Changes:
=====================================
Makefile
=====================================
@@ -1,9 +1,12 @@
PACKAGE = debian-edu-config
+NULL =
+
PROGS = \
debian-edu-ldapserver \
update-ini-file \
- debian-edu-copy-pki
+ debian-edu-copy-pki \
+ $(NULL)
SPROGS = debian-edu-fsautoresize \
debian-edu-ltsp-chroot \
@@ -14,26 +17,29 @@ SPROGS = debian-edu-fsautoresize \
debian-edu-restart-services \
debian-edu-test-install \
debian-edu-update-netblock \
- update-hostname-from-ip
-
-INSTALL = install -D -p -m 755
-INSTALL_DATA= install -D -p -m 644
-
-prefix = /usr/local
-sysconfdir = /etc
-cf3dir = $(sysconfdir)/cfengine3/debian-edu
-bindir = $(prefix)/bin
-sbindir = $(prefix)/sbin
-docdir = $(prefix)/share/doc/$(PACKAGE)
-mandir = $(prefix)/share/man
-ldapdir = $(sysconfdir)/ldap
+ update-hostname-from-ip \
+ $(NULL)
+
+INSTALL = install -D -p -m 755
+INSTALL_DATA = install -D -p -m 644
+
+prefix = /usr/local
+sysconfdir = /etc
+cf3dir = $(sysconfdir)/cfengine3/debian-edu
+bindir = $(prefix)/bin
+sbindir = $(prefix)/sbin
+docdir = $(prefix)/share/doc/$(PACKAGE)
+mandir = $(prefix)/share/man
+ldapdir = $(sysconfdir)/ldap
slbackupphpdir = $(sysconfdir)/slbackup-php
-schemadir = $(ldapdir)/schema
-dhcpdir = $(sysconfdir)/dhcp
-libdir = /usr/lib
-pkglibdir = $(libdir)/debian-edu-config
-vardir = /var
-wwwdir = /etc/debian-edu/www
+schemadir = $(ldapdir)/schema
+dhcpdir = $(sysconfdir)/dhcp
+libdir = /usr/lib
+pkglibdir = $(libdir)/debian-edu-config
+libexecdir = /usr/libexec
+pkglibexecdir = $(libexecdir)/debian-edu-config
+vardir = /var
+wwwdir = /etc/debian-edu/www
CF3FILES = \
@@ -64,7 +70,8 @@ CF3FILES = \
cf.xrdp \
cf.icinga \
edu.cf \
- promises.cf
+ promises.cf \
+ $(NULL)
# Files to install in /etc/
SYSCONFFILES = \
@@ -130,7 +137,8 @@ SYSCONFFILES = \
nagios3/debian-edu/timeperiods.cfg \
munin/debian-edu-munin-node.conf \
polkit-1/localauthority.conf.d/80-edu-admin.conf \
- ntpsec/ntp.d/debian-edu.conf
+ ntpsec/ntp.d/debian-edu.conf \
+ $(NULL)
SYSCONFSCRIPTS = \
dhcp/dhclient-exit-hooks.d/autofs-reload \
@@ -141,7 +149,8 @@ SYSCONFSCRIPTS = \
shutdown-at-night/clients-generator \
resolvconf/update.d/bind-debian-edu \
wicd/scripts/preconnect/set_wireless_mac_from_eth0 \
- X11/Xsession-debian-edu
+ X11/Xsession-debian-edu \
+ $(NULL)
SCHEMAS = \
autofs-debian-edu.schema \
@@ -162,7 +171,8 @@ SCHEMAS = \
gosa-samba3.schema \
gofax.schema \
goserver.schema \
- goto-mime.schema
+ goto-mime.schema \
+ $(NULL)
LDIFS = \
root.ldif \
@@ -175,7 +185,8 @@ LDIFS = \
krb5.ldif \
ltsp.ldif \
gosa.ldif \
- gosa-server.ldif
+ gosa-server.ldif \
+ $(NULL)
LDAPPROGRAMS = \
ldap-add-host-to-netgroup \
@@ -183,7 +194,8 @@ LDAPPROGRAMS = \
ldap-createuser-krb5 \
ldap2netgroup \
ldap-debian-edu-install \
- sitesummary2ldapdhcp
+ sitesummary2ldapdhcp \
+ $(NULL)
WWWFILES = \
index.html.ca \
@@ -204,10 +216,12 @@ WWWFILES = \
index.html.zh-tw \
skl-ren_css.css \
logo-trans.png \
- wpad.dat
+ wpad.dat \
+ $(NULL)
LIBFILES = \
thunderbird/distribution/policies.json \
+ $(NULL)
all:
$(MAKE) -C www
@@ -391,9 +405,9 @@ install-testsuite:
$(INSTALL_DATA) $$f $(DESTDIR)/usr/$$f ; \
done
- install -d $(DESTDIR)$(pkglibdir)/testsuite
+ install -d $(DESTDIR)$(pkglibexecdir)/testsuite
set -e ; for test in testsuite/* ; do \
- $(INSTALL) $$test $(DESTDIR)$(pkglibdir)/$$test; \
+ $(INSTALL) $$test $(DESTDIR)$(pkglibexecdir)/$$test; \
done
=====================================
cf3/promises.cf
=====================================
@@ -8,9 +8,9 @@
body server control
# Debian Edu specific
{
- allowconnects => { "10.0.0.0.0/8" };
- allowallconnects => { "10.0.0.0.0/8" };
- trustkeysfrom => { "10.0.0.0.0/8" };
+ allowconnects => { "127.0.0.1", "::1", "10.0.0.0/8" };
+ allowallconnects => { "127.0.0.1", "::1", "10.0.0.0/8" };
+ trustkeysfrom => { "10.0.0.0/8" };
maxconnections => "15";
denybadclocks => "false";
allowusers => { "root" };
=====================================
debian/debian-edu-config.lintian-overrides
=====================================
@@ -5,29 +5,23 @@ debian-edu-config: debconf-is-not-a-registry [usr/share/debian-edu-config/d-i/pr
debian-edu-config: debconf-is-not-a-registry [usr/share/debian-edu-config/tools/edu-icinga-setup:24]
debian-edu-config: debconf-is-not-a-registry [usr/share/debian-edu-config/tools/kerberos-kdc-init:31]
debian-edu-config: debconf-is-not-a-registry [usr/share/debian-edu-config/tools/run-at-firstboot:11]
-debian-edu-config: missing-systemd-service-for-init.d-script chromium-ldapconf [etc/init.d/chromium-ldapconf]
-debian-edu-config: missing-systemd-service-for-init.d-script enable-nat [etc/init.d/enable-nat]
-debian-edu-config: missing-systemd-service-for-init.d-script fetch-ldap-cert [etc/init.d/fetch-ldap-cert]
-debian-edu-config: missing-systemd-service-for-init.d-script fetch-rootca-cert [etc/init.d/fetch-rootca-cert]
-debian-edu-config: missing-systemd-service-for-init.d-script firefox-ldapconf [etc/init.d/firefox-ldapconf]
debian-edu-config: init.d-script-does-not-implement-status-option [etc/init.d/chromium-ldapconf]
-debian-edu-config: init.d-script-does-not-implement-status-option [etc/init.d/fetch-ldap-cert]
debian-edu-config: init.d-script-does-not-implement-status-option [etc/init.d/fetch-rootca-cert]
debian-edu-config: init.d-script-does-not-implement-status-option [etc/init.d/firefox-ldapconf]
debian-edu-config: possibly-insecure-handling-of-tmp-files-in-maintainer-script $TMPDIR/all.ldif [postinst:177]
debian-edu-config: possibly-insecure-handling-of-tmp-files-in-maintainer-script $TMPDIR/all.ldif [postinst:182]
debian-edu-config: possibly-insecure-handling-of-tmp-files-in-maintainer-script $TMPDIR/all.ldif [postinst:184]
-debian-edu-config: unused-debconf-template debian-edu-config/first-user-fullname [templates:471]
-debian-edu-config: unused-debconf-template debian-edu-config/first-user-name [templates:465]
-debian-edu-config: unused-debconf-template debian-edu-config/first-user-password [templates:477]
+debian-edu-config: unused-debconf-template debian-edu-config/first-user-fullname [templates:491]
+debian-edu-config: unused-debconf-template debian-edu-config/first-user-name [templates:485]
+debian-edu-config: unused-debconf-template debian-edu-config/first-user-password [templates:497]
debian-edu-config: unused-debconf-template debian-edu-config/kdc-password [templates:71]
-debian-edu-config: unused-debconf-template debian-edu-config/kdc-password-again [templates:148]
-debian-edu-config: unused-debconf-template debian-edu-config/kdc-password-empty [templates:227]
-debian-edu-config: unused-debconf-template debian-edu-config/kdc-password-mismatch [templates:188]
-debian-edu-config: unused-debconf-template debian-edu-config/ldap-password [templates:268]
-debian-edu-config: unused-debconf-template debian-edu-config/ldap-password-again [templates:345]
-debian-edu-config: unused-debconf-template debian-edu-config/ldap-password-empty [templates:424]
-debian-edu-config: unused-debconf-template debian-edu-config/ldap-password-mismatch [templates:385]
+debian-edu-config: unused-debconf-template debian-edu-config/kdc-password-again [templates:152]
+debian-edu-config: unused-debconf-template debian-edu-config/kdc-password-empty [templates:235]
+debian-edu-config: unused-debconf-template debian-edu-config/kdc-password-mismatch [templates:194]
+debian-edu-config: unused-debconf-template debian-edu-config/ldap-password [templates:278]
+debian-edu-config: unused-debconf-template debian-edu-config/ldap-password-again [templates:359]
+debian-edu-config: unused-debconf-template debian-edu-config/ldap-password-empty [templates:442]
+debian-edu-config: unused-debconf-template debian-edu-config/ldap-password-mismatch [templates:401]
debian-edu-config: bash-term-in-posix-shell '$HOSTNAME' [usr/sbin/update-hostname-from-ip:117]
debian-edu-config: bash-term-in-posix-shell '$HOSTNAME' [usr/sbin/update-hostname-from-ip:122]
debian-edu-config: bash-term-in-posix-shell '$HOSTNAME' [usr/sbin/update-hostname-from-ip:124]
=====================================
sbin/debian-edu-test-install
=====================================
@@ -5,7 +5,7 @@
# Make sure strings and dates have predictable format
LC_ALL=C
-basedir=/usr/lib/debian-edu-config/testsuite
+basedir=/usr/libexec/debian-edu-config/testsuite
cd $basedir
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/9dd3f55ff479aa5e93f3cda5a70e2faa32a36801...a7d4910618371e0167697468c2b0cfdca6057c6b
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/9dd3f55ff479aa5e93f3cda5a70e2faa32a36801...a7d4910618371e0167697468c2b0cfdca6057c6b
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/20230809/e4552966/attachment-0001.htm>
More information about the debian-edu-commits
mailing list