opuppet/module-puppetdb
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #63 from cprice-puppet/bug/master/use-fqdn-instead-of-clientcert

Browse source 
Use fqdn for ssl listen address instead of clientcert
This commit is contained in:
Ken Barber 2013-05-22 08:25:23 -07:00
commit 38e0d5bf47
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/init.pp
View file

@ -23,7 +23,7 @@
# ['open_listen_port'] - If true, open the http listen port on the firewall. # ['open_listen_port'] - If true, open the http listen port on the firewall.
# (defaults to false). # (defaults to false).
# ['ssl_listen_address'] - The address that the web server should bind to # ['ssl_listen_address'] - The address that the web server should bind to
# for HTTPS requests. (defaults to `$::clientcert`.) # for HTTPS requests. (defaults to `$::fqdn`.)
# Set to '0.0.0.0' to listen on all addresses. # Set to '0.0.0.0' to listen on all addresses.
# ['ssl_listen_port'] - The port on which the puppetdb web server should # ['ssl_listen_port'] - The port on which the puppetdb web server should
# accept HTTPS requests (defaults to 8081). # accept HTTPS requests (defaults to 8081).

2
manifests/master/config.pp
View file

@ -53,7 +53,7 @@
# TODO: finish porting this to use params # TODO: finish porting this to use params
# #
class puppetdb::master::config( class puppetdb::master::config(
$puppetdb_server = $::clientcert, $puppetdb_server = $::fqdn,
$puppetdb_port = 8081, $puppetdb_port = 8081,
$manage_routes = true, $manage_routes = true,
$manage_storeconfigs = true, $manage_storeconfigs = true,

2
manifests/params.pp
View file

@ -14,7 +14,7 @@ class puppetdb::params {
$listen_address = 'localhost' $listen_address = 'localhost'
$listen_port = '8080' $listen_port = '8080'
$open_listen_port = false $open_listen_port = false
$ssl_listen_address = $::clientcert $ssl_listen_address = $::fqdn
$ssl_listen_port = '8081' $ssl_listen_port = '8081'
$disable_ssl = false $disable_ssl = false
# This technically defaults to 'true', but in order to preserve backwards # This technically defaults to 'true', but in order to preserve backwards

2
manifests/server.pp
View file

@ -30,7 +30,7 @@
# ['open_listen_port'] - If true, open the http listen port on the firewall. # ['open_listen_port'] - If true, open the http listen port on the firewall.
# (defaults to false). # (defaults to false).
# ['ssl_listen_address'] - The address that the web server should bind to # ['ssl_listen_address'] - The address that the web server should bind to
# for HTTPS requests. (defaults to `$::clientcert`.) # for HTTPS requests. (defaults to `$::fqdn`.)
# Set to '0.0.0.0' to listen on all addresses. # Set to '0.0.0.0' to listen on all addresses.
# ['ssl_listen_port'] - The port on which the puppetdb web server should # ['ssl_listen_port'] - The port on which the puppetdb web server should
# accept HTTPS requests (defaults to 8081). # accept HTTPS requests (defaults to 8081).

2
manifests/server/jetty_ini.pp
View file

@ -9,7 +9,7 @@
# ['listen_port'] - The port on which the puppetdb web server should # ['listen_port'] - The port on which the puppetdb web server should
# accept HTTP requests (defaults to 8080). # accept HTTP requests (defaults to 8080).
# ['ssl_listen_address'] - The address that the web server should bind to # ['ssl_listen_address'] - The address that the web server should bind to
# for HTTPS requests. (defaults to `$::clientcert`.) # for HTTPS requests. (defaults to `$::fqdn`.)
# ['ssl_listen_port'] - The port on which the puppetdb web server should # ['ssl_listen_port'] - The port on which the puppetdb web server should
# accept HTTPS requests. # accept HTTPS requests.
# ['disable_ssl'] - If true, disable HTTPS and only serve # ['disable_ssl'] - If true, disable HTTPS and only serve

2
spec/unit/classes/server/jetty_ini_spec.rb
View file

@ -5,7 +5,7 @@ describe 'puppetdb::server::jetty_ini', :type => :class do
let(:facts) do let(:facts) do
{ {
:osfamily => 'RedHat', :osfamily => 'RedHat',
:clientcert => 'test.domain.local', :fqdn => 'test.domain.local',
} }
end end