From b9d2fcc432da003e2c6054a0d6bcbd7eb8457cf0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 13 Apr 2014 12:57:35 -0400
Subject: [PATCH] propellor spin

---
 Propellor/PrivData.hs          |  6 +++-
 privdata/clam.kitenet.net.gpg  | 50 ++++++++++++++++++++--------------
 privdata/kgb-server.docker.gpg | 27 ------------------
 3 files changed, 34 insertions(+), 49 deletions(-)
 delete mode 100644 privdata/kgb-server.docker.gpg

diff --git a/Propellor/PrivData.hs b/Propellor/PrivData.hs
index c7af1aa..ad2c8d2 100644
--- a/Propellor/PrivData.hs
+++ b/Propellor/PrivData.hs
@@ -8,6 +8,7 @@ import System.FilePath
 import System.IO
 import System.Directory
 import Data.Maybe
+import Data.List
 import Control.Monad
 import "mtl" Control.Monad.Reader
 
@@ -30,9 +31,12 @@ withPrivData field a = maybe missing a =<< liftIO (getPrivData field)
   where
 	missing = do
 		host <- getHostName
+		let host' = if ".docker" `isSuffixOf` host
+			then "$parent_host"
+			else host
 		liftIO $ do
 			warningMessage $ "Missing privdata " ++ show field
-			putStrLn $ "Fix this by running: propellor --set "++host++" '" ++ show field ++ "'"
+			putStrLn $ "Fix this by running: propellor --set "++host'++" '" ++ show field ++ "'"
 			return FailedChange
 
 getPrivData :: PrivDataField -> IO (Maybe String)
diff --git a/privdata/clam.kitenet.net.gpg b/privdata/clam.kitenet.net.gpg
index 69d8f12..601744c 100644
--- a/privdata/clam.kitenet.net.gpg
+++ b/privdata/clam.kitenet.net.gpg
@@ -1,25 +1,33 @@
 -----BEGIN PGP MESSAGE-----
 Version: GnuPG v1
 
