[Debconf-video-commits] r585 - in fai-config: files/etc/hosts files/etc/ssh/sshd_config scripts/DEBCONF10

[Holger Levsen]

Author: holger
Date: 2010-07-30 19:57:56 +0000 (Fri, 30 Jul 2010)
New Revision: 585

Added:
   fai-config/scripts/DEBCONF10/21-admin
Modified:
   fai-config/files/etc/hosts/DEBCONF10
   fai-config/files/etc/ssh/sshd_config/DEBCONF10
Log:
more userdir-ldap configuration

Modified: fai-config/files/etc/hosts/DEBCONF10
===================================================================
--- fai-config/files/etc/hosts/DEBCONF10	2010-07-30 18:39:40 UTC (rev 584)
+++ fai-config/files/etc/hosts/DEBCONF10	2010-07-30 19:57:56 UTC (rev 585)
@@ -4,21 +4,21 @@
 72.14.176.206 krusty.debconf.org krusty
 89.16.166.49 db.debconf.org db
 
-128.59.13.1 gateway         gateway.dc10.debconf.org   
-128.59.13.2 selma           selma.dc10.debconf.org   
-128.59.13.3 patty           patty.dc10.debconf.org   
-128.59.13.4 jackie          jackie.dc10.debconf.org   
-128.59.13.5 blinky          blinky.dc10.debconf.org   
-128.59.13.6 itchy           itchy.dc10.debconf.org   
-128.59.13.9 lisa            lisa.dc10.debconf.org   
-128.59.13.10 barney          barney.dc10.debconf.org  
-128.59.13.11 rod             rod.dc10.debconf.org  
-128.59.13.16 scratchy        scratchy.dc10.debconf.org  
-128.59.13.17 ted        	ted.dc10.debconf.org  
-128.59.13.18 nodd		nodd.dc10.debconf.org  
-128.59.13.19 homer           homer.dc10.debconf.org  
-128.59.13.20 marge           marge.dc10.debconf.org  
-128.59.13.21 sideshow        sideshow.dc10.debconf.org  
+128.59.13.1     gateway.dc10.debconf.org  	gateway 
+128.59.13.2     selma.dc10.debconf.org   	selma
+128.59.13.3     patty.dc10.debconf.org   	patty
+128.59.13.4     jackie.dc10.debconf.org   	jackie
+128.59.13.5     blinky.dc10.debconf.org   	blinky
+128.59.13.6     itchy.dc10.debconf.org   	itchy
+128.59.13.9     lisa.dc10.debconf.org   	lisa
+128.59.13.10    barney.dc10.debconf.org		barney
+128.59.13.11    rod.dc10.debconf.org  		rod
+128.59.13.16    scratchy.dc10.debconf.org	scratchy  
+128.59.13.17	ted.dc10.debconf.org  		ted
+128.59.13.18  	nodd.dc10.debconf.org  		nodd
+128.59.13.19    homer.dc10.debconf.org  	homer
+128.59.13.20    marge.dc10.debconf.org  	marge
+128.59.13.21    sideshow.dc10.debconf.org  	sideshow
 
 
 # The following lines are desirable for IPv6 capable hosts

Modified: fai-config/files/etc/ssh/sshd_config/DEBCONF10
===================================================================
--- fai-config/files/etc/ssh/sshd_config/DEBCONF10	2010-07-30 18:39:40 UTC (rev 584)
+++ fai-config/files/etc/ssh/sshd_config/DEBCONF10	2010-07-30 19:57:56 UTC (rev 585)
@@ -1,3 +1,4 @@
+
 # Package generated configuration file
 # See the sshd(8) manpage for details
 
@@ -9,7 +10,7 @@
 Protocol 2
 # HostKeys for protocol version 2
 HostKey /etc/ssh/ssh_host_rsa_key
-HostKey /etc/ssh/ssh_host_dsa_key
+#HostKey /etc/ssh/ssh_host_dsa_key
 #Privilege Separation is turned on for security
 UsePrivilegeSeparation yes
 
@@ -17,6 +18,9 @@
 KeyRegenerationInterval 3600
 ServerKeyBits 768
 
+#GlobalKeysFile /var/lib/misc/ssh-rsa-shadow
+#MkHomeDir yes
+
 # Logging
 SyslogFacility AUTH
 LogLevel INFO
@@ -44,10 +48,10 @@
 
 # Change to yes to enable challenge-response passwords (beware issues with
 # some PAM modules and threads)
-ChallengeResponseAuthentication yes
+ChallengeResponseAuthentication no
 
 # Change to no to disable tunnelled clear text passwords
-#PasswordAuthentication yes
+PasswordAuthentication no
 
 # Kerberos options
 #KerberosAuthentication no
@@ -75,3 +79,5 @@
 Subsystem sftp /usr/lib/openssh/sftp-server
 
 UsePAM yes
+AuthorizedKeysFile /var/lib/misc/userkeys/%u
+AuthorizedKeysFile2 /var/keys/%u

Copied: fai-config/scripts/DEBCONF10/21-admin (from rev 575, fai-config/scripts/DEBCONF/21-authorized_keys)
===================================================================
--- fai-config/scripts/DEBCONF10/21-admin	                        (rev 0)
+++ fai-config/scripts/DEBCONF10/21-admin	2010-07-30 19:57:56 UTC (rev 585)
@@ -0,0 +1,17 @@
+#! /usr/sbin/cfagent -f
+
+control:
+   any::
+   actionsequence = ( files directories editfiles )
+   EditFileSize = ( 30000 )
+
+files:
+   any::
+
+editfiles:
+   any::
+	{ ${target}/etc/pam.d/common-session
+	  AutoCreate
+	  AppendIfNoSuchLine "session optional        pam_mkhomedir.so skel=/etc/skel umask=0022"
+	}
+