[debian-edu-commits] [Git][debian-edu/debian-edu-install][master] 7 commits: preseed-values/defaults.workstation: Drop obsolete entries for cvs and

WolfgangSchweer gitlab at salsa.debian.org
Sun Dec 30 22:06:03 GMT 2018


WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-install


Commits:
ba58e406 by Wolfgang Schweer at 2018-12-30T16:29:21Z
preseed-values/defaults.workstation: Drop obsolete entries for cvs and
xserver-xorg

- - - - -
3574b523 by Wolfgang Schweer at 2018-12-30T16:32:36Z
preseed-values/defaults.standalone: Drop obsolete entries for cvs, ntp-simple
and ifupdaown.

- - - - -
4bea6ae4 by Wolfgang Schweer at 2018-12-30T16:35:03Z
preseed-values/defaults.networked: Drop obsolete entry for ocsinventory-agent.
Use FQDN for the gosa-desktop URL.
Set nslcd/ldap-cacertfile string to point to the debian-edu-server.crt file.
Change the nslcd/ldap-reqcert string from never to demand.
Add settings for lightdm and sddm (trying to prefer lightdm, sddm lacks a
language-chooser).

- - - - -
322a8da4 by Wolfgang Schweer at 2018-12-30T17:37:42Z
preseed-values/defaults.common: Drop obsolete entries for discover, ntp-simple,
xserver-xorg, dash and scsiadd.
Also drop workaround for dictionaries-common/default-{ispell,wordlist}; Bug
by education-desktop-other recommending tmispell-voikko.
Preseeding both ispell and wordlist with 'Manual symlink setting' leaves the
user without those if an application doesn't choose one. That's maybe not what
a user expects.

- - - - -
219c8c39 by Wolfgang Schweer at 2018-12-30T18:04:38Z
preseed-values/defaults.ltsp-server: Drop obsolete entries for dhcp3-server and
aftp.
Adjust entries for slbackup (new default LTSP chroot) and tftpd-hpa (drop the
'--secure' option).

- - - - -
bf1ff5da by Wolfgang Schweer at 2018-12-30T21:33:55Z
preseed-values/defaults.main-server: Drop obsolete entries for dhcp3-server,
ntp-simple, calamaris, foomatic-bin, fetchmail, squid, courier-base, courier-ssl
and atftpd.
Adjust entries for bind9 (options) and tftpd-hpa (drop '--secure' option to be
able to serve both PXE and LTSP).

- - - - -
eac4048a by Wolfgang Schweer at 2018-12-30T22:05:07Z
Add changelog entries for last commits.

- - - - -


7 changed files:

- debian/changelog
- preseed-values/defaults.common
- preseed-values/defaults.ltsp-server
- preseed-values/defaults.main-server
- preseed-values/defaults.networked
- preseed-values/defaults.standalone
- preseed-values/defaults.workstation


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,36 @@
+debian-edu-install (2.10.18) UNRELEASED; urgency=medium
+
+  * Rework preseed files. It will allow to reduce the number of #311188 issues.
+    - preseed-values/defaults.workstation:
+      Drop obsolete entries for cvs and xserver-xorg.
+    - preseed-values/defaults.standalone:
+      Drop obsolete entries for cvs, ntp-simple and ifupdown.
+    - preseed-values/defaults.networked:
+      + Drop obsolete entry for ocsinventory-agent.
+      + Use FQDN for the gosa-desktop URL.
+      + Set nslcd/ldap-cacertfile string to point to the debian-edu-server.crt.
+      + Change the nslcd/ldap-reqcert string from 'never' to 'demand'.
+      + Add settings for lightdm and sddm (trying to prefer lightdm; sddm lacks
+        a language-chooser).
+    - preseed-values/defaults.common:
+      + Drop obsolete entries for discover, ntp-simple, xserver-xorg, dash and
+        scsiadd.
+      + Drop workaround for dictionaries-common/default-{ispell,wordlist}; the
+        related bug has probably been due to education-desktop-other
+        recommending tmispell-voikko. Preseeding both ispell and wordlist with
+       'Manual symlink setting' leaves the user without those if an application
+        doesn't choose one. That's maybe not what a user expects.
+    - preseed-values/defaults.main-server:
+      + Drop obsolete entries for dhcp3-server, ntp-simple, calamaris,
+        foomatic-bin, fetchmail, squid, courier-base, courier-ssl and atftpd.
+      + Adjust entries for bind9 (options) and tftpd-hpa (drop '--secure' option
+        so that both PXE and LTSP could be served).
+    - preseed-values/defaults.ltsp-server:
+      + Drop obsolete entries for aftpd and dhcp3-server.
+      + Adjust entries for slbackup (new default LTSP chroot) and tftpd-hpa.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Sun, 30 Dec 2018 22:45:33 +0100
+
 debian-edu-install (2.10.17) unstable; urgency=medium
 
   * Rename debian-edu-install.lintian-override to