-hQIMA7ODiaEXBlRZARAAuRttWmrr3tFgQnbnaQpWxiAQToL94e0SctFiYqiEGRNa
-D63/ZaBhBkvKSx57+SyOloqfBaeWM63vd4Yacocypl2zOjC4aEN7/MKyQRl+xhmk
-EwQ4kFfJ3dmYrgXt7NAdIarjHsK5/Bv7PGVIrcwD3zqV+FUyuxt2L2ETG61kYo+m
-xNWl1NCvHDZ1QOfvw4ldBo7+LO2odzoZAxBF0ZgQFqo/r/6RZaqFNJRLdVTLERTq
-E4igjtgfq6blrpyeupKpFu6oy8/7WeBXthnyoduftk+aBTkXWzb+i30zIzNNsc4+
-GE68a5tM0XE8nGwKp4yz0AZHhEYzv+BZXI7HQMAZ+m0srVn637SDHeAgOBU8NjrA
-SbZt0ubQ28Qaux7C7awLJ5SjvlQyLT61jLaN6SMcpeLmgkjRVN+eiVOE/qmXzhHv
-AobUwJgBOktiN6+WtRcxq7WduNf6Jtxw8UB5gVWiEeg6o+29ZBfIKVMT/Jly4rTO
-M13HbmSVzwdGcUL1D7Gf3oY2R7eS4VR8ShCQmF8aB8TXdsw4mo71HnUa7u5N4hCP
-jLtJG24+f39TWWRjMQjtFXi5hkep4OG5CBViWdCWOjlfn4Kmr5zCXaunkO9cgDAd
-s8UZdmALu2MPoVdcVm+KLq2JQi1jBWEqRu5krx/nSi+eRRX2/y95CKPEPqZoU+rS
-wM0BzlW+pEDc7aFlcYCrWTiwO0BWT2iBmbse9/r2NyJPpuFf7GOMI2v65jXQ+avy
-1r69zPdAXNgJ19Gid/q1CXCYnYLLVHqigd8XNs12ANaVvkOnBi3gAf309SIPJtCa
-uFVBxNasLTMQ3Ta7v7TLa0PopdBuFqfcy9d3BBiOKqokvhWFJobaG/WhF85ercRJ
-F8lse9fgo5xfrDoCFk7u9rzhHl8xKLl24thKFTDzwm+yuzXOoLq8+Km/xYuzQXZK
-JCjPvIUDaCCc1E/Yeoc3RafAiOuNwnjHW15TRdlohmgXzYlTCYF491WVKQfpL2Sd
-VO8Uar094M1d52Rv8/1HCTBKJ0hnK259l4dguzw4sl2BcrFPBz9SJ0f6V/eAHE0h
-la5QtLdwDDRI2giMXKfmzRiRA/5kBW01YaK7tt0om6L7Ri4Rs3JAhVgjcWDtH6fI
-w807PpsIHaK8r3yDJoeqUnDYOsImuNgdctQkeroPsFYmV3fu5Hb5tYDkKzm5lE0z
-C6mz09PD0M5hsnqmZXaw
-=UFa1
+hQIMA7ODiaEXBlRZARAAl7WWTjAAI3dGASNptUEGmpWD46DAd/0M5uyw1oS+TUJz
+cCTk23jvGeV+eWB+HdVKMsd8EbDYdEbrZxeFrWqlIFq8B+PM1FQ1NEfzigPzcEzR
+0Jf+fQWOtki8RIEV7dkH6M4A9oiGQVA6hvR5ShrBEtLp0YR3xGMTFFZ1CZ2khZOi
+dm47gWXfbyHnFzRsBnnBBHJ8RSez+McTqP8gHc86SzC2Ey/mJv0ShYaW8an5Aetw
+yRhYa5OOGbEbiN+AphZOMyitEFrUGrp1M1kidsBZjgK6bR+9GrMRRZdXzYeyTwUy
+1BTXI62SaTYmBroqa4Qt1U8mTxVF+BovOlIjcnK5kKSb2Nu2fu5jRkMHJ8RIh7kJ
+eaYLi0adffZrBHBApoX4A+wrpuYdPsVkK6afZ1c7ING+GUuZ4rdUzO5lwjTB9VNV
+uGkW+JmCZRA19glyKhGFIom4hkwnAObhxEsuJktOMwokFk4cnzCgb21QWsQZbwdw
+Pbq/qosLDsR5Yym7sfo12B5NM4HTMt7Z4ztLpaHfJpfkzDft7bQHjT4zT1kwm/NT
+NEA5T5bBKy9acT3Y2yOPE0VM87wr2gMFnHqbFiX+QUQWRAUi2q76w0K7dh5TInOs
+hFjMtaz7Iq6vjvQhrHdclHiIuKDF18vndFJAHl8UYVW7XkqgGSSn8runqPcG/t3S
+6QEkVzrFvLBroDnG15BuOtMnqcX72WOlX/hIRSNRuHMbUNiGpGrWGiYXKryWVA91
+BLCXY9a63FWKIhJEA/Si27OEA2kjP7h2lEK/jZt1S0gRVaWqpJu+VACBkZNdLcvc
+kI6f6dz99ALKlqu4EbZcmWw3D+3Gb/AsWUUwdgKkk6ZWSFzglnXQJ72MXaO2dA4B
+axd7peo5qa2Aw2IINrtyDTk9QcxwzuuEbKvl20H/KHT6gGSDey+lYRQac96Iqu9x
+LADL9Z8Lv0pN41tFPpq2H9Fe8Lgo9R/sFlQHOMxYNwqbNMKblRXgsmhg3bpZtFbz
+TLrqkiasqbnuAej3J1HLrOnYPNXx2WHZRPqZyWTBI2Al89AzYcVMwmLE2fHXF7Ko
+cjTPkPv2cvCplbO4uoMVQPHQlQNyXjXR+CJvQ0M+T2jvX69+exx4doPmcp14SM8v
+cZrxUILjim3Z9rAcIn7JVu2acslVpRlv1B0ebaWbUMQDxq+rb+mivzUil1ZpJu24
+1RTlF9Sk9xwUqDoaJBUUbWDHc1wrLFzI7/P5MAzBuuGwE5BKlq0cBjzMZpZqUB4x
+WCkOrz0aOwXkLqEgbHFkHVu9VuLVrDeY59DIKqEK35t9XiY99FASIJstOAly+UpX
+z53lhJKM9oJSrK6FpHu425FpbuJ+kjXWI2bPDRRB2UB8wEP64IzoRlXX34QMltdH
+z5NpteD80V1zWKsTHibaJ3wBEpH3iHz7ujnwV4i63uR59YeHY9JWCZ06/t8QSvvh
+kYZrBTSEyuxO4FBNb36Tee+0gQO+EhAKilFFf5J91Z3rmTL22T0k/2xwNCMfBeTh
+Nvc2jpzM5s5dVDbNnfCVvrj3rvBCYRIBizkjhgJK/l7/FcEYqsUZH4bl1BggOwYY
+pSDXzuunt+nsWZa+xfbmS5aKUgsOdnDlu3I7fv3KKHso//7oJJbg5HefAtmEvIvu
+Us7SlPjMpx82RUQnJWgmzdML9HfnXFGy+9RRxnFZh4rw72SEzDUc4cOV1KKNeuvf
+Q0vxgK8H
+=mBZA
 -----END PGP MESSAGE-----
