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

comment

This commit is contained in:
Joey Hess 2014-06-01 15:07:17 -04:00
parent 27268def84
commit d224463dcd
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config-joey.hs
View File

@ -37,8 +37,9 @@ hosts = -- (o) `
-- My laptop -- My laptop
[ host "darkstar.kitenet.net" [ host "darkstar.kitenet.net"
& ipv6 "2001:4830:1600:187::2" -- sixxs tunnel & ipv6 "2001:4830:1600:187::2" -- sixxs tunnel
& Docker.configured
& Apt.buildDep ["git-annex"] `period` Daily & Apt.buildDep ["git-annex"] `period` Daily
& Docker.configured
& Docker.docked hosts "android-git-annex" & Docker.docked hosts "android-git-annex"
-- Nothing super-important lives here and mostly it's docker containers. -- Nothing super-important lives here and mostly it's docker containers.
@ -165,6 +166,7 @@ hosts = -- (o) `
-- storage and backup server -- storage and backup server
, standardSystem "elephant.kitenet.net" Unstable "amd64" , standardSystem "elephant.kitenet.net" Unstable "amd64"
& ipv4 "193.234.225.114" & ipv4 "193.234.225.114"
& Hostname.sane & Hostname.sane
& Postfix.satellite & Postfix.satellite
& Apt.unattendedUpgrades & Apt.unattendedUpgrades

2
debian/changelog vendored
View File

@ -2,7 +2,7 @@ propellor (0.6.0) UNRELEASED; urgency=medium
* Docker containers now propigate DNS attributes out to the host they're * Docker containers now propigate DNS attributes out to the host they're
docked in. So if a docker container sets a DNS alias, every container docked in. So if a docker container sets a DNS alias, every container
it's docked in will automatically become part of a round-robin DNS, it's docked in will automatically be added to a DNS round-robin,
if propellor is used to manage DNS for the domain. if propellor is used to manage DNS for the domain.
* Propellor's output now includes the hostname being provisioned, or * Propellor's output now includes the hostname being provisioned, or
when provisioning a docker container, the container name. when provisioning a docker container, the container name.

5
src/Propellor/Attr.hs
View File

@ -37,6 +37,11 @@ ipv6 :: String -> Property
ipv6 = addDNS . Address . IPv6 ipv6 = addDNS . Address . IPv6
-- | Indicates another name for the host in the DNS. -- | Indicates another name for the host in the DNS.
--
-- When the host's ipv4/ipv6 addresses are known, the alias is set up
-- to use their address, rather than using a CNAME. This avoids various
-- problems with CNAMEs, and also means that when multiple hosts have the
-- same alias, a DNS round-robin is automatically set up.
alias :: Domain -> Property alias :: Domain -> Property
alias = addDNS . CNAME . AbsDomain alias = addDNS . CNAME . AbsDomain