Merge lp:~nuclearbob/utah/ssh-permissions into lp:utah

[Max Brustkern]

This branch fixes the permissions on /var/lib/utah/.ssh after the previous permission setting commands break them.

[Javier Collado (javier.collado)]

The change looks fine, but I'm wondering why the fix needs to be duplicated.
Given that `utah` depends on `utah-client`, I believe all issues could be
addressed just in the `utah-client` package.

[Max Brustkern (nuclearbob)]

If utah install after utah-client, then the chmod that runs as part of the
utah postinst will break the permissions again. Ultimately, we should
probably solve this by moving more of the setup into either utah-client or
utah-common so that what's in the main utah package is more of an overlay
on that.

On Thu, May 30, 2013 at 3:30 AM, Javier Collado <
<email address hidden>> wrote:

> The change looks fine, but I'm wondering why the fix needs to be
> duplicated.
> Given that `utah` depends on `utah-client`, I believe all issues could be
> addressed just in the `utah-client` package.
>
> --
> https://code.launchpad.net/~nuclearbob/utah/ssh-permissions/+merge/166360
> You are the owner of lp:~nuclearbob/utah/ssh-permissions.
>

[Andy Doan (doanac)]

Looks good. My only comment might be to make this less brittle with something like:

 sshdir=~utah/.ssh

then do the chmod's on that.

[lp:~nuclearbob/utah/ssh-permissions]

924. By Max Brustkern on 2013-05-30

Implemented SSH_DIR variable per Andy's suggestion

[Javier Collado (javier.collado)]

review: Approve

=== modified file 'debian/utah-client.postinst'
--- debian/utah-client.postinst	2013-05-20 18:32:21 +0000
+++ debian/utah-client.postinst	2013-05-30 17:19:23 +0000
@@ -13,6 +13,7 @@
       [ -z "$SERVER_NAME" ] && SERVER_NAME="UTAH"
       [ -z "$SERVER_GROUP" ] && SERVER_GROUP=utah
       [ -z "$SERVER_GROUPS" ] && SERVER_GROUPS="libvirtd,kvm"
+      [ -z "$SSH_DIR" ] && SSH_DIR=~utah/.ssh
 
       if ! getent group | grep -q "^$SERVER_GROUP:"
       then
@@ -32,6 +33,11 @@
           chmod -R ug+rw $DIR
         fi
       done
+      if [ -d "$SSH_DIR" ]
+      then
+          chmod 600 /var/lib/utah/.ssh/*
+          chmod 700 /var/lib/utah/.ssh
+      fi
     }
 
     usersetup

=== modified file 'debian/utah.postinst'
--- debian/utah.postinst	2013-05-20 18:32:21 +0000
+++ debian/utah.postinst	2013-05-30 17:19:23 +0000
@@ -57,6 +57,7 @@
       [ -z "$SERVER_NAME" ] && SERVER_NAME="UTAH"
       [ -z "$SERVER_GROUP" ] && SERVER_GROUP=utah
       [ -z "$SERVER_GROUPS" ] && SERVER_GROUPS="libvirtd,kvm"
+      [ -z "$SSH_DIR" ] && SSH_DIR=~utah/.ssh
 
       if ! getent group | grep -q "^$SERVER_GROUP:"
       then
@@ -76,6 +77,11 @@
           chmod -R ug+rw $DIR
         fi
       done
+      if [ -d "$SSH_DIR" ]
+      then
+          chmod 600 /var/lib/utah/.ssh/*
+          chmod 700 /var/lib/utah/.ssh
+      fi
     }
 
     usersetup