From fa61b858c0d442b9b61eef546bc59d09ae61e385 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 12 Jul 2012 23:26:28 -0300 Subject: Rollback from stages --- manifests/init.pp | 4 ---- manifests/web.pp | 11 ++++------- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'manifests') 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' -- cgit v1.2.3