[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 4 commits: ldap-tools/sitesummary2ldapdhcp: Use 'workstations' as default system type.

WolfgangSchweer gitlab at salsa.debian.org
Wed Oct 10 17:08:55 BST 2018


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


Commits:
31dea4a2 by Wolfgang Schweer at 2018-10-10T08:42:48Z
ldap-tools/sitesummary2ldapdhcp: Use 'workstations' as default system type.

Change the default type from 'netdevices' to 'workstations' to avoid a possible
pitfall. (For hosts of type 'netdevices' Krb5 principals and a related keytab
file can't be created due to missing attributes.)
Also, 'workstations' is supposed to be the wanted type in most cases.

- - - - -
192a8360 by Wolfgang Schweer at 2018-10-10T08:55:53Z
share/debian-edu-config/tools/gosa-modify-host: Improve logging test.

- - - - -
b174d3ac by Wolfgang Schweer at 2018-10-10T09:07:20Z
share/debian-edu-config/tools/gosa-remove-host: Add logging statement.

- - - - -
c3a33fdb by Wolfgang Schweer at 2018-10-10T16:07:55Z
Add changelog entries for last commits.

- - - - -


4 changed files:

- debian/changelog
- ldap-tools/sitesummary2ldapdhcp
- share/debian-edu-config/tools/gosa-modify-host
- share/debian-edu-config/tools/gosa-remove-host


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+debian-edu-config (2.10.40) UNRELEASED; urgency=medium
+
+  * ldap-tools/sitesummary2ldapdhcp: Use 'workstations' as default system type.
+    Change the default type from 'netdevices' to 'workstations' to avoid a
+    possible pitfall. (For hosts of type 'netdevices' Krb5 principals and a
+    related keytabfile can't be created due to missing attributes.)
+    Also, 'workstations' is supposed to be the wanted type in most cases.
+  * share/debian-edu-config/tools/gosa-modify-host: Improve logging text.
+  * share/debian-edu-config/tools/gosa-remove-host: Add logging statement.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 10 Oct 2018 10:59:32 +0200
+
 debian-edu-config (2.10.39) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
ldap-tools/sitesummary2ldapdhcp
=====================================
@@ -21,7 +21,7 @@ my $server = $ARGV[0] || find_ldap_server() || "ldap";
 my $base   = $ARGV[1] || find_ldap_base($server)
     || "dc=skole,dc=skolelinux,dc=no";
 
-my $type = "netdevices";
+my $type = "workstations";
 if ($opts{t}) {
     $type = $opts{t}
 }
@@ -43,6 +43,7 @@ information.
  -u userfilter  Filter used to find LDAP user used to update LDAP.
  -t TYPE        Specify type of system(s) to add. TYPE can be: servers,
                 workstations, terminals, netdevices or printers.
+                Defaults to workstations if not specified.
 EOF
 
     exit $retval;


=====================================
share/debian-edu-config/tools/gosa-modify-host
=====================================
@@ -7,12 +7,11 @@ set -ex
 
 HOST="$1"
 
-/usr/share/debian-edu-config/tools/gosa-create-host $HOST
 kadmin.local -q "add_principal -policy hosts -randkey host/$HOST.intern"
 kadmin.local -q "ktadd -k /etc/debian-edu/host-keytabs/$HOST.intern.keytab host/$HOST.intern"
 kadmin.local -q "add_principal -policy hosts -randkey nfs/$HOST.intern"
 kadmin.local -q "ktadd -k /etc/debian-edu/host-keytabs/$HOST.intern.keytab nfs/$HOST.intern"
-logger -t gosa-modify-host -p notice Krb5 keytab file for \'$HOST\' created.
+logger -t gosa-modify-host -p notice Krb5 principals and keytab file for host \'$HOST\' created.
 
 # update services:
 /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs


=====================================
share/debian-edu-config/tools/gosa-remove-host
=====================================
@@ -17,6 +17,7 @@ if $(kadmin.local listprincs | grep -q $HOST) ; then
         kadmin.local delprinc $i
     done
     rm /etc/debian-edu/host-keytabs/$(ls -l /etc/debian-edu/host-keytabs | grep $HOST | awk '{print $9}')
+    logger -t gosa-remove-host -p notice Krb5 principals and keytab file for host \'$HOST\' removed.
 fi
 #
 



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/28f0a2170990967d3b33c926ba11c92fed3f08aa...c3a33fdb78d1461a272d3f97b477db732040d9ad

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/28f0a2170990967d3b33c926ba11c92fed3f08aa...c3a33fdb78d1461a272d3f97b477db732040d9ad
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/20181010/d115a1af/attachment-0001.html>


More information about the debian-edu-commits mailing list