adding template path

diff --git a/manifests/config.pp b/manifests/config.pp
index 52dcb507962d0975aeb6b1d66992ede6550aec90..bc637f8d2c064ea4ad7db66a2dc60248c675ae05 100644 (file)
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -5,5 +5,6 @@ $first_user_password = "userpass"
 $first_user_sshkey = "usersshkey"
 $first_user_email = "usermail"
 
+$puppet_bootstrap_tmpdir = "/tmp/puppet-bootstrap"
 $puppet_dir = "/var/local/puppet"
 $default_puppet_conf_dir = "$puppet_dir/default-conf"

diff --git a/manifests/default-conf.pp b/manifests/default-conf.pp
index 70e32f786e9955322d54dedcf1cdce28cb549e92..105bc748bf7f815b166c6698d9d03706ae4380f9 100644 (file)
--- a/manifests/default-conf.pp
+++ b/manifests/default-conf.pp
@@ -22,7 +22,7 @@ file { "/usr/local/sbin/puppet-bootstrap":
   mode    => 0755,
   ensure  => present,
   require => Package["puppet"],
-  content => template("bin/puppet-bootstrap"),
+  content => template("$puppet_bootstrap_tmpdir/bin/puppet-bootstrap"),
 }
 
 # execute the bootstrap script to download puppet modules
@@ -62,7 +62,7 @@ file { "$default_puppet_conf_dir/puppet.conf":
   group   => "puppet",
   mode    => 0644,
   require => Package["puppet"],
-  content => template("puppet/puppet.conf.erb"),
+  content => template("$puppet_bootstrap_tmpdir/puppet/puppet.conf.erb"),
 }
 
 file { "$default_puppet_conf_dir/fileserver.conf":
@@ -71,7 +71,7 @@ file { "$default_puppet_conf_dir/fileserver.conf":
   group   => "puppet",
   mode    => 0644,
   require => Package["puppet"],
-  content => template("puppet/fileserver.conf.erb"),
+  content => template("$puppet_bootstrap_tmpdir/puppet/fileserver.conf.erb"),
 }
 
 file { "$default_puppet_conf_dir/auth.conf":
@@ -80,7 +80,7 @@ file { "$default_puppet_conf_dir/auth.conf":
   group   => "puppet",
   mode    => 0644,
   require => Package["puppet"],
-  content => template("puppet/auth.conf.erb"),
+  content => template("$puppet_bootstrap_tmpdir/puppet/auth.conf.erb"),
 }
 
 # files in $default_puppet_conf_dir/manifests
@@ -90,7 +90,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/site.pp.erb"),
+  content => template("$puppet_bootstrap_tmpdir/puppet/site.pp.erb"),
 }
 
 file { "$default_puppet_conf_dir/manifests/modules.pp":
@@ -99,7 +99,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/modules.pp.erb"),
+  content => template("$puppet_bootstrap_tmpdir/puppet/modules.pp.erb"),
 }
 
 file { "$default_puppet_conf_dir/manifests/nodes.pp":
@@ -108,7 +108,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/nodes.pp.erb"),
+  content => template("$puppet_bootstrap_tmpdir/puppet/nodes.pp.erb"),
 }
 
 # files in $default_puppet_conf_dir/manifests/classes
@@ -118,7 +118,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/websites.pp.erb"),
+  content => template("$puppet_bootstrap_tmpdir/puppet/websites.pp.erb"),
 }
 
 file { "$default_puppet_conf_dir/manifests/classes/users.pp":
@@ -127,7 +127,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/users.pp.erb"),
+  content => template("$puppet_bootstrap_tmpdir/puppet/users.pp.erb"),
 }
 
 # files in $default_puppet_conf_dir/manifests/nodes
@@ -137,7 +137,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/server.pp.erb"),
+  content => template("$puppet_bootstrap_tmpdir/puppet/server.pp.erb"),
 }
 
 file { "$default_puppet_conf_dir/manifests/nodes/$hostname-master.pp":
@@ -146,7 +146,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/master.pp.erb"),
+  content => template("$puppet_bootstrap_tmpdir/puppet/master.pp.erb"),
 }
 
 file { "$default_puppet_conf_dir/manifests/nodes/$hostname-proxy.pp":
@@ -155,7 +155,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/proxy.pp.erb"),
+  content => template("$puppet_bootstrap_tmpdir/puppet/proxy.pp.erb"),
 }
 
 file { "$default_puppet_conf_dir/manifests/nodes/$hostname-web.pp":
@@ -164,7 +164,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/web.pp.erb"),
+  content => template("$puppet_bootstrap_tmpdir/puppet/web.pp.erb"),
 }
 
 file { "$default_puppet_conf_dir/manifests/nodes/$hostname-storage.pp":
@@ -173,7 +173,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/storage.pp.erb"),
+  content => template("$puppet_bootstrap_tmpdir/puppet/storage.pp.erb"),
 }
 
 file { "$default_puppet_conf_dir/manifests/nodes/$hostname-test.pp":
@@ -182,7 +182,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/test.pp.erb"),
+  content => template("$puppet_bootstrap_tmpdir/puppet/test.pp.erb"),
 }
 
 
@@ -211,7 +211,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("files/apache/htdocs/images/README.html"),
+  content => template("$puppet_bootstrap_tmpdir/files/apache/htdocs/images/README.html"),
 }
 
 file { "$default_puppet_conf_dir/files/apache/htdocs/index.html":
@@ -220,7 +220,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("apache/htdocs/index.html.erb"),
+  content => template("$puppet_bootstrap_tmpdir/apache/htdocs/index.html.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/apache/htdocs/missing.html":
@@ -229,7 +229,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("apache/htdocs/missing.html.erb"),
+  content => template("$puppet_bootstrap_tmpdir/apache/htdocs/missing.html.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/apache/vhosts/git":
@@ -238,7 +238,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("apache/vhosts/git.erb"),
+  content => template("$puppet_bootstrap_tmpdir/apache/vhosts/git.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/apache/vhosts/lists":
@@ -247,7 +247,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("apache/vhosts/lists.erb"),
+  content => template("$puppet_bootstrap_tmpdir/apache/vhosts/lists.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/apache/vhosts/mail":
@@ -256,7 +256,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("apache/vhosts/mail.erb"),
+  content => template("$puppet_bootstrap_tmpdir/apache/vhosts/mail.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/apache/vhosts/nagios":
@@ -265,7 +265,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("apache/vhosts/nagios.erb"),
+  content => template("$puppet_bootstrap_tmpdir/apache/vhosts/nagios.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/apache/vhosts/wiki":
@@ -274,7 +274,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("apache/vhosts/wiki.erb"),
+  content => template("$puppet_bootstrap_tmpdir/apache/vhosts/wiki.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/etc/aliases":
@@ -283,7 +283,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("etc/aliases.erb"),
+  content => template("$puppet_bootstrap_tmpdir/etc/aliases.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/etc/nagios3/htpasswd.users":
@@ -292,7 +292,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("etc/nagios3/htpasswd.users.erb"),
+  content => template("$puppet_bootstrap_tmpdir/etc/nagios3/htpasswd.users.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/etc/nginx/$domain":
@@ -301,7 +301,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("etc/nginx/domain.erb"),
+  content => template("$puppet_bootstrap_tmpdir/etc/nginx/domain.erb"),
 }
 
 file { "$default_puppet_conf_dir/files/postfix/tls_policy":
@@ -310,5 +310,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("postfix/tls_policy.erb"),
+  content => template("$puppet_bootstrap_tmpdir/postfix/tls_policy.erb"),
 }