summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-04-07 12:07:34 -0400
committerJoey Hess2015-04-07 12:07:34 -0400
commite309559f53271da7c743589e9dfb9644ab047c95 (patch)
tree0e6f4e16649fc02c400eaf666ce1f4fbff42621f
parent33286c6ced9362555ce75b6a4a7f09e3ed7a2b97 (diff)
indents
-rw-r--r--config-joey.hs46
1 files changed, 24 insertions, 22 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 5c861509..c91a83ea 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -331,15 +331,16 @@ iabak = host "iabak.archiveteam.org"
& Cron.runPropellor (Cron.Times "30 * * * *")
& Apt.installed ["libapache2-mod-wsgi", "graphite-carbon", "graphite-web"]
& File.hasContent "/etc/carbon/storage-schemas.conf"
- ["[carbon]"
- ,"pattern = ^carbon\."
- ,"retentions = 60:90d"
- ,"[iabak]"
- ,"pattern = ^iabak\."
- ,"retentions = 10m:30d,1h:1y,3h,10y"
- ,"[default_1min_for_1day]"
- ,"pattern = .*"
- ,"retentions = 60s:1d"]
+ [ "[carbon]"
+ , "pattern = ^carbon\."
+ , "retentions = 60:90d"
+ , "[iabak]"
+ , "pattern = ^iabak\."
+ , "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"
& cmdProperty "graphite-manage" ["createsuperuser", "--noinput", "--username=joey"] `flagFile` "/etc/flagFiles/graphite-user-joey"
@@ -347,19 +348,20 @@ iabak = host "iabak.archiveteam.org"
-- TODO: deal with passwords somehow
& File.ownerGroup "/var/lib/graphite/graphite.db" "_graphite" "_graphite"
& File.hasContent "/etc/apache2/iabak-graphite-web.conf"
- ["<VirtualHost *:8080>"
- ," WSGIDaemonProcess _graphite processes=5 threads=5 display-name='%{GROUP}' inactivity-timeout=120 user=_graphite group=_graphite"
- ," WSGIProcessGroup _graphite"
- ," WSGIImportScript /usr/share/graphite-web/graphite.wsgi process-group=_graphite application-group=%{GLOBAL}"
- ," WSGIScriptAlias / /usr/share/graphite-web/graphite.wsgi"
- ," Alias /content/ /usr/share/graphite-web/static/"
- ," <Location \"/content/\">"
- ," SetHandler None"
- ," </Location>"
- ," ErrorLog ${APACHE_LOG_DIR}/graphite-web_error.log"
- ," LogLevel warn"
- ," CustomLog ${APACHE_LOG_DIR}/graphite-web_access.log combined"
- ,"</VirtualHost>"]
+ [ "<VirtualHost *:8080>"
+ , " WSGIDaemonProcess _graphite processes=5 threads=5 display-name='%{GROUP}' inactivity-timeout=120 user=_graphite group=_graphite"
+ , " WSGIProcessGroup _graphite"
+ , " WSGIImportScript /usr/share/graphite-web/graphite.wsgi process-group=_graphite application-group=%{GLOBAL}"
+ , " WSGIScriptAlias / /usr/share/graphite-web/graphite.wsgi"
+ , " Alias /content/ /usr/share/graphite-web/static/"
+ , " <Location \"/content/\">"
+ , " SetHandler None"
+ , " </Location>"
+ , " ErrorLog ${APACHE_LOG_DIR}/graphite-web_error.log"
+ , " LogLevel warn"
+ , " CustomLog ${APACHE_LOG_DIR}/graphite-web_access.log combined"
+ , "</VirtualHost>"
+ ]
& cmdProperty "ln" ["-sf", "/etc/apache2/sites-available/iabak-graphite-web.conf",
"/etc/apache2/sites-enabled/iabak-graphite-web.conf"]
& Apt.installed ["netcat"]