Skip to content
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

Jump to bottom

Standardize file permissions, allow non-root #767

Merged
merged 1 commit into from
Mar 31, 2018
Merged

Standardize file permissions, allow non-root #767

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
7 changes: 4 additions & 3 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
Stdlib::Absolutepath $plugin_conf_dir = $collectd::plugin_conf_dir,
$plugin_conf_dir_mode = $collectd::plugin_conf_dir_mode,
$recurse = $collectd::recurse,
$root_group = $collectd::root_group,
$config_group = $collectd::config_group,
String $config_owner = $collectd::config_owner,
$purge = $collectd::purge,
Boolean $purge_config = $collectd::purge_config,
Integer $read_threads = $collectd::read_threads,
Expand Down Expand Up @@ -51,8 +52,8 @@
ensure => directory,
path => $plugin_conf_dir,
mode => $plugin_conf_dir_mode,
owner => 'root',
group => $root_group,
owner => $config_owner,
group => $config_group,
purge => $purge,
recurse => $recurse,
}
Expand Down
4 changes: 3 additions & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
$purge_config = $collectd::params::purge_config,
$read_threads = $collectd::params::read_threads,
$recurse = $collectd::params::recurse,
$root_group = $collectd::params::root_group,
String $config_group = $collectd::params::config_group,
String $config_mode = $collectd::params::config_mode,
String $config_owner = $collectd::params::config_owner,
$service_enable = $collectd::params::service_enable,
$service_ensure = $collectd::params::service_ensure,
$service_name = $collectd::params::service_name,
Expand Down
18 changes: 10 additions & 8 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
$fqdnlookup = true
$collectd_hostname = $::hostname
$conf_content = undef
$config_mode = '0640'
$config_owner = 'root'
$interval = 10
$include = []
$internal_stats = false
Expand Down Expand Up @@ -40,7 +42,7 @@
$plugin_conf_dir = "${collectd_dir}/conf.d"
$service_name = 'collectd'
$config_file = "${collectd_dir}/collectd.conf"
$root_group = 'root'
$config_group = 'root'
$java_dir = '/usr/share/collectd/java'
$default_python_dir = '/usr/local/lib/python2.7/dist-packages'
$manage_repo = true
Expand All @@ -52,7 +54,7 @@
$plugin_conf_dir = $collectd_dir
$service_name = 'cswcollectd'
$config_file = '/etc/opt/csw/collectd.conf'
$root_group = 'root'
$config_group = 'root'
$java_dir = undef
$default_python_dir = '/opt/csw/share/collectd/python'
$manage_repo = false
Expand All @@ -64,7 +66,7 @@
$plugin_conf_dir = $collectd_dir
$service_name = 'collectd'
$config_file = '/etc/collectd.conf'
$root_group = 'root'
$config_group = 'root'
$java_dir = '/usr/share/collectd/java'
$default_python_dir = '/usr/lib/python2.7/site-packages'
$manage_repo = true
Expand All @@ -76,7 +78,7 @@
$plugin_conf_dir = $collectd_dir
$service_name = 'collectd'
$config_file = '/etc/collectd.conf'
$root_group = 'root'
$config_group = 'root'
$java_dir = undef
$default_python_dir = '/usr/share/collectd/python'
$manage_repo = false
Expand All @@ -88,7 +90,7 @@
$plugin_conf_dir = $collectd_dir
$service_name = 'collectd'
$config_file = '/usr/local/etc/collectd.conf'
$root_group = 'wheel'
$config_group = 'wheel'
$java_dir = undef
$default_python_dir = '/usr/local/share/collectd/python'
$manage_repo = false
Expand All @@ -100,7 +102,7 @@
$plugin_conf_dir = $collectd_dir
$service_name = 'collectd'
$config_file = '/etc/collectd.conf'
$root_group = '_collectd'
$config_group = '_collectd'
$java_dir = undef
$default_python_dir = '/usr/local/share/collectd/python'
$manage_repo = false
Expand All @@ -112,7 +114,7 @@
$plugin_conf_dir = $collectd_dir
$service_name = 'collectd'
$config_file = '/etc/collectd.conf'
$root_group = 'wheel'
$config_group = 'wheel'
$java_dir = undef
$default_python_dir = '/usr/share/collectd/python'
$manage_repo = false
Expand All @@ -124,7 +126,7 @@
$plugin_conf_dir = $collectd_dir
$service_name = 'collectd'
$config_file = '/etc/collectd.conf'
$root_group = 'collectd'
$config_group = 'collectd'
$java_dir = undef
$default_python_dir = '/usr/share/collectd/python'
$manage_repo = false
Expand Down
8 changes: 4 additions & 4 deletions manifests/plugin.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
include ::collectd

