diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-10-20 14:43:09 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-10-20 14:43:09 -0200 |
| commit | a23b6a0c5828dcaaaf6c424c6251f4c73ee77f1d (patch) | |
| tree | 9bb1770b07d973ed727d53bac52d1055de14b30f | |
| parent | 49c44668c835013a88e067e0af588d0005fe2d01 (diff) | |
| download | puppet-bootstrap-a23b6a0c5828dcaaaf6c424c6251f4c73ee77f1d.tar.gz puppet-bootstrap-a23b6a0c5828dcaaaf6c424c6251f4c73ee77f1d.tar.bz2 | |
TODO: apply patches
| -rw-r--r-- | TODO.md | 2 | ||||
| -rw-r--r-- | files/patches/puppet-stack-level-trusty.patch | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -22,7 +22,7 @@ High priority - http://andrewbunday.co.uk/2012/12/04/masterless-puppet-wrapper/ - http://semicomplete.com/presentations/puppet-at-loggly/puppet-at-loggly.pdf.html - https://github.com/jordansissel/puppet-examples/tree/master/masterless - - hooks: + - apply patches: - storeconfigs warning patch - https://bugs.launchpad.net/ubuntu/+source/puppet/+bug/1313595 - sshd: diff --git a/files/patches/puppet-stack-level-trusty.patch b/files/patches/puppet-stack-level-trusty.patch index 3521dd9..1d112f7 100644 --- a/files/patches/puppet-stack-level-trusty.patch +++ b/files/patches/puppet-stack-level-trusty.patch @@ -1,8 +1,8 @@ ---- resource.rb.orig 2015-10-19 17:19:13.500193213 -0200 -+++ resource.rb 2015-10-19 17:19:58.972194943 -0200 +--- /usr/lib/ruby/vendor_ruby/puppet/rails/resource.rb.orig 2015-10-19 17:19:13.500193213 -0200 ++++ /usr/lib/ruby/vendor_ruby/puppet/rails/resource.rb 2015-10-19 17:19:58.972194943 -0200 @@ -84,7 +84,11 @@ end - + def [](param) - super || parameter(param) + if param == 'id' @@ -11,5 +11,5 @@ + super || parameter(param) + end end - + # Make sure this resource is equivalent to the provided Parser resource. |