summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--joeyconfig.hs3
-rw-r--r--src/Propellor/Property/Ssh.hs2
2 files changed, 4 insertions, 1 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index ae3e6ab1..588adfe3 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -90,6 +90,9 @@ darkstar = host "darkstar.kitenet.net" $ props
& JoeySites.dkimMilter
& JoeySites.alarmClock "*-*-* 7:30" (User "joey")
"/usr/bin/timeout 45m /home/joey/bin/goodmorning"
+ & Ssh.userKeys (User "joey") hostContext
+ [ (SshRsa, "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1YoyHxZwG5Eg0yiMTJLSWJ/+dMM6zZkZiR4JJ0iUfP+tT2bm/lxYompbSqBeiCq+PYcSC67mALxp1vfmdOV//LWlbXfotpxtyxbdTcQbHhdz4num9rJQz1tjsOsxTEheX5jKirFNC5OiKhqwIuNydKWDS9qHGqsKcZQ8p+n1g9Lr3nJVGY7eRRXzw/HopTpwmGmAmb9IXY6DC2k91KReRZAlOrk0287LaK3eCe1z0bu7LYzqqS+w99iXZ/Qs0m9OqAPnHZjWQQ0fN4xn5JQpZSJ7sqO38TBAimM+IHPmy2FTNVVn9zGM+vN1O2xr3l796QmaUG1+XLL0shfR/OZbb joey@darkstar")
+ ]
! imageBuilt "/tmp/img" c MSDOS (grubBooted PC)
[ partition EXT2 `mountedAt` "/boot"
diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs
index 6e1690d2..527ad444 100644
--- a/src/Propellor/Property/Ssh.hs
+++ b/src/Propellor/Property/Ssh.hs
@@ -362,7 +362,7 @@ modKnownHost user f p = p
-- | Ensures that a local user's authorized_keys contains lines allowing
-- logins from a remote user on the specified Host.
--
--- The ssh keys of the remote user can be set using `keysImported`
+-- The ssh keys of the remote user can be set using `userKeys`
--
-- Any other lines in the authorized_keys file are preserved as-is.
authorizedKeysFrom :: User -> (User, Host) -> Property UnixLike