$conf_dir = $::collectd::plugin_conf_dir
$root_group = $::collectd::root_group
$config_group = $::collectd::config_group

file { "${plugin}.load":
ensure => $ensure,
path => "${conf_dir}/${order}-${plugin}.conf",
owner => root,
group => $root_group,
mode => '0640',
owner => $collectd::config_owner,
group => $collectd::config_group,
mode => $collectd::config_mode,
content => template('collectd/loadplugin.conf.erb'),
notify => Service['collectd'],
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/aggregation/aggregator.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@

file { "${conf_dir}/aggregator-${name}.conf":
ensure => $ensure,
mode => '0640',
owner => 'root',
group => $collectd::root_group,
mode => $collectd::config_mode,
owner => $collectd::config_owner,
group => $collectd::config_group,
content => template('collectd/plugin/aggregation-aggregator.conf.erb'),
notify => Service['collectd'],
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/apache/instance.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
file { "apache-instance-${name}.conf":
ensure => $ensure,
path => "${collectd::plugin_conf_dir}/25-apache-instance-${name}.conf",
owner => root,
group => $collectd::root_group,
mode => '0640',
owner => $collectd::config_owner,
group => $collectd::config_group,
mode => $collectd::config_mode,
content => template('collectd/plugin/apache/instance.conf.erb'),
notify => Service['collectd'],
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/chain.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

file { "${conf_dir}/99-chain-${chainname}.conf":
ensure => $ensure,
mode => '0640',
owner => 'root',
group => $collectd::root_group,
mode => $collectd::config_mode,
owner => $collectd::config_owner,
group => $collectd::config_group,
content => template('collectd/plugin/chain.conf.erb'),
notify => Service['collectd'],
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/curl/page.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

file { "${conf_dir}/curl-${name}.conf":
ensure => $ensure,
mode => '0640',
owner => 'root',
group => $collectd::root_group,
mode => $collectd::config_mode,
owner => $collectd::config_owner,
group => $collectd::config_group,
content => template('collectd/plugin/curl-page.conf.erb'),
notify => Service['collectd'],
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/curl_json.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
file {
"${name}.load":
path => "${conf_dir}/${order}-${name}.conf",
owner => 'root',
group => $collectd::root_group,
mode => '0640',
owner => $collectd::config_owner,
group => $collectd::config_group,
mode => $collectd::config_mode,
content => template('collectd/curl_json.conf.erb'),
notify => Service['collectd'],
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/dbi.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@

concat { "${collectd::plugin_conf_dir}/dbi-config.conf":
ensure => $ensure,
mode => '0640',
owner => 'root',
group => $collectd::root_group,
mode => $collectd::config_mode,
owner => $collectd::config_owner,
group => $collectd::config_group,
notify => Service['collectd'],
ensure_newline => true,
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/exec.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

concat{ $exec_conf:
ensure => $ensure,
mode => '0640',
owner => 'root',
group => $collectd::root_group,
mode => $collectd::config_mode,
owner => $collectd::config_owner,
group => $collectd::config_group,
notify => Service['collectd'],
ensure_newline => true,
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/filecount/directory.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

file { "${collectd::plugin_conf_dir}/15-filecount-${name}.conf":
ensure => $ensure,
mode => '0640',
owner => 'root',
group => $collectd::root_group,
mode => $collectd::config_mode,
owner => $collectd::config_owner,
group => $collectd::config_group,
content => template('collectd/plugin/filecount-directory.conf.erb'),
notify => Service['collectd'],
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/filter.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

file { $conf_file:
ensure => $ensure,
owner => 'root',
group => $collectd::root_group,
mode => '0644',
owner => $collectd::config_owner,
group => $collectd::config_group,
mode => $collectd::config_mode,
content => "PreCacheChain \"${precachechain}\"\nPostCacheChain \"${postcachechain}\"\n\n",
notify => Service['collectd'],
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/filter/chain.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

concat{ $conf_file:
ensure => $ensure,
mode => '0640',
owner => 'root',
group => $collectd::root_group,
mode => $collectd::config_mode,
owner => $collectd::config_owner,
group => $collectd::config_group,
notify => Service['collectd'],
ensure_newline => true,
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/genericjmx.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
}

concat { $config_file:
mode => '0640',
owner => 'root',
group => $collectd::root_group,
mode => $collectd::config_mode,
owner => $collectd::config_owner,
group => $collectd::config_group,
notify => Service['collectd'],
ensure_newline => true,
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/mysql/database.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
file { "${name}.conf":
ensure => $ensure,
path => "${collectd::plugin_conf_dir}/mysql-${name}.conf",
mode => '0640',
owner => 'root',
group => $collectd::root_group,
mode => $collectd::config_mode,
owner => $collectd::config_owner,
group => $collectd::config_group,
content => template('collectd/mysql-database.conf.erb'),
notify => Service['collectd'],
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/network/listener.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

file { "${conf_dir}/network-listener-${name}.conf":
ensure => $ensure,
mode => '0640',
owner => 'root',
group => $collectd::root_group,
mode => $collectd::config_mode,
owner => $collectd::config_owner,
group => $collectd::config_group,
content => template('collectd/plugin/network/listener.conf.erb'),
notify => Service['collectd'],
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/network/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

file { "${conf_dir}/network-server-${name}.conf":
ensure => $ensure,
mode => '0640',
owner => 'root',
group => $::collectd::root_group,
mode => $collectd::config_mode,
owner => $collectd::config_owner,
group => $collectd::config_group,
content => template('collectd/plugin/network/server.conf.erb'),
notify => Service['collectd'],
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/oracle.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

concat { $config_file:
ensure => $ensure,
mode => '0640',
owner => 'root',
group => $collectd::root_group,
mode => $collectd::config_mode,
owner => $collectd::config_owner,
group => $collectd::config_group,
notify => Service['collectd'],
ensure_newline => true,
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/perl.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@

file { "${conf_dir}/perl":
ensure => directory,
mode => '0755',
owner => $collectd::root_user,
group => $collectd::root_group,
mode => $collectd::plugin_conf_dir_mode,
owner => $collectd::config_owner,
group => $collectd::config_group,
}
}

6 changes: 3 additions & 3 deletions manifests/plugin/perl/plugin.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
$filename = "${conf_dir}/perl/plugin-${order}_${name}.conf"

file { $filename:
owner => $collectd::root_user,
group => $collectd::root_group,
mode => '0644',
owner => $collectd::config_owner,
group => $collectd::config_group,
mode => $collectd::config_mode,
content => template('collectd/plugin/perl/plugin.erb'),
}

Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/postgresql.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@

concat { "${collectd::plugin_conf_dir}/postgresql-config.conf":
ensure => $ensure,
mode => '0640',
owner => 'root',
group => $collectd::root_group,
mode => $collectd::config_mode,
owner => $collectd::config_owner,
group => $collectd::config_group,
notify => Service['collectd'],
ensure_newline => true,
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/processes.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

concat { "${collectd::plugin_conf_dir}/processes-config.conf":
ensure => $ensure,
mode => '0640',
owner => 'root',
group => $collectd::root_group,
mode => $collectd::config_mode,
owner => $collectd::config_owner,
group => $collectd::config_group,
notify => Service['collectd'],
ensure_newline => true,
}
Expand Down
Loading