diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-07-24 20:52:17 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-07-24 20:52:17 -0400 |
| commit | 4bae22529a7b2da1e36156e512cce432bcd78ae5 (patch) | |
| tree | 073e9272231d5fd0037ebf4ecc9890207c822fa3 /src | |
| parent | 5de4ee159c820525d86dda007829c72d7c77c229 (diff) | |
| parent | 808f33fd2418ed9a64f20846cf7301c16ffe8b84 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 652a7141..bd2636cc 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -362,40 +362,17 @@ 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.kitenet.net" + "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. +-- (Obsolete; need to revert this.) pumpRss :: Property DebianLike -pumpRss = Cron.job "pump rss" (Cron.Times "15 * * * *") (User "joey") "/srv/web/tmp.kitenet.net/" +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) @@ -681,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 |