summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
l---------config.hs2
-rw-r--r--doc/todo/PROPELLOR_TRACE_propigation.mdwn6
-rw-r--r--privdata/relocate1
-rw-r--r--src/Propellor/Message.hs4
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs3
5 files changed, 11 insertions, 5 deletions
diff --git a/config.hs b/config.hs
index ec313725..97d90636 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-config-simple.hs \ No newline at end of file
+joeyconfig.hs \ No newline at end of file
diff --git a/doc/todo/PROPELLOR_TRACE_propigation.mdwn b/doc/todo/PROPELLOR_TRACE_propigation.mdwn
new file mode 100644
index 00000000..8f7d6893
--- /dev/null
+++ b/doc/todo/PROPELLOR_TRACE_propigation.mdwn
@@ -0,0 +1,6 @@
+`PROPELLOR_TRACE` is not propigated when spinning a remote host,
+conducting a host, and probably not when provisioning a docker or machined
+container.
+
+It is propgiated when provisioning a chroot. That's all I needed, so I
+didh't bother implementing propigation. --[[Joey]]
diff --git a/privdata/relocate b/privdata/relocate
new file mode 100644
index 00000000..271692d8
--- /dev/null
+++ b/privdata/relocate
@@ -0,0 +1 @@
+.joeyconfig
diff --git a/src/Propellor/Message.hs b/src/Propellor/Message.hs
index 435a12b2..51d9babb 100644
--- a/src/Propellor/Message.hs
+++ b/src/Propellor/Message.hs
@@ -98,10 +98,9 @@ actionMessage' :: (MonadIO m, ActionResult r, ToResult r) => Maybe HostName -> D
actionMessage' mhn desc a = do
liftIO $ outputConcurrent
=<< whenConsole (setTitleCode $ "propellor: " ++ desc)
-
liftIO $ trace $ ActionStart mhn desc
+
r <- a
- liftIO $ trace $ ActionEnd mhn desc (toResult r)
liftIO $ outputConcurrent . concat =<< sequence
[ whenConsole $
@@ -111,6 +110,7 @@ actionMessage' mhn desc a = do
, let (msg, intensity, color) = getActionResult r
in colorLine intensity color msg
]
+ liftIO $ trace $ ActionEnd mhn desc (toResult r)
return r
where
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index d686f3d9..a48ebf9c 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -963,8 +963,7 @@ homeRouter = propertyList "home router" $ props
]
& ipmasq "wlan0"
& Apt.serviceInstalledRunning "netplug"
- & Network.static' "eth0" (IPv4 "192.168.1.42")
- (Just (Network.Gateway (IPv4 "192.168.1.1")))
+ & Network.dhcp' "eth0"
-- When satellite is down, fall back to dialup
[ ("pre-up", "poff -a || true")
, ("post-down", "pon")