diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-01-21 12:31:26 +1100 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-01-21 12:31:26 +1100 |
| commit | 012e34cab65b2b25f5268b9bcec8437c310f9408 (patch) | |
| tree | 8d60fa8bdd3566c558984630382771000c5f899d /src | |
| parent | 0b2db49c28a44cfd4f734135e4e55ba16afc139a (diff) | |
| parent | ec3b4dc95590e89d066edf445f35bdbc1aee40e4 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs index 8f51035b..06145333 100644 --- a/src/Propellor/Property.hs +++ b/src/Propellor/Property.hs @@ -263,7 +263,7 @@ isNewerThan x y = do -- -- For example: -- --- > upgraded :: UnixLike +-- > upgraded :: Property (DebianLike + FreeBSD) -- > upgraded = (Apt.upgraded `pickOS` Pkg.upgraded) -- > `describe` "OS upgraded" -- diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 408fadad..4f8b48af 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -370,7 +370,7 @@ tmp = propertyList "tmp.joeyh.name" $ props -- (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" + "wget https://pump2rss.com/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 |