summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/SiteSpecific
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2014-08-22 13:01:54 -0400
committerJoey Hess <joey@kitenet.net>2014-08-22 13:01:54 -0400
commit59f94154b5c3dba9e045cd246429443372582ea5 (patch)
treec64139194c285204fb6e439013ebb2e8118eae80 /src/Propellor/Property/SiteSpecific
parent1c6245cef81570e561dca4f5320950cff213ed3c (diff)
parent3cb9a60f89a21d4d0a423db60d9c32eca2ef38bb (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/SiteSpecific')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index fa8773de..6fe10c02 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -312,6 +312,11 @@ twitRss = combineProperties "twitter rss"
feed url desc = Cron.job desc crontime "joey" dir $
"./twitRss " ++ shellEscape url ++ " > " ++ shellEscape ("../" ++ desc ++ ".rss")
+-- Work around for expired ssl cert.
+pumpRss :: Property
+pumpRss = Cron.job "pump rss" "15 * * * *" "joey" "/srv/web/tmp.kitenet.net/"
+ "wget https://pump2rss.com/feed/joeyh@identi.ca.atom -O pump.atom --no-check-certificate 2>/dev/null"
+
ircBouncer :: Property
ircBouncer = propertyList "IRC bouncer"
[ Apt.installed ["znc"]