From 3cb9a60f89a21d4d0a423db60d9c32eca2ef38bb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 21 Aug 2014 15:52:49 -0400 Subject: propellor spin --- config-joey.hs | 1 + src/Propellor/Property/SiteSpecific/JoeySites.hs | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/config-joey.hs b/config-joey.hs index 29efbf92..44f66819 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -164,6 +164,7 @@ hosts = -- (o) ` "26fd6e38-1226-11e2-a75f-ff007033bdba" [] & JoeySites.twitRss + & JoeySites.pumpRss & alias "nntp.olduse.net" & alias "resources.olduse.net" 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"] -- cgit v1.2.3