diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/default-conf.pp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/manifests/default-conf.pp b/manifests/default-conf.pp index 73c9594..9c6cd71 100644 --- a/manifests/default-conf.pp +++ b/manifests/default-conf.pp @@ -35,7 +35,7 @@ exec { "/usr/local/sbin/puppet-bootstrap add-submodules": } # directories -file { "$default_puppet_conf_dir": +file { ["$puppet_dir", "$default_puppet_conf_dir"]: ensure => directory, owner => "puppet", group => "puppet", @@ -189,8 +189,7 @@ file { "$default_puppet_conf_dir/manifests/nodes/$hostname-test.pp": # files in $default_puppet_conf_dir/files -file { [ "$default_puppet_conf_dir/files", - "$default_puppet_conf_dir/files/etc", +file { [ "$default_puppet_conf_dir/files/etc", "$default_puppet_conf_dir/files/etc/nginx", "$default_puppet_conf_dir/files/etc/nagios3", "$default_puppet_conf_dir/files/postfix", @@ -213,7 +212,7 @@ file { "$default_puppet_conf_dir/files/apache/htdocs/images/README.html": group => "puppet", mode => 0644, require => [ Package["puppet"], File["$default_puppet_conf_dir/files/apache/htdocs/images"] ], - content => template("$templates_dir/files/apache/htdocs/images/README.html"), + content => template("$templates_dir/apache/htdocs/images/README.html.erb"), } file { "$default_puppet_conf_dir/files/apache/htdocs/index.html": @@ -293,7 +292,7 @@ file { "$default_puppet_conf_dir/files/etc/nagios3/htpasswd.users": owner => "puppet", group => "puppet", mode => 0644, - require => [ Package["puppet"], File["$default_puppet_conf_dir/files/etc/nagios3.users"] ], + require => [ Package["puppet"], File["$default_puppet_conf_dir/files/etc/nagios3"] ], content => template("$templates_dir/etc/nagios3/htpasswd.users.erb"), } |