Skip to content

add feature for disabling/enabling CA #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add feature for disabling/enabling CA #91

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73e2ce2
add feature for disabling/enabling CA
Jan 26, 2015
db01fd2
fix wrong tab usage
Jan 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 15 additions & 19 deletions manifests/master.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@
# ['dns_alt_names'] - Comma separated list of alternative DNS names
# ['digest_algorithm'] - The algorithm to use for file digests.
# ['generate_ssl_certs'] - Generate ssl certs (false to disable)
# ['use_ca'] - Use the built in CA, defaults to true
#
# Requires:
#
# - inifile
# - Class['puppet::params']
# - Class[puppet::passenger]
# - Class['puppet::passenger']
# - Class['puppet::storeconfigs']
#
# Sample Usage:
Expand All @@ -49,8 +50,8 @@
# ]
#
# class { "puppet::master":
# modulepath => inline_template("<%= modulepath.join(':') %>"),
# storeconfigs => 'true',
# modulepath => inline_template("<%= modulepath.join(':') %>"),
# storeconfigs => 'true',
# }
#
class puppet::master (
Expand Down Expand Up @@ -87,6 +88,7 @@
$digest_algorithm = $::puppet::params::digest_algorithm,
$generate_ssl_certs = true,
$puppetdb_version = 'present',
$use_ca = true,
) inherits puppet::params {

anchor { 'puppet::master::begin': }
Expand Down Expand Up @@ -206,6 +208,7 @@
require => File[$::puppet::params::puppet_conf],
notify => Service['httpd'],
section => 'master',
ensure => present,
}

case $environments {
Expand Down Expand Up @@ -239,79 +242,72 @@

if $external_nodes != undef {
ini_setting {'puppetmasterencconfig':
ensure => present,
setting => 'external_nodes',
value => $external_nodes,
}

ini_setting {'puppetmasternodeterminus':
ensure => present,
setting => 'node_terminus',
value => 'exec'
}
}
elsif $node_terminus != undef {
ini_setting {'puppetmasternodeterminus':
ensure => present,
setting => 'node_terminus',
value => $node_terminus
}
}

ini_setting {'puppetmasterhieraconfig':
ensure => present,
setting => 'hiera_config',
value => $hiera_config,
}

ini_setting {'puppetmasterautosign':
ensure => present,
setting => 'autosign',
value => $autosign,
}

ini_setting {'puppetmastercertname':
ensure => present,
setting => 'certname',
value => $certname,
}

ini_setting {'puppetmasterreports':
ensure => present,
setting => 'reports',
value => $reports,
}

ini_setting {'puppetmasterpluginsync':
ensure => present,
setting => 'pluginsync',
value => $pluginsync,
}

ini_setting {'puppetmasterparser':
ensure => present,
setting => 'parser',
value => $parser,
}

if $reporturl != undef {
ini_setting {'puppetmasterreport':
ensure => present,
setting => 'reporturl',
value => $reporturl,
}
}

ini_setting {'puppetmasterdnsaltnames':
ensure => present,
setting => 'dns_alt_names',
value => join($dns_alt_names, ','),
setting => 'dns_alt_names',
value => join($dns_alt_names, ','),
}

ini_setting {'puppetmasterdigestalgorithm':
ensure => present,
setting => 'digest_algorithm',
value => $digest_algorithm,
setting => 'digest_algorithm',
value => $digest_algorithm,
}

ini_setting {'puppetmasterca':
setting => 'ca',
value => $use_ca,
}

anchor { 'puppet::master::end': }
Expand Down