From e09a10c8050cabb5883a3aba1923df4e36965e2d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 27 Sep 2015 16:44:01 +0000 Subject: Write same username to aiccu config as for which the password was obtained. Without this change, the plain username always ends up in aiccu.conf. This breaks setups where a tunnel-specific password is in use. --- src/Propellor/Property/Aiccu.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propellor/Property/Aiccu.hs b/src/Propellor/Property/Aiccu.hs index e8aaa7bb..c49805b0 100644 --- a/src/Propellor/Property/Aiccu.hs +++ b/src/Propellor/Property/Aiccu.hs @@ -46,5 +46,5 @@ hasConfig t u = prop `onChange` restarted property "aiccu configured" . writeConfig writeConfig :: (((PrivDataField, PrivData) -> Propellor Result) -> Propellor Result) -> Propellor Result writeConfig getpassword = getpassword $ ensureProperty . go - go (Password _, p) = confPath `File.hasContentProtected` config u t p + go (Password u', p) = confPath `File.hasContentProtected` config u' t p go (f, _) = error $ "Unexpected type of privdata: " ++ show f -- cgit v1.2.3