From f85ef2ea8827924e41524a292503010085c4b492 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Jul 2016 21:32:02 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 652a7141..d3633dfc 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -364,7 +364,7 @@ downloads hosts = annexWebSite "/srv/git/downloads.git" tmp :: Property (HasInfo + DebianLike) tmp = propertyList "tmp.kitenet.net" $ props & annexWebSite "/srv/git/joey/tmp.git" - "tmp.kitenet.net" + "tmp.joeyh.name" "26fd6e38-1226-11e2-a75f-ff007033bdba" [] & twitRss -- cgit v1.2.3 From a060e108030610e1ea72b0d12fe8a1cac93bce63 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Jul 2016 22:34:35 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 32 +----------------------- 1 file changed, 1 insertion(+), 31 deletions(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index d3633dfc..d1edc620 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -362,41 +362,11 @@ downloads hosts = annexWebSite "/srv/git/downloads.git" `requires` Ssh.knownHost hosts "eubackup.kitenet.net" (User "joey") tmp :: Property (HasInfo + DebianLike) -tmp = propertyList "tmp.kitenet.net" $ props +tmp = propertyList "tmp.joeyh.name" $ props & annexWebSite "/srv/git/joey/tmp.git" "tmp.joeyh.name" "26fd6e38-1226-11e2-a75f-ff007033bdba" [] - & twitRss - & pumpRss - --- Twitter, you kill us. -twitRss :: Property DebianLike -twitRss = combineProperties "twitter rss" $ props - & Git.cloned (User "joey") "git://git.kitenet.net/twitrss.git" dir Nothing - & check (not <$> doesFileExist (dir "twitRss")) compiled - & feed "http://twitter.com/search/realtime?q=git-annex" "git-annex-twitter" - & feed "http://twitter.com/search/realtime?q=olduse+OR+git-annex+OR+debhelper+OR+etckeeper+OR+ikiwiki+-ashley_ikiwiki" "twittergrep" - where - dir = "/srv/web/tmp.kitenet.net/twitrss" - crontime = Cron.Times "15 * * * *" - feed url desc = Cron.job desc crontime (User "joey") dir $ - "./twitRss " ++ shellEscape url ++ " > " ++ shellEscape ("../" ++ desc ++ ".rss") - compiled = userScriptProperty (User "joey") - [ "cd " ++ dir - , "ghc --make twitRss" - ] - `assume` NoChange - `requires` Apt.installed - [ "libghc-xml-dev" - , "libghc-feed-dev" - , "libghc-tagsoup-dev" - ] - --- Work around for expired ssl cert. -pumpRss :: Property DebianLike -pumpRss = Cron.job "pump rss" (Cron.Times "15 * * * *") (User "joey") "/srv/web/tmp.kitenet.net/" - "wget https://rss.io.jpope.org/feed/joeyh@identi.ca.atom -O pump.atom.new --no-check-certificate 2>/dev/null; sed 's/ & / /g' pump.atom.new > pump.atom" ircBouncer :: Property (HasInfo + DebianLike) ircBouncer = propertyList "IRC bouncer" $ props -- cgit v1.2.3 From 27a4e2da24eaef509368738b719250ee94b960c1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Jul 2016 22:48:37 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/Propellor') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index d1edc620..3b1ff3f1 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -367,6 +367,12 @@ tmp = propertyList "tmp.joeyh.name" $ props "tmp.joeyh.name" "26fd6e38-1226-11e2-a75f-ff007033bdba" [] + & pumpRss + +-- Work around for expired ssl cert. +pumpRss :: Property DebianLike +pumpRss = Cron.job "pump rss" (Cron.Times "15 * * * *") (User "joey") "/srv/web/tmp.joeyh.name/" + "wget https://rss.io.jpope.org/feed/joeyh@identi.ca.atom -O pump.atom.new --no-check-certificate 2>/dev/null; sed 's/ & / /g' pump.atom.new > pump.atom" ircBouncer :: Property (HasInfo + DebianLike) ircBouncer = propertyList "IRC bouncer" $ props -- cgit v1.2.3 From 808f33fd2418ed9a64f20846cf7301c16ffe8b84 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 18 Jul 2016 11:37:48 -0400 Subject: update --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/Propellor') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 3b1ff3f1..bd2636cc 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -370,6 +370,7 @@ tmp = propertyList "tmp.joeyh.name" $ props & pumpRss -- Work around for expired ssl cert. +-- (Obsolete; need to revert this.) pumpRss :: Property DebianLike pumpRss = Cron.job "pump rss" (Cron.Times "15 * * * *") (User "joey") "/srv/web/tmp.joeyh.name/" "wget https://rss.io.jpope.org/feed/joeyh@identi.ca.atom -O pump.atom.new --no-check-certificate 2>/dev/null; sed 's/ & / /g' pump.atom.new > pump.atom" @@ -657,6 +658,9 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props `describe` "pine configured to use local imap server" & Apt.serviceInstalledRunning "mailman" + -- Override the default http url. (Only affects new lists.) + & "/etc/mailman/mm_cfg.py" `File.containsLine` + "DEFAULT_URL_PATTERN = 'https://%s/cgi-bin/mailman/'" & Postfix.service ssmtp -- cgit v1.2.3