Commit graph

18 commits

Author SHA1 Message Date
Christian Berg
0a9d936670 Merge branch 'master' into feature/master/option_to_disable_ssl 2013-04-09 23:38:40 +02:00
Ken Barber
64aa1fec15 Also fix gc_interval
Signed-off-by: Ken Barber <ken@bob.sh>
2013-04-09 13:40:12 +01:00
fsalum
46684c4ab6 the new settings report_ttl, node_ttl and node_purge_ttl were added but they are not working, this fixes it 2013-04-09 13:38:30 +01:00
Christian Berg
28e23581c7 (#51) Add option to disable SSL in Jetty
This patch introduces the optional parameter $disable_ssl, which
defaults to false. If set to true, the settings ssl-host and ssl-port
are completely removed from the Jetty section of the PuppetDB config
files.

This disables serving of HTTPS requests by PuppetDB, which can be useful
when SSL handling is offloaded to a reverse proxy server like Apache or
Nginx, as suggested in the PuppetDB documentation (see
http://docs.puppetlabs.com/puppetdb/1.2/connect_puppet_apply.html#option-a-set-up-an-ssl-proxy-for-puppetdb).
2013-04-09 00:39:04 +02:00
Garrett Honeycutt
fc3f8dc747 allows for 0 _ttl's without time signifier and enables tests 2013-04-08 23:49:18 +02:00
Nick Lewis
9efe80b95a Add params and ini_settings for node/report/purge ttls 2013-02-06 15:25:20 -08:00
Chris Price
de20b44101 Fix backward compatibility of manage_redhat_firewall parameter
Prior to this commit, the deprecated `manage_redhat_firewall` param
was not actually backward compatible because there were several
cases where we couldn't tell the difference between the user
explicitly specifying `false` for that parameter as opposed to
not specifying it at all.  This commit is a bit ugly because it
sets some defaults to `undef` in order to allow us to tell the
difference between the two cases, but it should resolve backwards
compatibility issues.
2013-01-17 09:59:08 -08:00
Chris Price
448f8bc996 Fix deprecation warnings around manage_redhat_firewall 2013-01-16 17:52:11 -08:00
Drew Blessing
0cf963279a 17594 - Fixes suggested by cprice-puppet 2012-11-29 07:46:05 -06:00
Drew Blessing
57445ef70f 17594 - PuppetDB - Add ability to set standard host listen address and open firewall to standard port
Prior to this commit the module did not provide a way to set a bind address for the HTTP port.  This
commit allows users to not only bind to an address and port other than localhost and 8080, but it also
opens the firewall if explicitly requested.
2012-11-14 09:00:15 -06:00
Reid Vandewiele
bf0ab45620 Fix embedded db setup in Puppet Enterprise
The subname value in database.ini when using an embedded database varies
between the Puppet Enterprise package and the FOSS Puppet package.
Previously, the PuppetDB module could not successfully manage an
embedded database on a PE master. This commit adds an additional
parameter and utilization to account for this.
2012-10-17 13:28:01 -07:00
Chris Price
f21740b699 Pass 'manage_redhat_firewall' param through to postgres
Prior to this commit, if you allowed the puppetdb module
to manage postgres for you, it would always try to manage
the firewall for the postgres port on redhat systems.

This commit exposes that as a parameter in a few more
spots, and passes it through to the postgres module.
2012-09-21 10:47:19 -07:00
Chris Price
a65afcc1f1 Fix duplicate stanza in database_ini.pp
There was a minor problem with a merge conflict in the previous
commit.  This commit should fix it.
2012-09-20 16:59:39 -07:00
Chris Price
4360004ea2 Merge remote-tracking branch 'ghoneycutt/ticket/1.0.x/xxxx_style_updates' into maint/master/resolve-merge-conflict
Conflicts:
	manifests/server/database_ini.pp
2012-09-20 16:22:46 -07:00
Garrett Honeycutt
1aab5d98b0 complies with style guide 2012-09-20 14:46:26 -07:00
Chris Price
be683b7b5a Fix invalid subname in database.ini
For the postgres subname, the module was writing the wrong value
for the database instance name.  This commit fixes that bug.
2012-09-19 13:44:39 -07:00
Chris Price
b80866ebef Add support for opening puppetdb port in firewall 2012-09-17 17:06:48 -07:00
Chris Price
8fbda3c4d6 Use ini_file to manage settings, and add validation
This commit does the following:

* Use the new inifile module to manage puppet.conf
* More comprehensive management of config files
* Validate database connectivity before applying puppetdb
  config changes
* Validate puppetdb connectivity before applying puppet
  master config changes
* Documentation
2012-09-17 15:26:32 -07:00