More changes for puppet 3.x

4 files changed, 1 insertions, 49 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
diff --git a/manifests/classes/websites.pp b/manifests/classes/websites.pp
deleted file mode 100644
index a53d507..0000000
--- a/manifests/classes/websites.pp
+++ /dev/null
@@ -1,42 +0,0 @@
-class websites::admin inherits websites::hosting::admin {
-  # An administrative Trac instance
-  #apache::site { "admin":
-  #  docroot        => "${apache::sites_folder}/admin/trac/htdocs",
-  #  use            => [ "Trac admin" ],
-  #  redirect_match => "trac",
-  #  mpm            => false,
-  #  tag            => 'all',
-  #}
-
-  apache::site { "munin":
-    docroot        => '/var/www/munin',
-    owner          => "munin",
-    group          => "munin",
-    mpm            => false,
-    tag            => 'all',
-  }
-
-  apache::site { "nagios":
-    source         => true,
-    docroot        => '/usr/share/nagios3/htdocs',
-    mpm            => false,
-    tag            => 'all',
-  }
-}
-
-class websites inherits websites::hosting {
-  # Website definitions: always use tagged resources
-
-  #apache::site { "site":
-  #  source         => true,
-  #  ticket         => '001',
-  #  docroot        => '/var/www/site',
-  #  tag            => 'all',
-  #}
-
-  #database::instance { "site":
-  #  password => 'xxx',
-  #  tag      => 'all',
-  #}
-
-}