aws: Install SSH keys only for setup user

[people/pmueller/ipfire-2.x.git] / src / initscripts / helper / aws-setup

diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup
index a273aff7d44944d4fec926b51cf0a2df4e427e82..0d85a44e43b7157bb9adcecc372d5f8cd25015a5 100644 (file)
--- a/src/initscripts/helper/aws-setup
+++ b/src/initscripts/helper/aws-setup
@@ -86,25 +86,22 @@ import_aws_configuration() {
 
        # Create setup user
        if ! getent passwd setup &>/dev/null; then
-               useradd -r setup -s /usr/bin/run-setup -g nobody -m
+               useradd setup -s /usr/bin/run-setup -g nobody -m
        fi
 
-       # Import SSH keys
-       local user
-       for user in /root /home/setup; do
-               local line
-               for line in $(get "public-keys/"); do
-                       local key_no="${line%=*}"
-
-                       local key="$(get public-keys/${key_no}/openssh-key)"
-                       if [ -n "${key}" ] && ! grep -q "^${key}$" "${user}/.ssh/authorized_keys" 2>/dev/null; then
-                               mkdir -p "${user}/.ssh"
-                               chmod 700 "${user}/.ssh"
-
-                               echo "${key}" >> "${user}/.ssh/authorized_keys"
-                               chmod 600 "${user}/.ssh/authorized_keys"
-                       fi
-               done
+       # Import SSH keys for setup user
+       local line
+       for line in $(get "public-keys/"); do
+               local key_no="${line%=*}"
+
+               local key="$(get public-keys/${key_no}/openssh-key)"
+               if [ -n "${key}" ] && ! grep -q "^${key}$" "/home/setup/.ssh/authorized_keys" 2>/dev/null; then
+                       mkdir -p "/home/setup/.ssh"
+                       chmod 700 "/home/setup/.ssh"
+
+                       echo "${key}" >> "/home/setup/.ssh/authorized_keys"
+                       chmod 600 "/home/setup/.ssh/authorized_keys"
+               fi
        done
 
        # Import any DNS server settings