diff options
| author | Jelmer Vernooij <jelmer@jelmer.uk> | 2015-09-27 16:44:01 +0000 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-09-28 18:46:41 -0400 |
| commit | e09a10c8050cabb5883a3aba1923df4e36965e2d (patch) | |
| tree | 9cca0e35f40e58922958b1735e70af161c01e34d /src/Propellor/Property/Aiccu.hs | |
| parent | 1c312c0628ea63cdd9bae254758758c9fa0c772e (diff) | |
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.
Diffstat (limited to 'src/Propellor/Property/Aiccu.hs')
| -rw-r--r-- | src/Propellor/Property/Aiccu.hs | 2 |
1 files changed, 1 insertions, 1 deletions
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 |