fixing paths again

diff --git a/manifests/default-conf.pp b/manifests/default-conf.pp
index 105bc748bf7f815b166c6698d9d03706ae4380f9..73c95947438fef011132a5ee5cf1736844f924bb 100644 (file)
--- a/manifests/default-conf.pp
+++ b/manifests/default-conf.pp
@@ -1,5 +1,7 @@
 import "config.pp"
 
+$templates_dir = "$puppet_bootstrap_tmpdir/templates"
+
 # puppet config
 package { [ "puppet", "puppetmaster" ]: ensure => installed, }
 
@@ -22,7 +24,7 @@ file { "/usr/local/sbin/puppet-bootstrap":
   mode    => 0755,
   ensure  => present,
   require => Package["puppet"],
-  content => template("$puppet_bootstrap_tmpdir/bin/puppet-bootstrap"),
+  content => template("$templates_dir/bin/puppet-bootstrap"),
 }
 
 # execute the bootstrap script to download puppet modules
@@ -62,7 +64,7 @@ file { "$default_puppet_conf_dir/puppet.conf":
   group   => "puppet",
   mode    => 0644,
   require => Package["puppet"],
-  content => template("$puppet_bootstrap_tmpdir/puppet/puppet.conf.erb"),
+  content => template("$templates_dir/puppet/puppet.conf.erb"),
 }
 
 file { "$default_puppet_conf_dir/fileserver.conf":
@@ -71,7 +73,7 @@ file { "$default_puppet_conf_dir/fileserver.conf":
   group   => "puppet",
   mode    => 0644,
   require => Package["puppet"],
-  content => template("$puppet_bootstrap_tmpdir/puppet/fileserver.conf.erb"),
+  content => template("$templates_dir/puppet/fileserver.conf.erb"),
 }
 
 file { "$default_puppet_conf_dir/auth.conf":
@@ -80,7 +82,7 @@ file { "$default_puppet_conf_dir/auth.conf":
   group   => "puppet",
   mode    => 0644,
   require => Package["puppet"],
-  content => template("$puppet_bootstrap_tmpdir/puppet/auth.conf.erb"),
+  content => template("$templates_dir/puppet/auth.conf.erb"),
 }
 
 # files in $default_puppet_conf_dir/manifests
@@ -90,7 +92,7 @@ file { "$default_puppet_conf_dir/manifests/site.pp":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests"] ],
-  content => template("$puppet_bootstrap_tmpdir/puppet/site.pp.erb"),
+  content => template("$templates_dir/puppet/site.pp.erb"),
 }
 
 file { "$default_puppet_conf_dir/manifests/modules.pp":
@@ -99,7 +101,7 @@ file { "$default_puppet_conf_dir/manifests/modules.pp":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests"] ],
-  content => template("$puppet_bootstrap_tmpdir/puppet/modules.pp.erb"),
+  content => template("$templates_dir/puppet/modules.pp.erb"),
 }
 
 file { "$default_puppet_conf_dir/manifests/nodes.pp":
@@ -108,7 +110,7 @@ file { "$default_puppet_conf_dir/manifests/nodes.pp":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests"] ],
-  content => template("$puppet_bootstrap_tmpdir/puppet/nodes.pp.erb"),
+  content => template("$templates_dir/puppet/nodes.pp.erb"),
 }
 
 # files in $default_puppet_conf_dir/manifests/classes
@@ -118,7 +120,7 @@ file { "$default_puppet_conf_dir/manifests/classes/websites.pp":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests/classes"] ],
-  content => template("$puppet_bootstrap_tmpdir/puppet/websites.pp.erb"),
+  content => template("$templates_dir/puppet/websites.pp.erb"),
 }
 
 file { "$default_puppet_conf_dir/manifests/classes/users.pp":
@@ -127,7 +129,7 @@ file { "$default_puppet_conf_dir/manifests/classes/users.pp":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests/classes"] ],
-  content => template("$puppet_bootstrap_tmpdir/puppet/users.pp.erb"),
+  content => template("$templates_dir/puppet/users.pp.erb"),
 }
 
 # files in $default_puppet_conf_dir/manifests/nodes
@@ -137,7 +139,7 @@ file { "$default_puppet_conf_dir/manifests/nodes/$hostname-server.pp":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests/nodes"] ],
-  content => template("$puppet_bootstrap_tmpdir/puppet/server.pp.erb"),
+  content => template("$templates_dir/puppet/server.pp.erb"),
 }
 
 file { "$default_puppet_conf_dir/manifests/nodes/$hostname-master.pp":
@@ -146,7 +148,7 @@ file { "$default_puppet_conf_dir/manifests/nodes/$hostname-master.pp":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests/nodes"] ],
-  content => template("$puppet_bootstrap_tmpdir/puppet/master.pp.erb"),
+  content => template("$templates_dir/puppet/master.pp.erb"),
 }
 
 file { "$default_puppet_conf_dir/manifests/nodes/$hostname-proxy.pp":
@@ -155,7 +157,7 @@ file { "$default_puppet_conf_dir/manifests/nodes/$hostname-proxy.pp":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests/nodes"] ],
-  content => template("$puppet_bootstrap_tmpdir/puppet/proxy.pp.erb"),
+  content => template("$templates_dir/puppet/proxy.pp.erb"),
 }
 
 file { "$default_puppet_conf_dir/manifests/nodes/$hostname-web.pp":
@@ -164,7 +166,7 @@ file { "$default_puppet_conf_dir/manifests/nodes/$hostname-web.pp":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests/nodes"] ],
-  content => template("$puppet_bootstrap_tmpdir/puppet/web.pp.erb"),
+  content => template("$templates_dir/puppet/web.pp.erb"),
 }
 
 file { "$default_puppet_conf_dir/manifests/nodes/$hostname-storage.pp":
@@ -173,7 +175,7 @@ file { "$default_puppet_conf_dir/manifests/nodes/$hostname-storage.pp":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests/nodes"] ],
-  content => template("$puppet_bootstrap_tmpdir/puppet/storage.pp.erb"),
+  content => template("$templates_dir/puppet/storage.pp.erb"),
 }
 
 file { "$default_puppet_conf_dir/manifests/nodes/$hostname-test.pp":
@@ -182,7 +184,7 @@ file { "$default_puppet_conf_dir/manifests/nodes/$hostname-test.pp":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests/nodes"] ],
-  content => template("$puppet_bootstrap_tmpdir/puppet/test.pp.erb"),
+  content => template("$templates_dir/puppet/test.pp.erb"),
 }
 
 
@@ -211,7 +213,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("$puppet_bootstrap_tmpdir/files/apache/htdocs/images/README.html"),
+  content => template("$templates_dir/files/apache/htdocs/images/README.html"),
 }
 
 file { "$default_puppet_conf_dir/files/apache/htdocs/index.html":
@@ -220,7 +222,7 @@ file { "$default_puppet_conf_dir/files/apache/htdocs/index.html":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/files/apache/htdocs"] ],
-  content => template("$puppet_bootstrap_tmpdir/apache/htdocs/index.html.erb"),
+  content => template("$templates_dir/apache/htdocs/index.html.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/apache/htdocs/missing.html":
@@ -229,7 +231,7 @@ file { "$default_puppet_conf_dir/files/apache/htdocs/missing.html":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/files/apache/htdocs"] ],
-  content => template("$puppet_bootstrap_tmpdir/apache/htdocs/missing.html.erb"),
+  content => template("$templates_dir/apache/htdocs/missing.html.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/apache/vhosts/git":
@@ -238,7 +240,7 @@ file { "$default_puppet_conf_dir/files/apache/vhosts/git":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/files/apache/vhosts"] ],
-  content => template("$puppet_bootstrap_tmpdir/apache/vhosts/git.erb"),
+  content => template("$templates_dir/apache/vhosts/git.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/apache/vhosts/lists":
@@ -247,7 +249,7 @@ file { "$default_puppet_conf_dir/files/apache/vhosts/lists":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/files/apache/vhosts"] ],
-  content => template("$puppet_bootstrap_tmpdir/apache/vhosts/lists.erb"),
+  content => template("$templates_dir/apache/vhosts/lists.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/apache/vhosts/mail":
@@ -256,7 +258,7 @@ file { "$default_puppet_conf_dir/files/apache/vhosts/mail":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/files/apache/vhosts"] ],
-  content => template("$puppet_bootstrap_tmpdir/apache/vhosts/mail.erb"),
+  content => template("$templates_dir/apache/vhosts/mail.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/apache/vhosts/nagios":
@@ -265,7 +267,7 @@ file { "$default_puppet_conf_dir/files/apache/vhosts/nagios":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/files/apache/vhosts"] ],
-  content => template("$puppet_bootstrap_tmpdir/apache/vhosts/nagios.erb"),
+  content => template("$templates_dir/apache/vhosts/nagios.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/apache/vhosts/wiki":
@@ -274,7 +276,7 @@ file { "$default_puppet_conf_dir/files/apache/vhosts/wiki":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/files/apache/vhosts"] ],
-  content => template("$puppet_bootstrap_tmpdir/apache/vhosts/wiki.erb"),
+  content => template("$templates_dir/apache/vhosts/wiki.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/etc/aliases":
@@ -283,7 +285,7 @@ file { "$default_puppet_conf_dir/files/etc/aliases":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/files/etc"] ],
-  content => template("$puppet_bootstrap_tmpdir/etc/aliases.erb"),
+  content => template("$templates_dir/etc/aliases.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/etc/nagios3/htpasswd.users":
@@ -292,7 +294,7 @@ file { "$default_puppet_conf_dir/files/etc/nagios3/htpasswd.users":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/files/etc/nagios3.users"] ],
-  content => template("$puppet_bootstrap_tmpdir/etc/nagios3/htpasswd.users.erb"),
+  content => template("$templates_dir/etc/nagios3/htpasswd.users.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/etc/nginx/$domain":
@@ -301,7 +303,7 @@ file { "$default_puppet_conf_dir/files/etc/nginx/$domain":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/files/etc/nginx"] ],
-  content => template("$puppet_bootstrap_tmpdir/etc/nginx/domain.erb"),
+  content => template("$templates_dir/etc/nginx/domain.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/postfix/tls_policy":
@@ -310,5 +312,5 @@ file { "$default_puppet_conf_dir/files/postfix/tls_policy":
   group   => "puppet",
   mode    => 0644,
   require => [ Package["puppet"], File["$default_puppet_conf_dir/files/postfix"] ],
-  content => template("$puppet_bootstrap_tmpdir/postfix/tls_policy.erb"),
+  content => template("$templates_dir/postfix/tls_policy.erb"),
 }