summaryrefslogtreecommitdiffstats
path: root/lib/puppet/rails.rb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '0.25.x'James Turnbull2010-01-131-2/+5
|\ | | | | | | | | | | Conflicts: lib/puppet/ssl/host.rb spec/spec_helper.rb
| * Fix #2816 MySQL server has gone awayJesse Wolfe2009-12-201-0/+1
| | | | | | | | | | | | As suggested in the ticket, set :reconnect to true. Our in-house Rails experts suggest that this is unlikely to cause any problems. The setting is silently ignored before Rails 2.3
| * Fix #2808 puppetqd doesn't give an error when no config is givenJesse Wolfe2009-12-171-2/+4
| | | | | | | | | | | | | | | | | | | | Added an info message about what database we're connecting to. In the case of the default database, it looks like: info: Connecting to sqlite3 database: /var/lib/puppet/state/clientconfigs.sqlite3 Also squashes the deprecation warning #2941, since fixing that makes this patch smaller.
* | Merge branch '0.25.x'Luke Kanies2009-12-211-0/+4
|\| | | | | | | | | | | | | | | Conflicts: lib/puppet/agent.rb lib/puppet/application/puppetd.rb lib/puppet/parser/ast/leaf.rb lib/puppet/util/rdoc/parser.rb
| * Fixing #2764 ActiveRecord 2.1 supportJesse Wolfe2009-11-171-0/+4
| | | | | | | | | | | | | | | | | | | | Suprisingly, I found that setting allow_concurrency made the "MySQL server has gone away" stop occuring even if the MySQL server drops connections. This may be the only change needed to restore compatibility with ActiveRecord 2.1.x Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
* | Fixed #2568 - Add database option 'dbconnections'Richard Soderberg2009-11-201-4/+10
| | | | | | | | This sets the ActiveRecords connection pool size, when connecting to remote databases (mysql, postgres). default is 0; the 'pool' argument is only passed to ActiveRecords when the value is 1 or greater.
* | Patch to address feature #2571 to add Oracle support to PuppetAvi Miller2009-10-241-0/+4
|/ | | | | | Adapter requires specifying database, username and password. Signed-off-by: Avi Miller <avi.miller@gmail.com>
* Removed extra whitespace from end of linesIan Taylor2009-06-061-6/+6
|
* Removing deprecated concurrency setting usage in railsLuke Kanies2009-04-241-1/+0
| | | | Signed-off-by: Luke Kanies <luke@madstop.com>
* Adding a Rails-specific benchmarking moduleLuke Kanies2009-04-221-0/+1
| | | | | | | This just slightly simplifies adding lots of time-debug stuff in Rails. Signed-off-by: Luke Kanies <luke@madstop.com>
* Fixed #1849 - Ruby 1.9 portability: `when' doesn't like colons, replace with ↵James Turnbull2009-02-261-2/+2
| | | | semicolons
* * Tweaks for puppetshow UI cleanupBlake Barnett2008-02-281-0/+4
|
* Implementing the test for setting the RailsLuke Kanies2007-11-241-22/+23
| | | | log level.
* Merge commit 'danp/rails_socket_and_tests'Luke Kanies2007-11-241-4/+8
|\
| * mock all use of Puppet[] in Puppet::Rails.database_argumentsDan Peterson2007-11-231-4/+8
| |
| * fix socket argument to AR and add rails specDan Peterson2007-11-231-1/+1
| |
* | Adding patch ↵Luke Kanies2007-11-231-1/+1
| | | | | | | | 20070913032546-6856b-0de200e8450920e7f712c54bf287ae43c7fda8af.patch from womble -- Only set dbuser if explicitly asked for
* | Adding patch ↵Luke Kanies2007-11-231-2/+2
|/ | | | 20070913003810-6856b-cdc8b2e8c6c46eb8d6d073f86291a0fc5a59f429.patch from womble -- Only set the hostname and password if we want them; this allows pgsql ident auth to work it's magic
* Accepting a modified form of the patch from #885 by immerda.Luke Kanies2007-11-231-0/+1
|
* Removing the Id tags from all of the filesLuke Kanies2007-10-031-1/+0
|
* Renaming the 'Puppet::Util::Config' class toLuke Kanies2007-09-221-2/+2
| | | | | | | 'Puppet::Util::Settings'. This is to clear up confusion caused by the fact that we now have a 'Configuration' class to model host configurations, or any set of resources as a "configuration".
* Fixing #710 -- you can now specify the rails_loglevelluke2007-07-091-1/+8
| | | | git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2667 980ebf18-57e1-0310-9a29-db15c13687c0
* fixing the appdmg provider to load the package provider base class, and ↵luke2007-06-181-8/+1
| | | | | | trying to clean up the log-file opening in rails git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2609 980ebf18-57e1-0310-9a29-db15c13687c0
* Consolidating all of the configuration parameter declarations into ↵luke2007-05-041-27/+3
| | | | | | configuration, at least partially just because then the docs for each parameter have to be a bit better. Also, I have gotten rid of the "puppet" section, replacing it with "main", and changed, added, or removed a couple of other sections. In general, we should now prefer more sections, rather than fewer. git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2463 980ebf18-57e1-0310-9a29-db15c13687c0
* Adding a migration to create indexesluke2007-03-211-0/+2
| | | | git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2342 980ebf18-57e1-0310-9a29-db15c13687c0
* Merging the webserver_portability branch from version 2182 to version 2258.luke2007-03-061-18/+22
| | | | git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2259 980ebf18-57e1-0310-9a29-db15c13687c0
* I believe this fixes the issues in ticket #469shadoi2007-02-211-0/+1
| | | | | | | My testing on mysql shows connections being reaped. git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2217 980ebf18-57e1-0310-9a29-db15c13687c0
* Fixing the default dbadapter back to sqlite3luke2007-02-171-1/+1
| | | | git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2212 980ebf18-57e1-0310-9a29-db15c13687c0
* Merge fact_names & fact_values, and param_names & param_values.shadoi2007-02-151-1/+1
| | | | git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2191 980ebf18-57e1-0310-9a29-db15c13687c0
* Adding extra connection statements and enabling concurrency support in ↵luke2007-01-031-0/+1
| | | | | | rails, hopefully fixing #399. git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2027 980ebf18-57e1-0310-9a29-db15c13687c0
* Adding postgres as a dbadapter optionluke2007-01-021-1/+3
| | | | git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2019 980ebf18-57e1-0310-9a29-db15c13687c0
* Removing debuggingluke2006-12-291-1/+1
| | | | git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1996 980ebf18-57e1-0310-9a29-db15c13687c0
* A couple of small bug-fixesluke2006-12-281-4/+0
| | | | git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1976 980ebf18-57e1-0310-9a29-db15c13687c0
* Fixing most of the rails stuff. I think everything basically works now, and ↵luke2006-12-191-74/+69
| | | | | | now I am just going through and making sure things get deleted when they are supposed (i.e., you remove a resource and it gets deleted from the host's config). git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1950 980ebf18-57e1-0310-9a29-db15c13687c0
* Fix up a problem with initialising an sqlite3 data store, presumably only ↵mpalmer2006-12-181-1/+1
| | | | | | with older versions of Rails git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1949 980ebf18-57e1-0310-9a29-db15c13687c0
* Some rails modificationsluke2006-12-151-5/+5
| | | | git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1931 980ebf18-57e1-0310-9a29-db15c13687c0
* New rails stuff redux.shadoi2006-12-141-5/+43
| | | | git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1925 980ebf18-57e1-0310-9a29-db15c13687c0
* Working some on the export/collect problem. It actually works now, but ↵luke2006-12-121-34/+2
| | | | | | there are not yet sufficient tests for it, so I will leave the bug open until we have got the new work in place. I also added a "rails" feature, so I do not have to keep testing whether ActiveRecord is defined. git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1911 980ebf18-57e1-0310-9a29-db15c13687c0
* Temporarily reverting all of the recent rails work so that I can release 0.20.1luke2006-11-131-23/+14
| | | | git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1873 980ebf18-57e1-0310-9a29-db15c13687c0
* Fixing some warningsluke2006-11-101-0/+3
| | | | git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1853 980ebf18-57e1-0310-9a29-db15c13687c0
* Small fixes here and there. The rails changes needs to be pushed through ↵luke2006-11-091-4/+14
| | | | | | the collection code, so I am committing so Blake can take a look at that. git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1844 980ebf18-57e1-0310-9a29-db15c13687c0
* Rails stuff part 1shadoi2006-11-091-12/+25
| | | | git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1837 980ebf18-57e1-0310-9a29-db15c13687c0
* Switching from calling "up" on the migration directly to using the "migrate" ↵luke2006-10-171-2/+14
| | | | | | method. It is still not checking versions or allowing external forcing of migration, but it is a start. git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1795 980ebf18-57e1-0310-9a29-db15c13687c0
* Using the "trace" configuration parameter to determine whether a stack trace ↵luke2006-09-151-1/+1
| | | | | | should be printed, rather than just using "debug". I added the param a little while ago and was using it internally in Puppet::DevError, but I just now went through the whole configuration and switched to using it. git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1613 980ebf18-57e1-0310-9a29-db15c13687c0
* fixing stupid debian rails mistakeluke2006-05-171-11/+12
| | | | git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1205 980ebf18-57e1-0310-9a29-db15c13687c0
* Adding code to try for the rails gem if the library cannot be found ↵luke2006-05-151-2/+19
| | | | | | normally, and adding some protections in case there are problems git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1198 980ebf18-57e1-0310-9a29-db15c13687c0
* failing more intelligently in init if ActiveRecord is missingluke2006-05-151-0/+4
| | | | git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1196 980ebf18-57e1-0310-9a29-db15c13687c0
* I had to redo how the scopes handled collectable objects (which I will soon ↵luke2006-05-141-7/+18
| | | | | | change to being called "exported objects"). All seems to work now, though. git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1192 980ebf18-57e1-0310-9a29-db15c13687c0
* The "collectable" syntax now works end-to-end -- the parser correctly ↵luke2006-05-131-21/+23
| | | | | | recognizes it, the AST objects retain the settings, the scopes do the right conversion, the interpreter stores them all in the database, and then it strips the collectable objects out before sending the object list to the client git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1189 980ebf18-57e1-0310-9a29-db15c13687c0
* Adding initial rails support. One can now store host configurations using ↵luke2006-05-131-0/+80
ActiveRecord into a database (I have only tested sqlite3). Tomorrow will be the grammars used to retrieve those records for object collection. git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1187 980ebf18-57e1-0310-9a29-db15c13687c0