Rollback from stages

diff --git a/manifests/init.pp b/manifests/init.pp
index 716d0ab7b11b45247f7e4fec286405321fec660c..fc712906ae187529e9d1b3b5a86d1c0ed34251fc 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -2,10 +2,6 @@
 # Nodo module.
 #
 
-# Stage definitions
-stage { 'nodo_setup': before  => Stage['main'] }
-stage { 'nodo_ready': require => Stage['main'] }
-
 # Import required modules
 import "common"
 import "sshd"

diff --git a/manifests/web.pp b/manifests/web.pp
index 8583921bd65427f6e6d89b667f1cab181854f252..caf031a73154fa078f0f0afd97aa5a08562f3589 100644 (file)
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -1,12 +1,9 @@
 class nodo::web inherits nodo::vserver {
   # Class for web nodes
-
-  class {
-    'websites':       stage => nodo_ready;
-    'database':       stage => nodo_setup;
-    'users::virtual': stage => main;
-    'utils::web':     stage => main;
-  }
+  include websites
+  include database
+  include users::virtual
+  include utils::web
 
   # Reprepro configuration
   $reprepro_basedir = '/var/reprepro'