Commit graph

33 commits

Author SHA1 Message Date
Garrett Honeycutt
af10eedfc6 Add ability to specify SSL protocols.
This is in response to CVE-2014-3566 - POODLE
2014-10-29 19:29:15 -04:00
Stefan Andres
ed5e57ca89 Remove invisible unicode character to prevent "invalid byte sequence in US-ASCII" 2014-10-16 13:36:23 +02:00
Ken Barber
f6f6e55b33 Cleanups, missing doc items and new test_url capability
This provides a number of cleanups as the code has been unloved for a while.

I've added the ssl-* parameters the robinbowes added in his last patch to the
docs, and found some other cleanups as well where applicable.

I've added the ability to override the test_url also, so that in the future
if a user wishes to they can customize this.

Signed-off-by: Ken Barber <ken@bob.sh>
2014-10-07 15:06:54 +01:00
Robin Bowes
8c68fc1dd2 Add the ability to a) deploy ssl keys, b) set paths to ssl keys in jetty.ini
This also adds parameters for puppetdb user/group to support PE correctly.
2014-10-07 15:04:37 +01:00
Garrett Honeycutt
95812ed192 Update jetty_ini.pp 2014-09-24 17:43:40 -04:00
Taylan Develioglu
27840d6959 Add read-database support 2014-08-04 13:54:38 +02:00
Stefan Andres
3061b90127 implement max_threads option for jetty 2014-06-26 17:15:34 +02:00
Ken Barber
603df7381d (GH-93) Switch to using puppetlabs-postgresql 3.x
This updates the module to be able to use puppetlabs-postgresql.

Since this change is a major change, it marks this patch as a breaking change.

I have prepared a suitable amount of upgrade notes for upgrading to this later
version of the module plus removed anything marked deprecated.

As cleanup, I've removed the troublesome 'tests' directory in favour of good
README.md documentation. I've also removed any puppet docs from each module
until such times as puppet docs become automated through the forge. This is
just to avoid contributors having to double their efforts - the README.md
is the authority now.

Signed-off-by: Ken Barber <ken@bob.sh>
2013-10-21 18:43:41 +01:00
Stefan Dietrich
d6202bdda2 Disable database validation, if SSL is enabled 2013-10-19 19:56:46 +02:00
Stefan Dietrich
84c5fa79ea Add switch to configure database SSL connection
PostgreSQL supports secure connections through SSL. For PuppetDB
to connect with SSL, "?ssl=true" has to be specified on the
connection string.

This patch adds such a switch, by default PuppetDB will not use SSL
to connect to the database.
2013-10-19 19:56:46 +02:00
Chris Price
dd57e38c48 Merge pull request #78 from nicklewis/optional-password
Make database_password an optional parameter
2013-08-12 16:25:43 -07:00
Nick Lewis
2f12a5d7c0 Make database_password an optional parameter
In some cases it may not be possible to securely specify a password for
PuppetDB. When that is true, it's impossible to use the module to manage
PuppetDB, because specifying undef for the password will cause database
validation to fail, or for the setting in database.ini to be overridden.

This change will simply check that database_password is set, and will
skip validation and changing database.ini in the case where it is not.
2013-08-12 14:53:02 -07:00
Ken Barber
9c41392312 Add missing parameters for 1.4.0 release
This patch adds all the missing parameters now defined in the 1.4.0 release.

This includes some new database parameters mainly, but also adds gc_interval
to the `puppetdb` and `puppetdb::server` classes, as previously this wasn't
configurable using this method.

To avoid documentation duplication the Puppet headers have been removed in
favour of documenting classes from the README.md. Until such times as the
forge can turn Puppet docs into HTML automatically, this is just duplicate
noise and prone to update slippage. The README.md is more authoritative in
this area and is pubicly displayed on the forge project page so it should be
used for now.

Signed-off-by: Ken Barber <ken@bob.sh>
2013-08-07 15:32:19 +01:00
Erik Dalén
02d0c48438 Style guideline fixes 2013-06-04 14:19:53 +02:00
Chris Price
b79214066a Use fqdn for ssl listen address instead of clientcert
Chris Barker reported that the default value of `$::clientcert`
was not the best choice for some things we were using it for
in the module; specifically, for the default value of
the jetty ssl listen address.  He suggested using `$::fqdn` instead.

This commit makes that change; rspec-system tests pass, but I'm
not 100% sure that there aren't edge cases that would be
affected by this.
2013-05-21 16:35:42 -07:00
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