From b50f33395edc55317d95c53e34c4d810a5e49041 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 1 Jan 2015 13:57:13 -0400 Subject: [PATCH] update docs --- doc/usage.mdwn | 4 ++++ src/Propellor/Info.hs | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/usage.mdwn b/doc/usage.mdwn index 4501513..8cd9af2 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -49,6 +49,10 @@ and configured in haskell. uses ssh agent forwarding to make this work, and the relay host sees any privdata belonging to the target host. + Propellor configuration typically uses the FQDN of hosts. + The hostname given to --spin can be a short name, which is + then looked up in the DNS to find the FQDN. + * propellor --add-key keyid Adds a gpg key, which is used to encrypt the privdata. diff --git a/src/Propellor/Info.hs b/src/Propellor/Info.hs index a91f69c..0437f8e 100644 --- a/src/Propellor/Info.hs +++ b/src/Propellor/Info.hs @@ -26,8 +26,13 @@ getOS = askInfo _os -- | Indidate that a host has an A record in the DNS. -- --- TODO check at run time if the host really has this address. --- (Can't change the host's address, but as a sanity check.) +-- When propellor is used to deploy a DNS server for a domain, +-- the hosts in the domain are found by looking for these +-- and similar properites. +-- +-- When propellor --spin is used to deploy a host, it checks +-- if the host's IP Property matches the DNS. If the DNS is missing or +-- out of date, the host will instead be contacted directly by IP address. ipv4 :: String -> Property ipv4 = addDNS . Address . IPv4