Merge pull request #560 from wyardley/permissions_changes

Update file / directory permissions

manifests/config.pp

@@ -116,23 +116,23 @@
  ensure => directory,
  owner => '0',
  group => '0',
- mode => '0644',
+ mode => '0755',
  }
 
  file { '/etc/rabbitmq/ssl':
  ensure => directory,
  owner => '0',
  group => '0',
- mode => '0644',
+ mode => '0755',
  }
 
  file { 'rabbitmq.config':
  ensure => file,
  path => $config_path,
  content => template($config),
  owner => '0',
- group => '0',
- mode => '0644',
+ group => $rabbitmq_group,
+ mode => '0640',
  notify => Class['rabbitmq::service'],
  }
 
@@ -141,8 +141,8 @@
  path => $env_config_path,
  content => template($env_config),
  owner => '0',
- group => '0',
- mode => '0644',
+ group => $rabbitmq_group,
+ mode => '0640',
  notify => Class['rabbitmq::service'],
  }
 
@@ -151,8 +151,8 @@
  path => $inetrc_config_path,
  content => template($inetrc_config),
  owner => '0',
- group => '0',
- mode => '0644',
+ group => $rabbitmq_group,
+ mode => '0640',
  notify => Class['rabbitmq::service'],
  }
 
@@ -162,8 +162,8 @@
  path => '/etc/rabbitmq/rabbitmqadmin.conf',
  content => template('rabbitmq/rabbitmqadmin.conf.erb'),
  owner => '0',
- group => '0',
- mode => '0644',
+ group => $rabbitmq_group,
+ mode => '0640',
  require => File['/etc/rabbitmq'],
  }
  }

manifests/install.pp

@@ -7,6 +7,7 @@
  $package_provider = $rabbitmq::package_provider
  $package_require = $rabbitmq::package_require
  $package_source = $rabbitmq::real_package_source
+ $rabbitmq_group = $rabbitmq::rabbitmq_group
 
  package { 'rabbitmq-server':
  ensure => $package_ensure,
@@ -26,7 +27,7 @@
  file { $rabbitmq::environment_variables['MNESIA_BASE']:
  ensure => 'directory',
  owner => 'root',
- group => 'rabbitmq',
+ group => $rabbitmq_group,
  mode => '0775',
  require => Package['rabbitmq-server'],
  }

spec/classes/rabbitmq_spec.rb

@@ -476,12 +476,17 @@
 
  describe 'manages configuration directory correctly' do
  it { should contain_file('/etc/rabbitmq').with(
- 'ensure' => 'directory'
+ 'ensure' => 'directory',
+ 'mode' => '0755'
  )}
  end
 
  describe 'manages configuration file correctly' do
- it { should contain_file('rabbitmq.config') }
+ it { should contain_file('rabbitmq.config').with(
+ 'owner' => '0',
+ 'group' => 'rabbitmq',
+ 'mode' => '0640'
+ )}
  end
 
  context 'configures config_cluster' do