summaryrefslogtreecommitdiff
path: root/manifests/master
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2013-05-20 22:04:11 +0200
committermh <mh@immerda.ch>2013-05-20 22:04:11 +0200
commit7efe3fd46d97ad1a3be52e4b642f51bace5ac35e (patch)
tree0319a90c3669064f5da6ffc1122639fb1601885f /manifests/master
parentd2852466f2961f9af46057f9410b5d96457337f8 (diff)
correct naming
Diffstat (limited to 'manifests/master')
-rw-r--r--manifests/master/dashboard.pp14
1 files changed, 7 insertions, 7 deletions
diff --git a/manifests/master/dashboard.pp b/manifests/master/dashboard.pp
index 16d796e..951ece2 100644
--- a/manifests/master/dashboard.pp
+++ b/manifests/master/dashboard.pp
@@ -10,14 +10,14 @@ class puppet::master::dashboard(
'dashboard':
password => $mysql_password;
} -> file{
- '/usr/share/puppet-dashboard/config/database.yaml':
- content => template('puppet/master/dashboard/database.yaml.erb'),
- owner => 'puppet-dashboard',
+ '/usr/share/puppet-dashboard/config/database.yml':
+ content => template('puppet/master/dashboard/database.yml.erb'),
+ owner => root,
group => 'puppet-dashboard',
mode => '0640';
- '/usr/share/puppet-dashboard/config/settings.yaml':
- content => template('puppet/master/dashboard/settings.yaml.erb'),
- owner => 'puppet-dashboard',
+ '/usr/share/puppet-dashboard/config/settings.yml':
+ content => template('puppet/master/dashboard/settings.yml.erb'),
+ owner => root,
group => 'puppet-dashboard',
mode => '0640';
} ~> exec{
@@ -36,7 +36,7 @@ class puppet::master::dashboard(
Service['puppet-dashboard']{
ensure => running,
enable => true,
- subscribe => File['/usr/share/puppet-dashboard/config/database.yaml','/usr/share/puppet-dashboard/config/settings.yaml'],
+ subscribe => File['/usr/share/puppet-dashboard/config/database.yml','/usr/share/puppet-dashboard/config/settings.yml'],
}
} else {
Service['puppet-dashboard']{