[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.51

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 507100b0576beaa546d5d69644c64e982e698acd
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Mar 9 18:50:06 2013 +0100

    p-s: support empty master command
    
    the command may be set in authorized_keys
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/README.txt b/README.txt
index 4a282c1..2bef280 100644
--- a/README.txt
+++ b/README.txt
@@ -537,6 +537,9 @@ section, too, and will serve as defaults for all other sections
 * "master-command" is the command to run on master-host to start
  the master. When the master has been installed from the Debian
  package, the command is '/usr/share/piuparts/piuparts-master'.
+ This does not need to be set here if it is already set in
+ '~piupartsm/.ssh/authorized_keys' to limit ssh access to that
+ single command.
 
 * "idle-sleep" is the length of time the slave should wait before
  querying the master again if the master didn't have any new
diff --git a/conf/piuparts.conf.sample b/conf/piuparts.conf.sample
index 9d3bb33..891109e 100644
--- a/conf/piuparts.conf.sample
+++ b/conf/piuparts.conf.sample
@@ -10,7 +10,6 @@ sections = sid
 mirror = http://cdn.debian.net/debian
 master-host = localhost
 master-user = piupartsm
-master-command = /usr/share/piuparts/piuparts-master
 piuparts-command = sudo piuparts --scriptsdir /etc/piuparts/scripts
 master-directory = /var/lib/piuparts/master
 slave-directory = /var/lib/piuparts/slave
diff --git a/debian/changelog b/debian/changelog
index e16e681..f011d25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ piuparts (0.51) UNRELEASED; urgency=low
       reduces the number of ssh connections attempted while checking idle
       sections. Close the connection before processing packages, before going
       to sleep, and after communication errors.
+    - Support empty master-command if the command is set in master's
+      .ssh/authorized_keys file.
   * piuparts-analyze.py:
   * piuparts-report.py:
     - Skip sections that don't exist in piuparts.conf.
diff --git a/piuparts-slave.py b/piuparts-slave.py
index 62f9f82..95956dd 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -216,7 +216,7 @@ class Slave:
         if self._master_user:
             ssh_command.extend(["-l", self._master_user])
         ssh_command.append(self._master_host)
-        ssh_command.append(self._master_command)
+        ssh_command.append(self._master_command or "command-is-set-in-authorized_keys")
         p = subprocess.Popen(ssh_command, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
         self._to_master = p.stdin
         self._from_master = p.stdout

-- 
piuparts git repository