diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-13 16:06:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-13 16:06:23 -0400 |
| commit | f8e350e4c88c0b535e5ceba33a5ab226a9acd33a (patch) | |
| tree | 11805b7c8348bc751764345b0d65851cfad8f5cd | |
| parent | 2c1397c5b09f2bbc8339c9763c60fcca601bc212 (diff) | |
propellor spin
| -rw-r--r-- | Propellor/Property/SiteSpecific/JoeySites.hs | 4 | ||||
| -rw-r--r-- | TODO | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Propellor/Property/SiteSpecific/JoeySites.hs b/Propellor/Property/SiteSpecific/JoeySites.hs index 3115d4b7..635d99ba 100644 --- a/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/Propellor/Property/SiteSpecific/JoeySites.hs @@ -43,7 +43,8 @@ gitServer hosts = propertyList "git.kitenet.net setup" `requires` Ssh.knownHost hosts "usw-s002.rsync.net" "root" `requires` Ssh.authorizedKeys "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" , toProp $ Git.daemonRunning "/srv/git" , "/etc/gitweb.conf" `File.containsLines` @@ -58,7 +59,6 @@ gitServer hosts = propertyList "git.kitenet.net setup" , website "git.kitenet.net" , website "git.joeyh.name" , toProp $ Apache.modEnabled "cgi" - -- TODO: upgrade to newer git-annex-shell for notification ] where website hn = toProp $ Apache.siteEnabled hn (gitapacheconf hn) @@ -2,9 +2,6 @@ run it once for the whole. For example, may want to restart apache, but only once despite many config changes being made to satisfy 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 says they are unchanged even when they changed and triggered a reprovision. @@ -18,3 +15,7 @@ * There is no way for a property of a docker container to require some property be met outside the container. For example, some servers 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. |