From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 13 Jul 2012 02:26:28 +0000 (-0300)
Subject: Rollback from stages
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=fa61b858c0d442b9b61eef546bc59d09ae61e385;p=puppet-nodo.git

Rollback from stages
---

diff --git a/manifests/init.pp b/manifests/init.pp
index 716d0ab..fc71290 100644
--- 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 8583921..caf031a 100644
--- 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'