[Debconf-video-commits] r661 - in fai-config/scripts: DEBCONF DVSWITCHPUBKEY

[Holger Levsen]

Author: holger
Date: 2011-07-19 19:40:58 +0000 (Tue, 19 Jul 2011)
New Revision: 661

Modified:
   fai-config/scripts/DEBCONF/20-authorized_keys
   fai-config/scripts/DEBCONF/21-authorized_keys
   fai-config/scripts/DVSWITCHPUBKEY/10-authkeys
Log:
let me login..

Modified: fai-config/scripts/DEBCONF/20-authorized_keys
===================================================================
--- fai-config/scripts/DEBCONF/20-authorized_keys	2011-07-19 19:30:46 UTC (rev 660)
+++ fai-config/scripts/DEBCONF/20-authorized_keys	2011-07-19 19:40:58 UTC (rev 661)
@@ -7,3 +7,7 @@
 chmod 600 /root/.ssh/authorized_keys
 chown -R root.root /root/.ssh
 
+# for udldap
+mkdir -p /etc/ssh/userkeys
+ln -sf /etc/ssh/userkeys/ /var/keys
+

Modified: fai-config/scripts/DEBCONF/21-authorized_keys
===================================================================
--- fai-config/scripts/DEBCONF/21-authorized_keys	2011-07-19 19:30:46 UTC (rev 660)
+++ fai-config/scripts/DEBCONF/21-authorized_keys	2011-07-19 19:40:58 UTC (rev 661)
@@ -10,29 +10,14 @@
 
 editfiles:
    any::
-        ### holger
-        #
         # this is useless after ldapification!!
         #
-        #
-        #
-        #
-        #
-        #
-        #
-        #
-        #
-        #
-        #
-        #
-        # this is useless after ldapification!!
-        #
-        #
 	{ ${target}/root/.ssh/authorized_keys
 	  AutoCreate
 	  AppendIfNoSuchLine "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArOaT7YSol/2O0jums0gui3aaycWk8sGz1taDwtQ+UTWzVh0Xn2DGUmBMGvmUVwqY0c7mRI/hOD2BDgvuLv0OQ6guZCLEHnAD4x/bsNucEzSQVEgTywuhans5PxfAGmGWk/thsNcqAE7JjFWGNNR6nj+ZmG299SieNW1wgxCWyQaiju/996yj6YKRN9aT1crNZA+sWi4z51XjPgbX2b55NLWrgmqBX4iSD6bV3nV6LEWXlTZzxUAqJotTD3PF3PWLi5h8kQhAOvT3cG6EkkAQV0TOcZam36x5cPbBek0iDNNQXv1w4fHN6f9qQ2/R5NdF06H91aSmxY7/OZ0XKgYKdw== holger at matrix"
 	}
-	{ ${target}/var/keys/root
+	# but not this
+	{ ${target}/etc/ssh/userkeys/root
 	  AutoCreate
 	  AppendIfNoSuchLine "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArOaT7YSol/2O0jums0gui3aaycWk8sGz1taDwtQ+UTWzVh0Xn2DGUmBMGvmUVwqY0c7mRI/hOD2BDgvuLv0OQ6guZCLEHnAD4x/bsNucEzSQVEgTywuhans5PxfAGmGWk/thsNcqAE7JjFWGNNR6nj+ZmG299SieNW1wgxCWyQaiju/996yj6YKRN9aT1crNZA+sWi4z51XjPgbX2b55NLWrgmqBX4iSD6bV3nV6LEWXlTZzxUAqJotTD3PF3PWLi5h8kQhAOvT3cG6EkkAQV0TOcZam36x5cPbBek0iDNNQXv1w4fHN6f9qQ2/R5NdF06H91aSmxY7/OZ0XKgYKdw== holger at matrix"
 	}

Modified: fai-config/scripts/DVSWITCHPUBKEY/10-authkeys
===================================================================
--- fai-config/scripts/DVSWITCHPUBKEY/10-authkeys	2011-07-19 19:30:46 UTC (rev 660)
+++ fai-config/scripts/DVSWITCHPUBKEY/10-authkeys	2011-07-19 19:40:58 UTC (rev 661)
@@ -10,6 +10,4 @@
 chown 1053.1008 /etc/ssh/userkeys/dvswitch
 chmod 600 /etc/ssh/userkeys/dvswitch
 
-# brute force
-ln -sf /etc/ssh/userkeys/ /var/keys