diff --git a/privdata/kgb-server.docker.gpg b/privdata/kgb-server.docker.gpg
deleted file mode 100644
index f052485..0000000
--- a/privdata/kgb-server.docker.gpg
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN PGP MESSAGE-----
-Version: GnuPG v1
-
-hQIMA7ODiaEXBlRZAQ//ZDYso8hN4QDNWdv1dCyC38tEVYeuPtUu2/RuGOkzKInz
-BlX/aTYtuBHWjpXFWaEVJsvihhvQnJc7nvzguM6wcXPPRBgGMO3/pO9X+81YCmVQ
-smqiVyCPaWHxo0X2nmGCfAxRgap/ZpbVyHbS+V0Vh+vIsDYOjz9vXupXrknEocde
-6BnxgxKbqIvJUntRlhYhsi0fYkvMSzamlB2Gy7k5iZhwmu95NmTiYSQVPeuwNyYJ
-uLlfvSBAFFylg8q50svT0mI4IB2ta7/0V+F5zwSMzlwJ5Jlg7sveWVbHxL274CYk
-/mGovgL0CEJ9G4+SayZcb9WwqgGBUWDfBEmYCgkRuAcHM0fmSEBW5OFGzCCdiQ1s
-UOeLq/QrXS0hyyD+ug4gb2pKxxXSlm8dVr7hmgD6Lmr1WCdd02equUBnWnXMmZWR
-7ewjyZiR36h9SxPtSTG5SP5kinQ/9OerNclJbn/ccgwZAMJyRES9O0wDJ9fum9gY
-OzNhsGT6qSgTLRemDnknJjR9pCjCT9e7XdoBnF8IlvbhLYQFuro805+ri7uDxuoP
-ELItTFmr+aW12afrQDV/y0fT4701Zs4oZPgqiVmqzRAeBNljdNw13TNTC/rM19Os
-GiOsckyARxxolVNA632sb7+HoKXozXVQdxqDj4jlf53/FZpkwVYhXuJOHpklQoHS
-wSMBHgPqgvkS40xjLgCuiSmqnahA9l/sH3zoSw8AkSByXbGtHXMXmkTehd0Pb2zY
-XbMpXQ1R8Bw3EAykjNQbyZ+c1rMkFrr+KfTPtkTWHDOlKk1WIoN1ldHJvk5dDMoj
-V7mGDD0Dbi7CgQHBH044kWCw4X63gClRrr4o+u9jKx/ZyS/gBGvxwz0CGcOM2/rz
-t1FpEY01L/ytGBRtZ8S2mDu/M9n4b2SL9ed4ZoV14YPoh7nJBusR23mN+n2T1Fs8
-y+A/P9/Lin+IIKFlMTJK24Z59RrS2B7MC+a0YoSfI0DmBz2DwJHRuJU8q0rWCJLk
-/r4EZx8h6Z0Ndrj4w3rmJhEbiWg0rjzcuKIfHIHsEmDBHVomsECnwmj1UKfAaL2A
-M75aXTyLFCHKDOsFkdoMozykRX8ut39Hm57m0VFIkl9JRaTrYy3EeE7O6XFMnPbX
-uVSS/SfEXIg/S9lR8AiIQMaLOOKnIUdAmEnO7gzZwkAOCEM8iaA0DrgCTkunRUKP
-BO9wremAskdHXsT69jKspjvfJckOEJ2nPDdm9nzZFxwsXizUl5EMLcTq9DjI6CrQ
-d26hCheOATEQiAr/AdATxQPeAhiK1Fc5b1AmNMDsqdC7tvqEeaFeBktIfxVNgFiI
-rC1Ub6M=
-=t6f6
------END PGP MESSAGE-----