summaryrefslogtreecommitdiff
path: root/joeyconfig.hs
diff options
context:
space:
mode:
authorJoey Hess2017-05-23 17:00:08 -0400
committerJoey Hess2017-05-23 17:00:08 -0400
commit5d0e9e8d0673541d5fac7387910d72a46d27322e (patch)
treea1db7056943810218340abd06fa66c29cfcd80c0 /joeyconfig.hs
parent1128231ae56e418c291cec20afc5feeecf2d5de1 (diff)
parent93e7f465efb340af0777013ecf947b7611b9f625 (diff)
Merge remote-tracking branch 'origin/joeyconfig' into joeyconfig
Diffstat (limited to 'joeyconfig.hs')
-rw-r--r--joeyconfig.hs12
1 files changed, 9 insertions, 3 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index b03960e0..2b679342 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -48,6 +48,7 @@ hosts :: [Host] -- * \ | | '--------'
hosts = -- (o) `
[ darkstar
, gnu
+ , dragon
, clam
, mayfly
, orca
@@ -86,9 +87,8 @@ darkstar = host "darkstar.kitenet.net" $ props
& ipv6 "2001:4830:1600:187::2"
& Aiccu.hasConfig "T18376" "JHZ2-SIXXS"
- & Apt.buildDep ["git-annex"] `period` Daily
-
& JoeySites.dkimMilter
+ & JoeySites.postfixSaslPasswordClient
& JoeySites.alarmClock "*-*-* 7:30" (User "joey")
"/usr/bin/timeout 45m /home/joey/bin/goodmorning"
& Ssh.userKeys (User "joey") hostContext
@@ -112,7 +112,13 @@ darkstar = host "darkstar.kitenet.net" $ props
gnu :: Host
gnu = host "gnu.kitenet.net" $ props
- & Apt.buildDep ["git-annex"] `period` Daily
+ & Postfix.satellite
+
+dragon :: Host
+dragon = host "dragon.kitenet.net" $ props
+ & ipv6 "2001:4830:1600:187::2"
+ & JoeySites.dkimMilter
+ & JoeySites.postfixSaslPasswordClient
clam :: Host
clam = host "clam.kitenet.net" $ props