=====================================
preseed-values/defaults.common
=====================================
@@ -1,6 +1,3 @@
-# Let devfsd manage the CDROM location
-discover discover/manage_cdrom_devices boolean false
-
 # Use MD5 passwords, use shadow passords and skip creating local user
 # Local users should be stored in LDAP
 passwd passwd/md5 boolean true
@@ -10,11 +7,6 @@ passwd passwd/shadow boolean true
 # Don't ask for disabling root login
 passwd passwd/root-login boolean true
 
-# Use the local NTP server on all hosts except the server itself
-ntp-simple shared/ntp/update-conf boolean true
-ntp-simple shared/ntp/servers string ntp
-ntp-simple shared/ntp/localclock boolean false
-
 # Skip the exim4 config.
 exim4-config exim4/dc_eximconfig_configtype select local delivery only; not on a network
 exim4-config exim4/dc_postmaster string root
@@ -25,15 +17,6 @@ d-i grub-installer/only_debian boolean true
 # Keep old style (aka unpredictable) network interfaces names.
 grub-pc grub2/linux_cmdline_default string net.ifnames=0 quiet
 
-# Set some display modes to avoid question for xserver
-xserver-xorg xserver-xorg/config/display/modes multiselect 1024x786, 800x600, 640x480
-
-#
-# Avoid bash as /bin/sh to make sure /usr/ can be cleanly unmounted
-# when using NSS/LDAP (with ldap libraries in /usr/lib/).  (Reported
-# as Debian bug #159771.)
-dash    dash/sh boolean true
-
 # Pick a random workgroup setting to avoid question during installation
 samba-common samba-common/workgroup string skolelinux
 
@@ -47,20 +30,12 @@ d-i clock-setup/utc boolean true
 # enable it instead, or wait until we start using encrypted file systems?
 uswsusp uswsusp/encrypt boolean false
 
-#Avoid suid question of scsiadd and defaults to a non SUID installation
-scsiadd scsiadd/SUID_scsiadd boolean false
-
 # Enable cpufrequtils frequency scaling, to save power
 cpufrequtils cpufrequtils/enable boolean true
 
 # Keep default (no) for hddtemp daemon setting
 hddtemp hddtemp/daemon boolean false
 
-# Workaround for #641225,#566912 bug in dictionary-common for strange
-# question showing up for some languages.
-dictionaries-common dictionaries-common/default-wordlist select Manual symlink setting
-dictionaries-common dictionaries-common/default-ispell select Manual symlink setting
-
 # Set up APT sources, see also our
 # /usr/lib/apt-setup/generators/70debian-edu-install script.  This
 # remove the need to set up APT sources using cfengine.


=====================================
preseed-values/defaults.ltsp-server
=====================================
@@ -1,20 +1,11 @@
-# All non-default debconf answsers for LTSP servers
-
-# dhcp3-server warns about new auth behavior. We dont want to see it
-dhcp3-server dhcp3-server/new_auth_behavior boolean false
-
 # for slbackup (shall just be needed/used when installing a combined
 # main-server+ltsp-server)
