aboutsummaryrefslogtreecommitdiff
path: root/manifests/bootstrap
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/bootstrap')
-rw-r--r--manifests/bootstrap/configurator.pp2
-rw-r--r--manifests/bootstrap/host.pp3
-rw-r--r--manifests/bootstrap/master.pp3
3 files changed, 1 insertions, 7 deletions
diff --git a/manifests/bootstrap/configurator.pp b/manifests/bootstrap/configurator.pp
index d93a0ce..edcbe92 100644
--- a/manifests/bootstrap/configurator.pp
+++ b/manifests/bootstrap/configurator.pp
@@ -74,7 +74,7 @@ file { "$bootstrap_path/auth.conf":
#
# Basic users
#
-file { "$bootstrap_path/manifests/classes/users.pp":
+file { "$bootstrap_path/modules/site_users/manifests/init.pp":
ensure => present,
mode => 0644,
content => template("$templates/puppet/users.pp.erb"),
diff --git a/manifests/bootstrap/host.pp b/manifests/bootstrap/host.pp
index c1aead8..c403eea 100644
--- a/manifests/bootstrap/host.pp
+++ b/manifests/bootstrap/host.pp
@@ -4,9 +4,6 @@
# virtual machine.
#
-# Import site configuration
-import "../site.pp"
-
# The server role
include nodo::role::server
diff --git a/manifests/bootstrap/master.pp b/manifests/bootstrap/master.pp
index 51167f3..73c075c 100644
--- a/manifests/bootstrap/master.pp
+++ b/manifests/bootstrap/master.pp
@@ -5,8 +5,5 @@
# Once it's running it can setup all the other nodes.
#
-# Import site configuration
-import "../site.pp"
-
# Include the master node configuration
include nodo::role::master