summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fixing #2423 - no more strange dependency cyclesLuke Kanies2009-07-252-1/+28
| | | | | | | | | | | | | | | We were getting strange dependency cycles because our class structure mirrored our scope structure. We can't change the scope structure without switching from a dynamically scoped language to a lexically scoped language, which is too big of a change to make right now. Instead, I'm changing the resource graph so that all classes default to just having an edge to the 'main' graph. This will be a behaviour change for many, in that you were getting automatic dependencies from this old behaviour, but it will bring consistency. Signed-off-by: Luke Kanies <luke@madstop.com>
* Fixing #2443: Adding debugging guidance to dep cycle errorsLuke Kanies2009-07-251-1/+1
| | | | Signed-off-by: Luke Kanies <luke@madstop.com>
* Fixing a test broken by changing the default os x package typeLuke Kanies2009-07-241-1/+1
| | | | Signed-off-by: Luke Kanies <luke@madstop.com>
* Fixing selinux tests broken in the fix for #1963Luke Kanies2009-07-241-3/+2
| | | | Signed-off-by: Luke Kanies <luke@madstop.com>
* Fixing #2445 - fixing the mount test mockLuke Kanies2009-07-241-1/+2
| | | | Signed-off-by: Luke Kanies <luke@madstop.com>
* Minor fix to URL for LDAP nodes documentationJames Turnbull2009-07-241-1/+1
|
* Fixing #2399 - removing client-side rrd graphsLuke Kanies2009-07-234-11/+1
| | | | | | | | This feature has been broken since who knows when, yet no one's noticed. Thus, it's a good candidate for removal. Signed-off-by: Luke Kanies <luke@madstop.com>
* Fixing #2421 - file renaming errors now propagateLuke Kanies2009-07-242-1/+12
| | | | Signed-off-by: Luke Kanies <luke@madstop.com>
* Fixes #2438, get major OS X version from Facter and replace Puppet::Error ↵Nigel Kersten2009-07-241-20/+16
| | | | invocations with fail builtin
* Update install.rb to cope with all OS X versions, not just 10.5Nigel Kersten2009-07-241-2/+3
|
* Fixing #2403 - provider specificity is richer and betterLuke Kanies2009-07-245-26/+52
| | | | | | | | | | | | | | | | | | | | We have extended the concept of provider specificity so it now includes both specified defaults and class depth, so: * We are much more likely to choose the correct provider; e.g., 'init' will be chosen over 'base' * We're much less likely to print this warning, because it's only printed when provider specificities are equal which is much rarer lib/puppet/provider.rb | 4 ++-- lib/puppet/type.rb | 4 ++-- spec/unit/type.rb | 17 +++++++++++++++++ test/ral/manager/type.rb | 22 ---------------------- 4 files changed, 21 insertions(+), 26 deletions(-) Signed-off-by: Luke Kanies <luke@madstop.com>
* Fix #2439 - let puppetdoc use loaded_codeBrice Figureau2009-07-243-3/+16
| | | | | | | | Since there isn't any unit test for puppetdoc rdoc code (my fault), nobody noticed it was using direct access to the parser AST array. This changeset fixes the way puppetdoc uses the parser results. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Fixed #2436 - Changed ralsh to use Puppet::Type.new and avoid deprecation noticeJames Turnbull2009-07-232-4/+4
|
* Fixes #2430 - Stock apache2.conf for passenger incorrectJames Turnbull2009-07-231-9/+11
|
* Make pkgdmg default Darwin provider, make confines consistent on Darwin ↵Nigel Kersten2009-07-214-7/+7
| | | | package providers.
* Convert to using sbindir for OS X packages, clean out previous executables ↵Nigel Kersten2009-07-212-1/+14
| | | | in bindir
* Fix #2425 - make sure client can contact CA server with RESTBrice Figureau2009-07-216-0/+33
| | | | | | | The various REST SSL terminii were never setup to use the ca_server/ca_port if one is setup. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Fix #2424 - take 2, make sure default mounts allow every clientsBrice Figureau2009-07-212-0/+15
| | | | | | | | If there isn't any default mounts for plugins/modules, puppet auto creates them. The issue is that they don't have any authorization attached, so they default to deny all. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Fix #2378 and #2391 testsBrice Figureau2009-07-204-2/+50
| | | | | | | Fix #2378 - Add some integration tests for catalog filtering Fix #2391 - Fix up some of the tests Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Fix #2424 - File server can't find module in environmentBrice Figureau2009-07-184-7/+7
| | | | | | | | | | | | | | | | | | | | | | | Actually, the issue is: * when the web server gets the request, it creates an indirection request, filling attributes like ip or node from the HTTP request. To do this, all the interesting attributes are given in a hash (called options, see P::I::Request#new). Once the request is properly initialized the options hash doesn't contain the ip or node information (see set_attributes) * the request is then transmitted to the file_serving layer, which happily wants to use the node attribute to find environments or perform authorization. Unfortunately it fetches the node value from the request options hash, not the request itself. Since this node information is empty, puppet fails to find the proper mount point, and fails the download. This change makes sure we pass all the way down the node and fix the authorization check. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Fix small typo in the fix for #2394Brice Figureau2009-07-182-2/+2
| | | | Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Feature #2378 - Implement "thin_storeconfigs"Brice Figureau2009-07-184-2/+100
| | | | | | | | | | | | | | | Thin storeconfigs is a limited version of storeconfigs that is more performant and still allows the exported/collected resources system wich is the primary use of storeconfigs. It works by storing to the database only the exported resources, tags and host facts. Since usually those exported resources are less than the number of total resources for a node, it is expected to be faster than regular storeconfigs (especially for the first run). Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Fix #2391 - Exported resources never make to the storeconfigs dbBrice Figureau2009-07-1810-4/+145
| | | | | | | | | | | | | | | | | | The issue is that when we convert Puppet::Parser::Resource catalog to a Puppet::Resource catalog before storing it to the database, we don't allow virtual resource to be converted. Unfortunately exported resources are virtual by design, and as such aren't converted, and we lose them, so it isn't possible to store them in the database. Unfortunately, the client will get the exported resources too. The fix is dual-fold: * we make sure exported resource are skipped when the transaction is applied as a last safeguard * we filter-out the catalog through the catalog compiler terminus before the catalog is returned to the client Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Fix #2261 - Make sure query string parameters are properly escapedBrice Figureau2009-07-178-26/+37
| | | | | | | | | | | | | | | | The problem is that URI.escape by default doesn't escape '+' (and some other characters). But some web framework (at least webrick) unescape the query string behind Puppet's back changing all '+' to spaces corrupting facts containing '+' characters (like base64 encoded values). The current fix makes sure we use CGI.escape for all query string parameters. Indirection keys/path are still using URI escaping because this part of the URI format shouldn't be handled like query string parameters (otherwise '/' url separators are encoded which changes the uri path). Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Fixed #579 - puppet should try to clear solaris 10 services in maintenance stateJames Turnbull2009-07-161-1/+8
|
* Fix #1963 - Failing to read /proc/mounts for selinux kills file downloadsRicky Zhou2009-07-161-2/+8
| | | | | This works around a linux kernel bug that causes a select() on /proc/mounts to hang.
* Fixing #2245 - provider lists are not lost on type reloadLuke Kanies2009-07-162-12/+42
| | | | | | | | | | We've moved the @providers class instance variable from the individual Puppet::Type subclasses into a single class instance variable in the Puppet::Type base class, and are using an accessor to retrieve the per-class providers hash. Signed-off-by: Luke Kanies <luke@madstop.com>
* Ruby no longer clobbers puppet autoloadingLuke Kanies2009-07-164-117/+108
| | | | | | | | | We basically just make sure that we tell Ruby about files we've loaded, so you can 'require' these files and doing so will essentially no-op, rather than clobbering the already-loaded code. Signed-off-by: Luke Kanies <luke@madstop.com>
* deprecate NetInfo providers and examples, remove all NetInfo references and ↵Nigel Kersten2009-07-1421-608/+17
| | | | tests.
* Fixed #2410 - default acl logs as info instead of warn.Sam Livingston-Gray2009-07-142-3/+3
| | | | Signed-off-by: Sam Livingston-Gray <geeksam@gmail.com>
* Adding test for current auth config warning.Sam Livingston-Gray2009-07-141-0/+5
| | | | This is a step in fixing bug #2410.
* Fixed #2394 - warn once on module mount deprecation.Sam Livingston-Gray2009-07-132-2/+2
| | | | Signed-off-by: Sam Livingston-Gray <geeksam@gmail.com>
* Add test for current module mount deprec warning.Sam Livingston-Gray2009-07-131-1/+2
|
* Fixes #2258,#2257,#2256. Maintain correct type for integers/booleans, allow ↵Nigel Kersten2009-07-113-7/+77
| | | | correct values, and fix rule array handling
* Added Markdown mode to puppetdoc to output Markdown.James Turnbull2009-07-103-10/+58
| | | | Requires the pandoc binary to function (http://johnmacfarlane.net/pandoc/).
* Excluded directories from rcov coverage reportJames Turnbull2009-07-101-0/+1
|
* Allow boolean value for boolean cli parameterBrice Figureau2009-07-102-0/+9
| | | | | | | | This is to fix puppetdoc boolean parameters. Puppetdoc defers sending parameters to Puppet::Util::Setting, and in this case, boolean parameters are stored as a boolean value. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Fix #2364 - Associates the correct comment to the right statementBrice Figureau2009-07-103-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the problem that we associate documentation in the lexer and not in the parser (which would be to complex and unmaintenable to do), and since the parser reads new tokens before reducing the current statement (thus creating the AST node), we could sometimes associate comments seen after a statement associated to this one. Ex: 1. $foo = 1 2. # doc of next class 3. class test { When we parse the first line, the parser can reduce this to the correct VarDef only after it lexed the CLASS token. But lexing this token means we already pushed on the comment stack the "doc of next class" comment. That means at the time we create the AST VarDef node, the parser thinks it should associate this documentation to it, which is incorrect. As soon as the parser uses token line number, we can enhance the lexer to allow comments to be associated to current AST node only if the statement line number is greater or equal than the last comment line number. This way it is impossible to associate a comment appearing later in the source than a previous statement. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Make sure the parser sees the correct line numberBrice Figureau2009-07-105-243/+316
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Careful inspection of the parser code show that when we associate a source line number for an AST node, we use the current line number of the currently lexed token. In many case, this is correct, but there are some cases where this is incorrect. Unfortunately due to how LALR parser works the ast node creation of a statement can appear _after_ we lexed another token after the current statement: 1. $foo = 1 2. 3. class test When the parser asks for the class token, it can reduce the assignement statement into the AST VarDef node, because no other grammar rule match. Unfortunately we already lexed the class token so we affect to the VarDef node the line number 3 instead of 1. This is not a real issue for error reporting, but becomes a real concern when we associate documentation comments to AST node for puppetdoc. The solution is to enhance the tokens lexed and returned to the parser to carry their declaration line number. Thus a token value becomes a hash: { :value => tokenvalue, :line } Next, each time we create an AST node, we use the line number of the correct token (ie the foo line number in the previous example). Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Fix #2366 - puppetdoc was parsing classes in the wrong orderBrice Figureau2009-07-101-1/+2
| | | | | | | | | | | | It could happend that we were generating doc for subclasses before classes, in which case we were forgotting some parent class instance and recreating them. We ended up generating doc for some classes multiple times, from which some were missing documentation. The fix is to sort the parsed classes alphabetically, which auto- matically puts enclosing class before enclosed classes. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Added rcov coverage to Spec testsJames Turnbull2009-07-101-4/+15
| | | | | | You will need to install the relevance-rcov gem: gem install relevance-rcov --source http://gems.github.com
* Fixes #2367 - Mongrel::HTTPRequest returns a StringIO objectJames Turnbull2009-07-082-2/+2
| | | | | | | | When the PUT body is large enough that Mongrel::HTTPRequest#body returns a StringIO object instead of a String. StringIO#to_s then returns "<StringIO#8236987299>" instead of the string contents. When that string is passed to YAML it returns false which is then passed to save_object without any real time checking. This is a combination of patches from Jordan Curzon and Ricky Zhou.
* Fix #2082 - puppetca shouldn't list revoked certificatesBrice Figureau2009-07-076-10/+37
| | | | | | | | This patch does two things: * it enhance puppetca to list revoked certificates (prefixed by -) * it fixes the ca crl verification which was broken Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Fix #2348 - Allow authstore (and REST auth) to match allow/deny against ↵Brice Figureau2009-07-072-10/+13
| | | | | | | | | | | | | | | opaque strings This patch removes the limitation of allow/deny which were only matching ip addresses or hostname (or pattern of). It makes sure any kind of string can be matched (by strict equality) while still keeping the old behaviour. Opaque strings can only contains: alphanumeric characters, - _ and @. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Fix #2392 - use Content-Type for REST communicationBrice Figureau2009-07-0513-48/+209
| | | | | | | | | | | | | | | | | | | There were two problems: * server->client communications is using Content-Type with the direct format name instead of the format mime-type. * client->server communications is not using Content-Type to send the format of the serialized object. Instead it is using the first member of the Accept header. The Accept header is usually reserved for the other side, ie what the client will accept when the server will respond. This patch makes sure s->c communication contains correct Content-Type headers. This patch also adds a Content-Type header containing the mime-type of the object sent by the client when saving. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* Fixed #2293 - Added cron syntax X-Y/Z and '7' for sundayJames Turnbull2009-07-051-3/+8
|
* Switching to LoadedCode from ASTSetLuke Kanies2009-07-0518-216/+163
| | | | | | | | I also took the opportunity to clean up and simplify the interface to the parts of the parser that interact with this. Mostly it was method renames. Signed-off-by: Luke Kanies <luke@madstop.com>
* Adding a special class to handle loaded classes/defines/nodesLuke Kanies2009-07-052-0/+191
| | | | | | | | | This class is extracted from the Parser class, and the main driver for it is to enable us to put mutexes around some of the hashes to see if they're the source of a race condition. Signed-off-by: Luke Kanies <luke@madstop.com>
* Fix #2383, an incompatibility with early ruby 1.8 versionsChristian Hofstaedtler2009-07-051-1/+2
| | | | | Earlier ruby 1.8 versions do not have start_with? for Strings. Found by John Barbuto.
* Fixing #2238 In some cases blank? is not available on String.Jordan Curzon2009-07-041-1/+1
| | | | Signed-off-by: Jordan Curzon <curzonj@gmail.com>