Skip to content

(PDB-2571) Ensure puppetdb.ini file has correct permissions #228

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

Merged
ajroetker merged 1 commit into from
May 12, 2016
Merged

(PDB-2571) Ensure puppetdb.ini file has correct permissions #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 16 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
# Final publish location for module build
pkg/

# VIM files
*.swp

# Mac files
.DS_Store

# Generated directory for coverage results
coverage/
spec/fixtures/modules/*

# Gem & bundler related files we do not want persisted to the repository
Gemfile.lock
.bundle
vendor/
.rspec_system/

# Used by rake spec, for temp modules and other test requirements
spec/fixtures/

# RVM files that are specific to developers implementation
.ruby-version
.ruby-gemset
18 changes: 17 additions & 1 deletion manifests/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,14 @@
}
}

class { 'puppetdb::server::global':
vardir => $vardir,
confdir => $confdir,
puppetdb_user => $puppetdb_user,
puppetdb_group => $puppetdb_group,
notify => Service[$puppetdb_service],
}

class { 'puppetdb::server::command_processing':
command_threads => $command_threads,
store_usage => $store_usage,
Expand Down Expand Up @@ -163,6 +171,8 @@
conn_keep_alive => $conn_keep_alive,
conn_lifetime => $conn_lifetime,
confdir => $confdir,
puppetdb_user => $puppetdb_user,
puppetdb_group => $puppetdb_group,
notify => Service[$puppetdb_service],
}

Expand All @@ -181,6 +191,8 @@
conn_keep_alive => $read_conn_keep_alive,
conn_lifetime => $read_conn_lifetime,
confdir => $confdir,
puppetdb_user => $puppetdb_user,
puppetdb_group => $puppetdb_group,
notify => Service[$puppetdb_service],
}

Expand All @@ -193,7 +205,7 @@

if str2bool($ssl_deploy_certs) == true {
validate_absolute_path($ssl_dir)
file{
file {
$ssl_dir:
ensure => directory,
owner => $puppetdb_user,
Expand Down Expand Up @@ -238,12 +250,16 @@
confdir => $confdir,
max_threads => $max_threads,
notify => Service[$puppetdb_service],
puppetdb_user => $puppetdb_user,
puppetdb_group => $puppetdb_group,
}

class { 'puppetdb::server::puppetdb':
certificate_whitelist_file => $certificate_whitelist_file,
certificate_whitelist => $certificate_whitelist,
confdir => $confdir,
puppetdb_user => $puppetdb_user,
puppetdb_group => $puppetdb_group,
notify => Service[$puppetdb_service],
}

Expand Down
6 changes: 0 additions & 6 deletions manifests/server/command_processing.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
$confdir = $puppetdb::params::confdir,
) inherits puppetdb::params {


file { "${confdir}/config.ini":
ensure => 'present',
mode => '0644',
}

# Set the defaults
Ini_setting {

@kbarber kbarber May 12, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This just moved to global.pp, because well, it didn't feel like it should be here? I don't know - maybe we should just collapse both these pp files into one.

There are a lot of refactoring possibilities around configuration I think, right now we just keep copying files ... perhaps we can refactor it all into one big file, seems like its scaffolding for scaffolding sake.

path => "${confdir}/config.ini",
Expand Down
14 changes: 12 additions & 2 deletions manifests/server/database.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
$conn_keep_alive = $puppetdb::params::conn_keep_alive,
$conn_lifetime = $puppetdb::params::conn_lifetime,
$confdir = $puppetdb::params::confdir,
$puppetdb_user = $puppetdb::params::puppetdb_user,
$puppetdb_group = $puppetdb::params::puppetdb_group,
) inherits puppetdb::params {

if str2bool($database_validate) {
Expand All @@ -40,9 +42,17 @@
}
}

file { "${confdir}/database.ini":
ensure => file,
owner => $puppetdb_user,
group => $puppetdb_group,
mode => '0600',
}

$file_require = File["${confdir}/database.ini"]
$ini_setting_require = str2bool($database_validate) ? {
false => undef,
default => Class['puppetdb::server::validate_db'],
false => $file_require,
default => [$file_require, Class['puppetdb::server::validate_db']],
}
# Set the defaults
Ini_setting {
Expand Down
13 changes: 11 additions & 2 deletions manifests/server/global.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
# PRIVATE CLASS - do not use directly
class puppetdb::server::global (
$vardir = $puppetdb::params::vardir,
$confdir = $puppetdb::params::confdir,
$vardir = $puppetdb::params::vardir,
$confdir = $puppetdb::params::confdir,
$puppetdb_user = $puppetdb::params::puppetdb_user,
$puppetdb_group = $puppetdb::params::puppetdb_group,
) inherits puppetdb::params {

file { "${confdir}/config.ini":
ensure => file,
owner => $puppetdb_user,
group => $puppetdb_group,
mode => '0600',
}

# Set the defaults
Ini_setting {
path => "${confdir}/config.ini",
Expand Down
10 changes: 10 additions & 0 deletions manifests/server/jetty.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,23 @@
$ssl_protocols = $puppetdb::params::ssl_protocols,
$confdir = $puppetdb::params::confdir,
$max_threads = $puppetdb::params::max_threads,
$puppetdb_user = $puppetdb::params::puppetdb_user,
$puppetdb_group = $puppetdb::params::puppetdb_group,
) inherits puppetdb::params {

file { "${confdir}/jetty.ini":
ensure => file,
owner => $puppetdb_user,
group => $puppetdb_group,
mode => '0600',
}

# Set the defaults
Ini_setting {
path => "${confdir}/jetty.ini",
ensure => present,
section => 'jetty',
require => File["${confdir}/puppetdb.ini"],
}

$cleartext_setting_ensure = $disable_cleartext ? {
Expand Down
10 changes: 10 additions & 0 deletions manifests/server/puppetdb.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,23 @@
$certificate_whitelist_file = $puppetdb::params::certificate_whitelist_file,
$certificate_whitelist = $puppetdb::params::certificate_whitelist,
$confdir = $puppetdb::params::confdir,
$puppetdb_user = $puppetdb::params::puppetdb_user,
$puppetdb_group = $puppetdb::params::puppetdb_group,
) inherits puppetdb::params {

file { "${confdir}/puppetdb.ini":
ensure => file,
owner => $puppetdb_user,
group => $puppetdb_group,
mode => '0600',
}

# Set the defaults
Ini_setting {
path => "${confdir}/puppetdb.ini",
ensure => present,
section => 'puppetdb',
require => File["${confdir}/puppetdb.ini"],
}

$certificate_whitelist_setting_ensure = empty($certificate_whitelist) ? {
Expand Down
11 changes: 6 additions & 5 deletions manifests/server/read_database.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,13 @@
ensure => file,
owner => $puppetdb_user,
group => $puppetdb_group,
mode => '0600';
mode => '0600',
}

$file_require = File["${confdir}/read_database.ini"]
$ini_setting_require = str2bool($database_validate) ? {
false => undef,
default => Class['puppetdb::server::validate_read_db'],
false => $file_require,
default => [$file_require, Class['puppetdb::server::validate_read_db']],
}
# Set the defaults
Ini_setting {
Expand All @@ -74,13 +75,13 @@

$subname = "//${database_host}:${database_port}/${database_name}${database_suffix}"

ini_setting { 'puppetdb_read_psdatabase_username':
ini_setting { 'puppetdb_read_database_username':
setting => 'username',
value => $database_username,
}

if $database_password != undef {
ini_setting { 'puppetdb_read_psdatabase_password':
ini_setting { 'puppetdb_read_database_password':
setting => 'password',
value => $database_password,
}
Expand Down
2 changes: 2 additions & 0 deletions spec/unit/classes/init_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

describe 'when using default values for puppetdb class' do
it { should contain_class('puppetdb') }
it { should contain_class('puppetdb::server') }
it { should contain_class('puppetdb::database::postgresql') }
end
end

Expand Down
7 changes: 7 additions & 0 deletions spec/unit/classes/server/database_ini_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
it { should contain_class('puppetdb::server::database') }

describe 'when using default values' do
it { should contain_file('/etc/puppetlabs/puppetdb/conf.d/database.ini').
with(
'ensure' => 'file',
'owner' => 'puppetdb',
'group' => 'puppetdb',
'mode' => '0600'
)}
it { should contain_ini_setting('puppetdb_psdatabase_username').
with(
'ensure' => 'present',
Expand Down
8 changes: 7 additions & 1 deletion spec/unit/classes/server/global_ini_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,13 @@
'setting' => 'vardir',
'value' => '/opt/puppetlabs/server/data/puppetdb'
)}

it { should contain_file('/etc/puppetlabs/puppetdb/conf.d/config.ini').
with(
'ensure' => 'file',
'owner' => 'puppetdb',
'group' => 'puppetdb',
'mode' => '0600'
)}
end

describe 'when using a legacy puppetdb version' do
Expand Down
7 changes: 7 additions & 0 deletions spec/unit/classes/server/jetty_ini_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@
it { should contain_class('puppetdb::server::jetty') }

describe 'when using default values' do
it { should contain_file('/etc/puppetlabs/puppetdb/conf.d/jetty.ini').
with(
'ensure' => 'file',
'owner' => 'puppetdb',
'group' => 'puppetdb',
'mode' => '0600'
)}
it { should contain_ini_setting('puppetdb_host').
with(
'ensure' => 'present',
Expand Down
7 changes: 7 additions & 0 deletions spec/unit/classes/server/puppetdb_ini_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@
'mode' => '0644',
'content' => ''
)}
it { should contain_file('/etc/puppetlabs/puppetdb/conf.d/puppetdb.ini').
with(
'ensure' => 'file',
'owner' => 'puppetdb',
'group' => 'puppetdb',
'mode' => '0600'
)}
end

describe 'when restricting access to puppetdb' do
Expand Down
Loading