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

propellor spin

This commit is contained in:
Joey Hess 2014-04-13 16:06:23 -04:00
parent 2c1397c5b0
commit f8e350e4c8
Failed to extract signature
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Propellor/Property/SiteSpecific/JoeySites.hs
View File

@ -43,7 +43,8 @@ gitServer hosts = propertyList "git.kitenet.net setup"
`requires` Ssh.knownHost hosts "usw-s002.rsync.net" "root" `requires` Ssh.knownHost hosts "usw-s002.rsync.net" "root"
`requires` Ssh.authorizedKeys "family" `requires` Ssh.authorizedKeys "family"
`requires` User.accountFor "family" `requires` User.accountFor "family"
, Apt.installed ["git", "git-annex", "rsync", "kgb-client-git", "gitweb"] , Apt.installed ["git", "rsync", "kgb-client-git", "gitweb"]
, Apt.installedBackport ["git-annex"]
, File.hasPrivContentExposed "/etc/kgb-bot/kgb-client.conf" , File.hasPrivContentExposed "/etc/kgb-bot/kgb-client.conf"
, toProp $ Git.daemonRunning "/srv/git" , toProp $ Git.daemonRunning "/srv/git"
, "/etc/gitweb.conf" `File.containsLines` , "/etc/gitweb.conf" `File.containsLines`
@ -58,7 +59,6 @@ gitServer hosts = propertyList "git.kitenet.net setup"
, website "git.kitenet.net" , website "git.kitenet.net"
, website "git.joeyh.name" , website "git.joeyh.name"
, toProp $ Apache.modEnabled "cgi" , toProp $ Apache.modEnabled "cgi"
-- TODO: upgrade to newer git-annex-shell for notification
] ]
where where
website hn = toProp $ Apache.siteEnabled hn (gitapacheconf hn) website hn = toProp $ Apache.siteEnabled hn (gitapacheconf hn)

7
TODO
View File

@ -2,9 +2,6 @@
run it once for the whole. For example, may want to restart apache, run it once for the whole. For example, may want to restart apache,
but only once despite many config changes being made to satisfy but only once despite many config changes being made to satisfy
properties. onChange is a poor substitute. properties. onChange is a poor substitute.
* Currently only Debian and derivatives are supported by most Properties.
This could be improved by making the Distribution of the system part
of its HostAttr.
* Display of docker container properties is a bit wonky. It always * Display of docker container properties is a bit wonky. It always
says they are unchanged even when they changed and triggered a says they are unchanged even when they changed and triggered a
reprovision. reprovision.
@ -18,3 +15,7 @@
* There is no way for a property of a docker container to require * There is no way for a property of a docker container to require
some property be met outside the container. For example, some servers some property be met outside the container. For example, some servers
need ntp installed for a good date source. need ntp installed for a good date source.
* Attributes can only be set in the top level property list for a Host.
If an attribute is set inside a propertyList, it won't propigate out.
Fix this. Probably the fix involves combining AttrProperty into Property.
Then propertyList can gather the attributes from its list.