From 63e693f3e2b14d4fff0ea2af54bbfe1fce2cbfe2 Mon Sep 17 00:00:00 2001
From: drebs <drebs@riseup.net>
Date: Mon, 21 Mar 2011 14:36:59 -0300
Subject: changing default conf generation to host-stage1

---
 manifests/admin-stage1.pp | 1 -
 manifests/config.pp       | 2 +-
 manifests/host-stage1.pp  | 4 ++++
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'manifests')

diff --git a/manifests/admin-stage1.pp b/manifests/admin-stage1.pp
index 2970516..4aa3806 100644
--- 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 7e4bd8a..e7db713 100644
--- 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 9feed97..179dda8 100644
--- 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
-- 
cgit v1.2.3