Fix configuration bugs.

7 years ago · 2f10353156
parent bdee7273af
commit 2f10353156
2 changed files with 2 additions and 2 deletions
--- a/cdist/exec/remote.py
+++ b/cdist/exec/remote.py
@ -241,7 +241,7 @@ class Remote(object):
        """

        command = [
-            self.configuration.get('CDIST_REMOTE_SHELL', "/bin/sh"),
+            self.configuration.get('remote_shell', "/bin/sh"),
            "-e"
        ]
        command.append(script)
--- a/docs/src/man1/cdist.rst
+++ b/docs/src/man1/cdist.rst
@ -565,7 +565,7 @@ cdist/inventory
    This path is relative to cdist installation directory.
 /etc/cdist.cfg
    Global cdist configuration file, if exists.
-~/.cdist/cdist.cfg
+~/.cdist.cfg or $XDG_CONFIG_HOME/cdist/cdist.cfg
    Local cdist configuration file, if exists.

 NOTES