[DRE-commits] [hiera] 01/03: Added patch to use /etc/puppet

[Jonas Genannt]

This is an automated email from the git hooks/post-receive script.

genannt pushed a commit to branch master
in repository hiera.

commit 36899a923b9170c7e9db09a1dc5bd43359939b40
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Tue May 24 20:21:30 2016 +0200

    Added patch to use /etc/puppet
---
 debian/patches/series                |  1 +
 debian/patches/use_puppet_conf.patch | 40 ++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..01cfdd1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use_puppet_conf.patch
diff --git a/debian/patches/use_puppet_conf.patch b/debian/patches/use_puppet_conf.patch
new file mode 100644
index 0000000..b508018
--- /dev/null
+++ b/debian/patches/use_puppet_conf.patch
@@ -0,0 +1,40 @@
+Author: Jonas Genannt <genannt at debian.org>
+Description: change to correct etc/puppet path
+Forwarded: not-needed
+
+diff --git a/ext/hiera.yaml b/ext/hiera.yaml
+index 158abd6..108d96c 100644
+--- a/ext/hiera.yaml
++++ b/ext/hiera.yaml
+@@ -7,7 +7,7 @@
+ 
+ :yaml:
+ # datadir is empty here, so hiera uses its defaults:
+-# - /etc/puppetlabs/code/environments/%{environment}/hieradata on *nix
++# - /etc/puppet/environments/%{::environment}/hieradata on *nix
+ # - %CommonAppData%\PuppetLabs\code\environments\%{environment}\hieradata on Windows
+ # When specifying a datadir, make sure the directory exists.
+-  :datadir:
++#  :datadir:
+diff --git a/lib/hiera/util.rb b/lib/hiera/util.rb
+index d21246c..ae53a07 100644
+--- a/lib/hiera/util.rb
++++ b/lib/hiera/util.rb
+@@ -28,7 +28,7 @@ class Hiera
+       if microsoft_windows?
+          File.join(common_appdata, 'PuppetLabs', 'puppet', 'etc')
+       else
+-        '/etc/puppetlabs/puppet'
++        '/etc/puppet'
+       end
+     end
+ 
+@@ -36,7 +36,7 @@ class Hiera
+       if microsoft_windows?
+         File.join(common_appdata, 'PuppetLabs', 'code')
+       else
+-        '/etc/puppetlabs/code'
++        '/etc/puppet'
+       end
+     end
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/hiera.git