diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-19 01:28:46 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-19 01:28:46 -0400 |
| commit | 9e578aca6b0914443c95f8691fd3ba39522f28fc (patch) | |
| tree | f4f0882539dc5798af97d833fe0bd3d8b3e0df2f /Propellor/Property | |
| parent | d1db64b3bc4ef1c802344f666eb160d9a8c97cca (diff) | |
rename aka to alias
Diffstat (limited to 'Propellor/Property')
| -rw-r--r-- | Propellor/Property/Dns.hs | 4 | ||||
| -rw-r--r-- | Propellor/Property/Docker.hs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Propellor/Property/Dns.hs b/Propellor/Property/Dns.hs index 90556d2d..e47d6c32 100644 --- a/Propellor/Property/Dns.hs +++ b/Propellor/Property/Dns.hs @@ -30,7 +30,7 @@ import Data.List -- -- > host "foo.example.com" -- > & ipv4 "192.168.1.1" --- > & aka "mail.exmaple.com" +-- > & alias "mail.exmaple.com" -- -- Will cause that hostmame and its alias to appear in the zone file, -- with the configured IP address. @@ -134,7 +134,7 @@ namedConfFile = "/etc/bind/named.conf.local" -- repository to the SerialNumber. -- -- Handy trick: You don't need to list IPAddrs in the [Record], --- just make some Host sets its `aka` to the root of domain. +-- just make some Host sets its `alias` to the root of domain. mkSOA :: Domain -> SerialNumber -> [Record] -> SOA mkSOA d sn rs = SOA { sDomain = AbsDomain d diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs index e05a8dd3..e5b8d64a 100644 --- a/Propellor/Property/Docker.hs +++ b/Propellor/Property/Docker.hs @@ -183,8 +183,8 @@ memory = runProp "memory" -- | Link with another container on the same host. link :: ContainerName -> ContainerAlias -> Property -link linkwith alias = genProp "link" $ \hn -> - fromContainerId (ContainerId hn linkwith) ++ ":" ++ alias +link linkwith calias = genProp "link" $ \hn -> + fromContainerId (ContainerId hn linkwith) ++ ":" ++ calias -- | A short alias for a linked container. -- Each container has its own alias namespace. |