cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2015-04-07 12:46:26 -04:00
parent c25be89f87
commit 8d2e46ab98
Failed to extract signature
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config-joey.hs
View File

@ -314,6 +314,9 @@ iabak = host "iabak.archiveteam.org"
& Apt.installed ["etckeeper"] & Apt.installed ["etckeeper"]
& Apt.installed ["ssh"] & Apt.installed ["ssh"]
& Apt.installed ["vim", "screen", "less"] & Apt.installed ["vim", "screen", "less"]
& Apt.installed ["netcat"]
& Apt.installed ["tmux"]
& Apt.installed ["emacs-nox"]
& User.hasSomePassword "root" & User.hasSomePassword "root"
& User.accountFor "joey" & User.accountFor "joey"
& User.hasSomePassword "joey" & User.hasSomePassword "joey"

8
src/Propellor/Property/SiteSpecific/IABak.hs
View File

@ -5,6 +5,7 @@ import qualified Propellor.Property.Apt as Apt
import qualified Propellor.Property.Git as Git import qualified Propellor.Property.Git as Git
import qualified Propellor.Property.Cron as Cron import qualified Propellor.Property.Cron as Cron
import qualified Propellor.Property.File as File import qualified Propellor.Property.File as File
import qualified Propellor.Property.Apache as Apache
gitServer :: Property HasInfo gitServer :: Property HasInfo
gitServer = propertyList "iabak git server" $ props gitServer = propertyList "iabak git server" $ props
@ -42,7 +43,7 @@ graphiteServer = propertyList "iabak graphite server" $ props
`flagFile` "/etc/graphite-superuser-db48x" `flagFile` "/etc/graphite-superuser-db48x"
-- TODO: deal with passwords somehow -- TODO: deal with passwords somehow
& File.ownerGroup "/var/lib/graphite/graphite.db" "_graphite" "_graphite" & File.ownerGroup "/var/lib/graphite/graphite.db" "_graphite" "_graphite"
& File.hasContent "/etc/apache2/iabak-graphite-web.conf" & Apache.siteEnabled "iabak-graphite-web"
[ "<VirtualHost *:8080>" [ "<VirtualHost *:8080>"
, " WSGIDaemonProcess _graphite processes=5 threads=5 display-name='%{GROUP}' inactivity-timeout=120 user=_graphite group=_graphite" , " WSGIDaemonProcess _graphite processes=5 threads=5 display-name='%{GROUP}' inactivity-timeout=120 user=_graphite group=_graphite"
, " WSGIProcessGroup _graphite" , " WSGIProcessGroup _graphite"
@ -57,11 +58,6 @@ graphiteServer = propertyList "iabak graphite server" $ props
, " CustomLog ${APACHE_LOG_DIR}/graphite-web_access.log combined" , " CustomLog ${APACHE_LOG_DIR}/graphite-web_access.log combined"
, "</VirtualHost>" , "</VirtualHost>"
] ]
& cmdProperty "ln" ["-sf", "/etc/apache2/sites-available/iabak-graphite-web.conf",
"/etc/apache2/sites-enabled/iabak-graphite-web.conf"]
& Apt.installed ["netcat"]
& Apt.installed ["tmux"]
& Apt.installed ["emacs-nox"]
where where
graphiteCSRF = withPrivData (Password "csrf-token") (Context "iabak.archiveteam.org") $ graphiteCSRF = withPrivData (Password "csrf-token") (Context "iabak.archiveteam.org") $
\gettoken -> property "graphite-web CSRF token" $ \gettoken -> property "graphite-web CSRF token" $