-slbackup slbackup/client_location string /etc /skole/tjener/home0 /opt/ltsp/i386/etc /var/backups
-
-# Set up atftpd to serve the kernels
-atftpd atftpd/multicast boolean false
-atftpd atftpd/use_inetd boolean true
-atftpd atftpd/basedir string /var/lib/tftpboot
+slbackup slbackup/client_location string /etc /skole/tjener/home0 /opt/ltsp/amd64/etc /var/backups
 
 # Set up tftpd-hpa to serve the kernels from /var/lib/tftpboot, as newer
 # versions (5.0-1+) default to using /srv/tftp.
 tftpd-hpa tftpd-hpa/directory string /var/lib/tftpboot
+tftpd-hpa	tftpd-hpa/options	string
 
 # Try to use the ltsp-client-builder udeb if present
 d-i ltsp-client-builder/run boolean true


=====================================
preseed-values/defaults.main-server
=====================================
@@ -1,31 +1,3 @@
-# dhcp3-server warns about new auth behavior. We dont want to see it
-dhcp3-server dhcp3-server/new_auth_behavior boolean false
-
-ntp-simple shared/ntp/update-conf boolean true
-# This could have been some good public NTP servers like pool.ntp.org, but
-# that keeps ISDN lines up all the time.  Changed the default from to 'ntp'
-ntp-simple shared/ntp/servers string ntp
-# Use the local clock as a NTP server clock
-ntp-simple ntp-simple/localclock boolean true
-ntp-simple shared/ntp/localclock boolean true
-
-# The web server statistics
-calamaris calamaris/daily/html string /var/www/calamaris/daily.html
-calamaris calamaris/daily/task select web
-calamaris calamaris/daily/title string Squid daily
-calamaris calamaris/monthly/html string /var/www/calamaris/monthly.html
-calamaris calamaris/monthly/task select web
-calamaris calamaris/monthly/title string Squid monthly
-calamaris calamaris/weekly/html string /var/www/calamaris/weekly.html
-calamaris calamaris/weekly/task select web
-calamaris calamaris/weekly/title string Squid weekly
-
-# Choose textfilter dynamically
-foomatic-bin foomatic-bin/textfilter select Automagic
-
-# Don't run a global fetchmail delivery service
-fetchmail fetchmail/systemwide boolean false
-
 # skip configuration of slapd for now, will do it manually later
 slapd slapd/no_configuration boolean true
 # Set basedn in ldap
@@ -57,15 +29,6 @@ debian-edu-config debian-edu-config/update-hostname boolean false
 # Kerberos KDC and admin server
 krb5-admin-server krb5-admin-server/kadmind boolean true
 
-# Tell squid to fix permissions on cache-dir
-squid squid/fix_cachedir_perms boolean true
-
-# Dont set up webadmin-configmode for courier
-courier-base courier-base/webadmin-configmode boolean false
-
-# We dont mind setting up a certificate later
-courier-ssl courier-ssl/certnotice boolean false
-
 # Provide a default icingaadmin password, enable cgi
 icinga-common icinga/check_external_commands boolean true
 icinga-cgi icinga/adminpassword password skolelinux
@@ -80,17 +43,13 @@ sitesummary sitesummary/replace-munin-config boolean true
 sitesummary sitesummary/enable-nagios-config boolean true
 sitesummary-client sitesummary-client/hostclass string main-server
 
-#Configure bind9 correctly for debian-edu.. This will fix one of the blocker
-#bugs of #311188
-bind9 bind9/default-start-options string -c /etc/bind9/debian-edu/named-bind9.conf
-
-# Set up atftpd to serve the kernels
-atftpd atftpd/multicast boolean false
-atftpd atftpd/use_inetd boolean true
-atftpd atftpd/basedir string /var/lib/tftpboot
+#Configure bind9 options debian-edu.
+bind9 bind9/default-start-options string -4 -u bind
 
-# Set up tftpd-hpa to work with PXE installs.
-tftpd-hpa/directory string /var/lib/tftpboot
+# Set up tftpd-hpa to work with PXE installs. Also, unset '--secure' option to be
+# able to serve both LTSP and PXE.
+tftpd-hpa tftpd-hpa/directory string /var/lib/tftpboot
+tftpd-hpa	tftpd-hpa/options	string
 
 # Ask for info on initial user before it is created in LDAP
 user-setup-udeb passwd/make-user boolean true


