[PC-BSD Commits] r7634 - in pcbsd/current/src-qt4/life-preserver: . scripts

[svn at pcbsd.org]

Author: kris
Date: 2010-09-24 12:22:30 -0700 (Fri, 24 Sep 2010)
New Revision: 7634

Modified:
   pcbsd/current/src-qt4/life-preserver/lifePreserverWizard.ui
   pcbsd/current/src-qt4/life-preserver/scripts/setup-ssh-keys.sh
Log:

Setup proper permissions on .ssh / authorized_keys file, also put note in about
needing "rsync" on the remote server.

Thanks Josh Paetzel!



Modified: pcbsd/current/src-qt4/life-preserver/lifePreserverWizard.ui
===================================================================
--- pcbsd/current/src-qt4/life-preserver/lifePreserverWizard.ui	2010-09-24 13:00:21 UTC (rev 7633)
+++ pcbsd/current/src-qt4/life-preserver/lifePreserverWizard.ui	2010-09-24 19:22:30 UTC (rev 7634)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>453</width>
-    <height>277</height>
+    <height>305</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -186,6 +186,16 @@
       </layout>
      </widget>
     </item>
+    <item row="2" column="0">
+     <widget class="QLabel" name="label_5">
+      <property name="text">
+       <string>Note: The remote server should be running SSH and have rsync installed.</string>
+      </property>
+      <property name="wordWrap">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QWizardPage" name="wizardPage_2">

Modified: pcbsd/current/src-qt4/life-preserver/scripts/setup-ssh-keys.sh
===================================================================
--- pcbsd/current/src-qt4/life-preserver/scripts/setup-ssh-keys.sh	2010-09-24 13:00:21 UTC (rev 7633)
+++ pcbsd/current/src-qt4/life-preserver/scripts/setup-ssh-keys.sh	2010-09-24 19:22:30 UTC (rev 7634)
@@ -34,9 +34,9 @@
 # Get the .pub key
 PUBKEY="`cat .ssh/id_rsa.pub`"
 
-echo $PUBKEY | ssh $SSHUSER@$SSHHOST 'mkdir .ssh ; tee -a .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys'
+echo $PUBKEY | ssh $SSHUSER@$SSHHOST 'mkdir .ssh ; chmod 700 .ssh ; tee -a .ssh/authorized_keys ; chmod 644 .ssh/authorized_keys'
 
-echo $PUBKEY | ssh $SSHUSER@$SSHHOST 'mkdir .ssh ; tee -a .ssh/authorized_keys2 ; chmod 600 .ssh/authorized_keys2'
+echo $PUBKEY | ssh $SSHUSER@$SSHHOST 'mkdir .ssh ; chmod 700 .ssh ; tee -a .ssh/authorized_keys2 ; chmod 644 .ssh/authorized_keys2'
 
 
 if [ "$?" != "0" ]