diff options
| author | Joey Hess <joey@kitenet.net> | 2014-07-07 11:32:29 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-07 11:32:29 -0400 |
| commit | bae7e085977f5c2470e9e1aa4f74fa44b69db456 (patch) | |
| tree | e31ac3d43aa0f8c01007a3b07cb698cc3e64f8cc /config-joey.hs | |
| parent | e53faff843a34fd3a4655cb4ee6c570f2072d73e (diff) | |
propellor spin
Diffstat (limited to 'config-joey.hs')
| -rw-r--r-- | config-joey.hs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/config-joey.hs b/config-joey.hs index e62efa4b..37604e55 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -85,17 +85,15 @@ hosts = -- (o) ` & Hostname.sane & Apt.unattendedUpgrades & Apt.installed ["systemd"] + & Ssh.hostKeys (Context "kitenet.net") - , let ctx = Context "diatom.kitenet.net" - in standardSystem "diatom.kitenet.net" Stable "amd64" + , standardSystem "diatom.kitenet.net" Stable "amd64" [ "Important stuff that needs not too much memory or CPU." ] & ipv4 "107.170.31.195" & DigitalOcean.distroKernel & Hostname.sane - & Ssh.hostKey SshDsa ctx - & Ssh.hostKey SshRsa ctx - & Ssh.hostKey SshEcdsa ctx + & Ssh.hostKeys (Context "diatom.kitenet.net") & Apt.unattendedUpgrades & Apt.serviceInstalledRunning "ntp" & Postfix.satellite @@ -157,9 +155,7 @@ hosts = -- (o) ` & Hostname.sane & Postfix.satellite & Apt.unattendedUpgrades - & Ssh.hostKey SshDsa ctx - & Ssh.hostKey SshRsa ctx - & Ssh.hostKey SshEcdsa ctx + & Ssh.hostKeys ctx & Ssh.keyImported SshRsa "joey" ctx & alias "eubackup.kitenet.net" |