=====================================
preseed-values/defaults.networked
=====================================
@@ -13,9 +13,9 @@ libnss-ldapd	libnss-ldapd/nsswitch	multiselect	group, netgroup, networks, passwd
 # Some of the libnss-ldapd settings moved to nslcd in Squeeze
 nslcd	nslcd/ldap-base	string	dc=skole,dc=skolelinux,dc=no
 nslcd	nslcd/ldap-uris	string	ldap://ldap
-nslcd   nslcd/ldap-starttls             boolean true
-# XXX Certificate checking should be enabled, but do not work at the moment
-nslcd   nslcd/ldap-reqcert              select never
+nslcd	nslcd/ldap-starttls boolean true
+nslcd	nslcd/ldap-reqcert string demand
+nslcd   nslcd/ldap-cacertfile string /etc/ssl/certs/debian-edu-server.crt
 
 # Update hostname from DNS
 debian-edu-config debian-edu-config/update-hostname boolean true
@@ -26,16 +26,11 @@ sitesummary-client sitesummary-client/collector_url string http://sitesummary/cg
 sitesummary-client sitesummary-client/nagios-server string sitesummary
 sitesummary-client sitesummary-client/enable-nagios-nrpe-config boolean true
 
-# Configure OSC to use server.
-ocsinventory-agent ocsinventory-agent/method string http
-# XXX should it get its own DNS name?
-#ocsinventory-agent ocsinventory-agent/server string sitesummary
-
 # enable the WINS settings feature for addresses via DHCP
 samba-common samba-common/dhcp boolean true
 
 # Configure gosa-desktop
-gosa-desktop gosa-desktop/url string https://www/gosa/
+gosa-desktop gosa-desktop/url string https://www.intern/gosa/
 
 # Initial exim4 configuration for clients
 # FIXME find out if this is correct and enough.
@@ -48,3 +43,7 @@ exim4-config	exim4/use_split_config	boolean	true
 exim4-config	exim4/mailname	string	postoffice.intern
 exim4-config	exim4/dc_minimaldns	boolean	false
 exim4-config	exim4/dc_other_hostnames	string	intern
+
+# Prefer lightdm, sddm doesn't provide a language chooser
+lightdm	shared/default-x-display-manager	select	lightdm
+sddm	shared/default-x-display-manager	select	lightdm


=====================================
preseed-values/defaults.standalone
=====================================
@@ -1,25 +1,14 @@
-
 # All non-default debconf answers for standalone installation
 
-# Do not create the CVS repository by default
-cvs cvs/badrepositories select ignore
-
 # Make another user
 passwd passwd/make-user boolean true
 
-# We use consolekit and policykit, no need for static group membership
 # The standalone user is granted sudo access.
 passwd passwd/user-default-groups string sudo
 
-# Use local clock
-ntp-simple shared/ntp/localclock boolean true
-
 # Deny other use of homedir
 adduser adduser/homedir-permission boolean false
 
-# do not do this
-ifupdown ifupdown/convert-interfaces boolean false
-
 # Do not enable the WINS feature of samba-common, because this profile
 # does not get a address via DHCP
 samba-common samba-common/dhcp boolean false


=====================================
preseed-values/defaults.workstation
=====================================
@@ -1,9 +1,3 @@
 # All non-default debconf answers for workstation installation
 
-# Do not create the CVS repository by default
-cvs cvs/badrepositories select ignore
-
-# Use the keyboard setting from d-i when configuring Xorg
-xserver-org xserver-xorg/autodetect_keyboard boolean true
-
 sitesummary-client sitesummary-client/hostclass string workstation



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/compare/f804c7c811c4da435b30f80c7d94ea8506aa754c...eac4048a4f4a354cd31ad8488dc114e9fbf14ea0

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/compare/f804c7c811c4da435b30f80c7d94ea8506aa754c...eac4048a4f4a354cd31ad8488dc114e9fbf14ea0
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/20181230/5b7568a6/attachment-0001.html>


More information about the debian-edu-commits mailing list