summaryrefslogtreecommitdiff
path: root/joeyconfig.hs
diff options
context:
space:
mode:
authorJoey Hess2016-08-31 17:40:08 -0400
committerJoey Hess2016-08-31 17:40:08 -0400
commit1b4ce46fa0f6eb57768558f57b268e38890fbaf5 (patch)
tree62b38ab8602cf9e6d2d91debfee592378ad51b97 /joeyconfig.hs
parentf9507073d0094206643191b629af243ca1706c76 (diff)
propellor spin
Diffstat (limited to 'joeyconfig.hs')
-rw-r--r--joeyconfig.hs8
1 files changed, 7 insertions, 1 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 588adfe3..c1b2bee4 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -468,15 +468,21 @@ keysafe = host "keysafe.joeyh.name" $ props
-- This is a 500 mb VM, so need more ram to build propellor.
& Apt.serviceInstalledRunning "swapspace"
& Cron.runPropellor (Cron.Times "30 * * * *")
- & Apt.installed ["openssh-server", "etckeeper", "sudo"]
+ & Apt.installed ["etckeeper", "sudo"]
+
& User.hasSomePassword (User "root")
& User.accountFor (User "joey")
& User.hasSomePassword (User "joey")
& Sudo.enabledFor (User "joey")
+
+ & Ssh.installed
& Ssh.randomHostKeys
+ & User "root" `Ssh.authorizedKeysFrom` (User "joey", darkstar)
& User "joey" `Ssh.authorizedKeysFrom` (User "joey", darkstar)
& Ssh.noPasswords
+ & Tor.installed
+
iabak :: Host
iabak = host "iabak.archiveteam.org" $ props
& ipv4 "124.6.40.227"