From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 4 Feb 2011 15:08:32 +0000 (-0200)
Subject: Adding websites::dev
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=acc55e960f4613a1c403d9427b4981f517d44d15;p=puppet-nodo.git

Adding websites::dev
---

diff --git a/manifests/desktop.pp b/manifests/desktop.pp
index b6996a7..a8c5e19 100644
--- a/manifests/desktop.pp
+++ b/manifests/desktop.pp
@@ -41,7 +41,7 @@ class nodo::desktop::minimal {
 }
 
 class nodo::desktop::webdev inherits nodo::desktop {
-  include websites
+  include websites::dev
   include database
   include utils::web
 
diff --git a/manifests/laptop.pp b/manifests/laptop.pp
index afd7afd..6c8177b 100644
--- a/manifests/laptop.pp
+++ b/manifests/laptop.pp
@@ -28,7 +28,7 @@ class nodo::laptop inherits nodo::personal {
 }
 
 class nodo::laptop::webdev inherits nodo::laptop {
-  include websites
+  include websites::dev
   include database
   include utils::web
 
diff --git a/manifests/subsystems/websites.pp b/manifests/subsystems/websites.pp
index 6a89ae7..0e28747 100644
--- a/manifests/subsystems/websites.pp
+++ b/manifests/subsystems/websites.pp
@@ -137,3 +137,9 @@ class websites::hosting::admin inherits websites::setup {
   include trac
   include gitweb
 }
+
+class websites::dev inherits websites::setup {
+  # Include the needed classes for website development
+  include php
+  include drupal
+}