diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-07-29 10:45:52 -0700 |
|---|---|---|
| committer | Josh Cooper <josh@puppetlabs.com> | 2011-07-29 10:45:52 -0700 |
| commit | cd1e501b6ebba6f7b109c0591452a459a95c43da (patch) | |
| tree | 754c8edc6f064a5ea79258bb4b3e764d8e673579 /lib | |
| parent | ca3396e827d4abd0350440223d0925d685a3caa5 (diff) | |
| parent | f6006177a85766cfb3387db6c3d337bf97b52f17 (diff) | |
| download | puppet-cd1e501b6ebba6f7b109c0591452a459a95c43da.tar.gz puppet-cd1e501b6ebba6f7b109c0591452a459a95c43da.tar.xz puppet-cd1e501b6ebba6f7b109c0591452a459a95c43da.zip | |
Merge branch 'ticket/master/8660-default-windows-install-paths'
* ticket/master/8660-default-windows-install-paths:
(#8660) Fix destdir option on Windows
(#8660) Default config dir to %PROGRAMDATA% on Windows
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/util/run_mode.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb index 450cbf1a6..6028aef29 100644 --- a/lib/puppet/util/run_mode.rb +++ b/lib/puppet/util/run_mode.rb @@ -27,14 +27,14 @@ module Puppet def conf_dir which_dir( - (Puppet.features.microsoft_windows? ? File.join(Dir::WINDOWS, "puppet", "etc") : "/etc/puppet"), + (Puppet.features.microsoft_windows? ? File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "etc") : "/etc/puppet"), "~/.puppet" ) end def var_dir which_dir( - (Puppet.features.microsoft_windows? ? File.join(Dir::WINDOWS, "puppet", "var") : "/var/lib/puppet"), + (Puppet.features.microsoft_windows? ? File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "var") : "/var/lib/puppet"), "~/.puppet/var" ) end |