diff options
| -rw-r--r-- | acceptance/tests/allow_symlinks_as_config_directories.rb | 27 | ||||
| -rw-r--r-- | lib/puppet/util/settings/file_setting.rb | 1 | ||||
| -rwxr-xr-x | spec/unit/util/settings/file_setting_spec.rb | 4 |
3 files changed, 32 insertions, 0 deletions
diff --git a/acceptance/tests/allow_symlinks_as_config_directories.rb b/acceptance/tests/allow_symlinks_as_config_directories.rb new file mode 100644 index 000000000..66c6ccca0 --- /dev/null +++ b/acceptance/tests/allow_symlinks_as_config_directories.rb @@ -0,0 +1,27 @@ +test_name "Should allow symlinks to directories as configuration directories" + +step "Create the test confdir with a link to it" +confdir = "/tmp/puppet_conf-directory-#{$$}" +conflink = "/tmp/puppet_conf-symlink-#{$$}" + +on agents, "rm -rf #{conflink} #{confdir}" + +on agents, "mkdir #{confdir}" +on agents, "ln -s #{confdir} #{conflink}" + +create_remote_file agents, "#{confdir}/puppet.conf", <<CONFFILE +[main] +certname = "awesome_certname" +CONFFILE + +manifest = 'notify{"My certname is $clientcert": }' + +step "Run Puppet and ensure it used the conf file in the confdir" +on agents, puppet_apply("--confdir #{conflink}"), :stdin => manifest do + assert_match("My certname is awesome_certname", stdout) +end + +step "Check that the symlink and confdir are unchanged" +on agents, "[ -L #{conflink} ]" +on agents, "[ -d #{confdir} ]" +on agents, "[ $(readlink #{conflink}) = #{confdir} ]" diff --git a/lib/puppet/util/settings/file_setting.rb b/lib/puppet/util/settings/file_setting.rb index edbab1d0c..776398ef4 100644 --- a/lib/puppet/util/settings/file_setting.rb +++ b/lib/puppet/util/settings/file_setting.rb @@ -101,6 +101,7 @@ class Puppet::Util::Settings::FileSetting < Puppet::Util::Settings::Setting resource[:ensure] = type resource[:loglevel] = :debug + resource[:links] = :follow resource[:backup] = false resource.tag(self.section, self.name, "settings") diff --git a/spec/unit/util/settings/file_setting_spec.rb b/spec/unit/util/settings/file_setting_spec.rb index dcfb6e3b1..1167e971d 100755 --- a/spec/unit/util/settings/file_setting_spec.rb +++ b/spec/unit/util/settings/file_setting_spec.rb @@ -249,6 +249,10 @@ describe Puppet::Util::Settings::FileSetting do it "should tag the resource with 'settings'" do @file.to_resource.should be_tagged("settings") end + + it "should set links to 'follow'" do + @file.to_resource[:links].should == :follow + end end end |