changing default conf generation to host-stage1

diff --git a/manifests/admin-stage1.pp b/manifests/admin-stage1.pp
index 2970516149e8b98e700279b622422ea459302d00..4aa380642e48b68c0baaaaf1e7f6ab0eab74931a 100644 (file)
--- a/manifests/admin-stage1.pp
+++ b/manifests/admin-stage1.pp
@@ -1,7 +1,6 @@
 import "config.pp"
 import "nodo"
 
-include default_conf
 include git
 
 # puppet config

diff --git a/manifests/config.pp b/manifests/config.pp
index 7e4bd8a6fba6dcecd7e206848eeddf90bca6fe93..e7db713c93d1845b7538505b945ff1bb1a0f0828 100644 (file)
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -7,7 +7,7 @@ $first_user_email = "usermail"
 
 # bootstrap dirs
 $puppet_bootstrap_tmpdir = "/tmp/puppet-bootstrap"
-$puppet_dir = "/var/local/puppet"
+$puppet_dir = "/usr/local/puppet"
 
 # minimal config for puppet-nodo first run
 Exec { path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" }

diff --git a/manifests/host-stage1.pp b/manifests/host-stage1.pp
index 9feed97052de9cfd702d0732597b98244eb1dcf4..179dda8106088ccf3af7d605724dae950e95c942 100644 (file)
--- a/manifests/host-stage1.pp
+++ b/manifests/host-stage1.pp
@@ -3,6 +3,7 @@ import "nodo"
 import "classes/admin_node.pp"
 import "classes/firewall.pp"
 import "classes/users.pp"
+import "classes/default_conf.pp"
 
 include nodo::server
 
@@ -11,3 +12,6 @@ include admin_node
 
 # creates firewall rules for administrative node's external acess
 include firewall
+
+# creates a default puppet configuration in /usr/local/puppet/default-conf
+include default_conf