aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-07-12 23:26:28 -0300
committerSilvio Rhatto <rhatto@riseup.net>2012-07-12 23:26:28 -0300
commitfa61b858c0d442b9b61eef546bc59d09ae61e385 (patch)
tree456339b7cbb58e8fc221d38aef76d1a0f91cbeed
parent6486d55aaed84a29b9a6231eae6e5a7c6b5e9027 (diff)
downloadpuppet-nodo-fa61b858c0d442b9b61eef546bc59d09ae61e385.tar.gz
puppet-nodo-fa61b858c0d442b9b61eef546bc59d09ae61e385.tar.bz2
Rollback from stages
-rw-r--r--manifests/init.pp4
-rw-r--r--manifests/web.pp11
2 files changed, 4 insertions, 11 deletions
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'