[debian-lan-devel] [debian-lan] 06/07: Minor fixes and improvements.

[Andreas B. Mundt]

This is an automated email from the git hooks/post-receive script.

andi pushed a commit to branch master
in repository debian-lan.

commit ee046b947ef309018a23fa9455b26508515eb66a
Author: Andreas B. Mundt <andi at debian.org>
Date:   Thu Sep 11 10:20:12 2014 +0200

    Minor fixes and improvements.
---
 fai/config/files/etc/sssd/sssd.conf/ROAMING | 2 +-
 fai/config/package_config/DISKLESS_CLIENT   | 2 --
 fai/config/package_config/FAIBASE           | 1 -
 fai/config/scripts/PROXY/10-config          | 8 +++++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/fai/config/files/etc/sssd/sssd.conf/ROAMING b/fai/config/files/etc/sssd/sssd.conf/ROAMING
index ccfb898..97a3d19 100644
--- a/fai/config/files/etc/sssd/sssd.conf/ROAMING
+++ b/fai/config/files/etc/sssd/sssd.conf/ROAMING
@@ -27,7 +27,7 @@ ldap_search_base = dc=intern
 ldap_tls_reqcert = demand
 ldap_tls_cacert = /etc/ldap/slapd.crt
 
-krb5_kdcip = kerberos
+krb5_server = kerberos
 krb5_realm = INTERN
 krb5_changepw_principle = kadmin/changepw
 krb5_auth_timeout = 15
diff --git a/fai/config/package_config/DISKLESS_CLIENT b/fai/config/package_config/DISKLESS_CLIENT
index c9f54c4..f2500d8 100644
--- a/fai/config/package_config/DISKLESS_CLIENT
+++ b/fai/config/package_config/DISKLESS_CLIENT
@@ -61,8 +61,6 @@ console-common
 pciutils usbutils
 #heirloom-mailx
 mutt
-acpi-support-base
-
 
 PACKAGES aptitude SSHFS_CLIENT
 sshfs
diff --git a/fai/config/package_config/FAIBASE b/fai/config/package_config/FAIBASE
index 0cdb654..eefc2f0 100644
--- a/fai/config/package_config/FAIBASE
+++ b/fai/config/package_config/FAIBASE
@@ -23,4 +23,3 @@ nscd
 #heirloom-mailx
 mutt
 cfengine2
-acpi-support-base
diff --git a/fai/config/scripts/PROXY/10-config b/fai/config/scripts/PROXY/10-config
index 58fa4de..acfa52c 100755
--- a/fai/config/scripts/PROXY/10-config
+++ b/fai/config/scripts/PROXY/10-config
@@ -60,8 +60,10 @@ editfiles:
             InsertLine 'refresh_pattern deb$(dollar)   129600 100% 129600'
             InsertLine 'refresh_pattern udeb$(dollar)   129600 100% 129600'
             InsertLine 'refresh_pattern tar.gz$(dollar)  129600 100% 129600'
-            InsertLine 'refresh_pattern \/(Packages|Sources)(|\.bz2|\.gz|\.xz)$(dollar) 0 0% 0'
-            InsertLine 'refresh_pattern \/Release(|\.gpg)$(dollar) 0 0% 0'
-            InsertLine 'refresh_pattern \/InRelease$(dollar) 0 0% 0'
+            InsertLine 'refresh_pattern tar.xz$(dollar)  129600 100% 129600'
+            InsertLine 'refresh_pattern tar.bz2$(dollar)  129600 100% 129600'
+            InsertLine 'refresh_pattern \/(Packages|Sources)(|\.bz2|\.gz|\.xz)$(dollar) 0 0% 0 refresh-ims'
+            InsertLine 'refresh_pattern \/Release(|\.gpg)$(dollar) 0 0% 0 refresh-ims'
+            InsertLine 'refresh_pattern \/InRelease$(dollar) 0 0% 0 refresh-ims'
 	  EndGroup
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git