| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Signed-off-by: Marc Fournier <marc.fournier@camptocamp.com>
|
|
|
|
|
|
|
| |
This prevents 'file' from being highlighted as a function when it is
used as a resource.
Signed-off-by: Todd Zullinger <tmz@pobox.com>
|
| |
|
| |
|
|
|
|
|
|
|
| |
Fix #2386, by checking either Request.env or ENV for the SSL environment
variables. This is necessary as Passenger 2.2.3 changed the location of
these vars, even though the Rack spec says nothing about ENV or these
variables.
|
|
|
|
|
|
|
|
|
|
| |
If you happen to already have puppet code somewhere in your ruby path, you
might get unexpected behaviour when trying to run puppetmaster with passenger.
Suggesting that the path to puppet/lib gets prepended instead of appended to
RUBYLIB could save time to some.
Signed-off-by: Marc Fournier <marc.fournier@camptocamp.com>
|
|
|
|
|
|
| |
Thanks to Charles Duffy for noticing this and providing this patch.
Signed-off-by: Marc Fournier <marc.fournier@camptocamp.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* added highlighting for different type of keywords:
* if/else
* undef
* puppet function names
* parameters passed to "ensure"
* unquoted digits
* fixed regexps to match resources containing "::", "-" and "_"
* handled escaped variables (variable which don't belong to puppet)
* removed unused definitions and added comments
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Noticed-by: Marc Fournier <marc.fournier@camptocamp.com>
Signed-off-by: Todd Zullinger <tmz@pobox.com>
|
|
|
|
| |
Signed-off-by: Todd Zullinger <tmz@pobox.com>
|
|
|
|
| |
Signed-off-by: Todd Zullinger <tmz@pobox.com>
|
|
|
|
| |
Signed-off-by: Todd Zullinger <tmz@pobox.com>
|
|
|
|
| |
files from a StoreConfigs Rails database
|
| |
|
| |
|
| |
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
bin/ralsh
lib/puppet/executables/client/certhandler.rb
lib/puppet/parser/functions/versioncmp.rb
lib/puppet/parser/resource/reference.rb
lib/puppet/provider/augeas/augeas.rb
lib/puppet/provider/nameservice/directoryservice.rb
lib/puppet/provider/ssh_authorized_key/parsed.rb
lib/puppet/type.rb
lib/puppet/type/file/checksum.rb
spec/integration/defaults.rb
spec/integration/transaction/report.rb
spec/unit/executables/client/certhandler.rb
spec/unit/indirector/ssl_rsa/file.rb
spec/unit/node/catalog.rb
spec/unit/provider/augeas/augeas.rb
spec/unit/rails.rb
spec/unit/type/ssh_authorized_key.rb
spec/unit/type/tidy.rb
test/executables/filebucket.rb
test/executables/puppetbin.rb
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This patch fixes a typo in one request producing a SQL error.
It also close an issue where param_values could point to
inexistant param_names after the deduplications of those.
It does this by rewriting the param_values to point to the
highest id of the param_names of the same name.
The same operation is performed on the tags.
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
storeconfigs database (including duplicate resources record,
duplicate param_values records, dangling records...).
Usage:
stop all puppetmasters
backup your database!
% cat ext/dbfix.sql | mysql puppet
relaunch all puppetmasters
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
---
|
| | | |
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
This commat adds a --node option to puppet-test,
so that you can use locally cached node and fact data
for testing local and remote compiles.
Signed-off-by: Luke Kanies <luke@madstop.com>
|
| | |
|
| |
| |
| |
| | |
semicolons
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
lib/puppet/indirector/facts/facter.rb
lib/puppet/provider/augeas/augeas.rb
lib/puppet/util/filetype.rb
spec/unit/indirector/facts/facter.rb
spec/unit/provider/augeas/augeas.rb
test/util/filetype.rb
|
| | |
|
|\|
| |
| |
| |
| |
| | |
Conflicts:
CHANGELOG
spec/unit/type/file/selinux.rb
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
Signed-off-by: Luke Kanies <luke@madstop.com>
|
|/
|
|
| |
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
Updated, I was calling .base myself instead of the actual string
|
| |
|
|
|
|
| |
This reverts commit 971af69b7388cf5155bb124246f2a697578cc6e9.
|
|
|
|
| |
Tidied up some of the code a little
|
|
|
|
|
|
| |
I wonder if anyone's actually using this...
Signed-off-by: Luke Kanies <luke@madstop.com>
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
More correctly handle indentation of lines enclosed in [] when the
contents themselves contain [], such as arrays of object references
for requires.
Exclude newlines from more of the parsing regexes for more accurate
results.
Fontify references to objects even if they're not at the start of a
line.
|