Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-11-08 15:56:36 -04:00
commit f38cd7c6a5
3 changed files with 14 additions and 12 deletions

2
debian/changelog vendored
View File

@ -3,6 +3,8 @@ propellor (0.9.2) UNRELEASED; urgency=medium
* Added nginx module, contributed by Félix Sipma. * Added nginx module, contributed by Félix Sipma.
* Added firewall module, contributed by Arnaud Bailly. * Added firewall module, contributed by Arnaud Bailly.
* Apache: Fix daemon reload when enabling a new module or site. * Apache: Fix daemon reload when enabling a new module or site.
* Docker: Stop using docker.io; that was a compat symlink in
the Debian package which has been removed in docker.io 1.3.1~dfsg1-2.
-- Joey Hess <joeyh@debian.org> Thu, 30 Oct 2014 16:36:06 -0400 -- Joey Hess <joeyh@debian.org> Thu, 30 Oct 2014 16:36:06 -0400

View File

@ -30,17 +30,6 @@ each indented with a tab.
foo = ... foo = ...
bar = ... bar = ...
Note for emacs users: You can put the following snippet into a file called
`.dir-locals.el` at root of propellor's source tree to ensure these indentation
rules are enforced:
((nil . ((indent-tabs-mode . t)
(tab-width . 4)
(fill-column . 80)))
;; Warn about spaces used for indentation:
(haskell-mode . ((eval . (highlight-regexp "^ *")))))
Where clauses for instance definitions and modules tend to appear at the end Where clauses for instance definitions and modules tend to appear at the end
of a line, rather than on a separate line. of a line, rather than on a separate line.
@ -107,3 +96,14 @@ If you feel that this coding style leads to excessive amounts of horizontal
or vertical whitespace around your code, making it hard to fit enough of it or vertical whitespace around your code, making it hard to fit enough of it
on the screen, consider finding a better abstraction, so the code that on the screen, consider finding a better abstraction, so the code that
does fit on the screen is easily understandable. ;) does fit on the screen is easily understandable. ;)
----
Note for emacs users: You can put the following snippet into a file called
`.dir-locals.el` at root of propellor's source tree to use tabs for indentation:
((nil . ((indent-tabs-mode . t)
(tab-width . 4)
(fill-column . 80)))
;; Warn about spaces used for indentation:
(haskell-mode . ((eval . (highlight-regexp "^ *")))))

View File

@ -567,7 +567,7 @@ readIdentFile cid = fromMaybe (error "bad ident in identFile")
. readish <$> readFile (identFile cid) . readish <$> readFile (identFile cid)
dockercmd :: String dockercmd :: String
dockercmd = "docker.io" dockercmd = "docker"
report :: [Bool] -> Result report :: [Bool] -> Result
report rmed report rmed