diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-10-02 10:51:12 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-02 10:51:12 -0400 |
| commit | 6dd30b12eda97b8915241345eb49d4958b0664bc (patch) | |
| tree | 7ee25b60bb18f94280a5cc2b454d7943016ef4b7 /src | |
| parent | c315f8da6592dd2e24e66aa0b4c07a3c7370fede (diff) | |
| parent | 696b3178292f268be66cf93a299659d77272cc8b (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/DebianMirror.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/Nginx.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/Prosody.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/Unbound.hs | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/Propellor/Property/DebianMirror.hs b/src/Propellor/Property/DebianMirror.hs index 2e696b50..d16c5281 100644 --- a/src/Propellor/Property/DebianMirror.hs +++ b/src/Propellor/Property/DebianMirror.hs @@ -1,4 +1,4 @@ --- | Maintainer: Félix Sipma <felix.sipma@no-log.org> +-- | Maintainer: Félix Sipma <felix+propellor@gueux.org> module Propellor.Property.DebianMirror ( DebianPriority(..) diff --git a/src/Propellor/Property/Nginx.hs b/src/Propellor/Property/Nginx.hs index d69e6c73..a8c7b187 100644 --- a/src/Propellor/Property/Nginx.hs +++ b/src/Propellor/Property/Nginx.hs @@ -1,4 +1,4 @@ --- | Maintainer: Félix Sipma <gueux@gueux.org> +-- | Maintainer: Félix Sipma <felix+propellor@gueux.org> module Propellor.Property.Nginx where diff --git a/src/Propellor/Property/Prosody.hs b/src/Propellor/Property/Prosody.hs index 1129e28d..e47b9ac5 100644 --- a/src/Propellor/Property/Prosody.hs +++ b/src/Propellor/Property/Prosody.hs @@ -1,4 +1,4 @@ --- | Maintainer: Félix Sipma <felix.sipma@no-log.org> +-- | Maintainer: Félix Sipma <felix+propellor@gueux.org> module Propellor.Property.Prosody where diff --git a/src/Propellor/Property/Unbound.hs b/src/Propellor/Property/Unbound.hs index c3afeb84..0fa42052 100644 --- a/src/Propellor/Property/Unbound.hs +++ b/src/Propellor/Property/Unbound.hs @@ -1,5 +1,5 @@ --- | Maintainer: Félix Sipma <felix.sipma@no-log.org> --- +-- | Maintainer: Félix Sipma <felix+propellor@gueux.org> +-- -- Properties for the Unbound caching DNS server module Propellor.Property.Unbound |