diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-05-22 14:16:16 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-22 14:16:16 -0400 |
| commit | 53f2646c4520e5c788d4b60dae63049222737acc (patch) | |
| tree | 39086348281d342fa87de9211950a94d34753894 /src/Propellor/Property/SiteSpecific/IABak.hs | |
| parent | da4636eb28e86d6909e2160c2ba7a00dcafc7ca9 (diff) | |
| parent | e661aad6c493e31b6bd8109ca3d5c90bec28626a (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata.joey/privdata.gpg
Diffstat (limited to 'src/Propellor/Property/SiteSpecific/IABak.hs')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/IABak.hs | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/Propellor/Property/SiteSpecific/IABak.hs b/src/Propellor/Property/SiteSpecific/IABak.hs index 650014f4..fe2de7c8 100644 --- a/src/Propellor/Property/SiteSpecific/IABak.hs +++ b/src/Propellor/Property/SiteSpecific/IABak.hs @@ -15,6 +15,13 @@ repo = "https://github.com/ArchiveTeam/IA.BAK/" userrepo :: String userrepo = "git@gitlab.com:archiveteam/IA.bak.users.git" +publicFace :: Property HasInfo +publicFace = propertyList "iabak public face" $ props + & Git.cloned (User "root") repo "/usr/local/IA.BAK" (Just "server") + & Apt.serviceInstalledRunning "apache2" + & Cron.niceJob "graph-gen" (Cron.Times "*/10 * * * *") (User "root") "/" + "/usr/local/IA.BAK/web/graph-gen.sh" + gitServer :: [Host] -> Property HasInfo gitServer knownhosts = propertyList "iabak git server" $ props & Git.cloned (User "root") repo "/usr/local/IA.BAK" (Just "server") @@ -56,12 +63,14 @@ graphiteServer = propertyList "iabak graphite server" $ props [ "[carbon]" , "pattern = ^carbon\\." , "retentions = 60:90d" - , "[iabak]" + , "[iabak-connections]" + , "pattern = ^iabak\\.shardstats\\.connections" + , "retentions = 1h:1y,3h:10y" + , "[iabak-default]" , "pattern = ^iabak\\." - , "retentions = 10m:30d,1h:1y,3h,10y" + , "retentions = 10m:30d,1h:1y,3h:10y" , "[default_1min_for_1day]" , "pattern = .*" - , "retentions = 60s:1d" ] & graphiteCSRF & cmdProperty "graphite-manage" ["syncdb", "--noinput"] `flagFile` "/etc/flagFiles/graphite-syncdb" |