Adding websites::dev

diff --git a/manifests/desktop.pp b/manifests/desktop.pp
index b6996a78cf4fc83bade9842e1190f2fd7bc7270a..a8c5e1903d9f86e08b0c64274be79087146d2d54 100644 (file)
--- 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 afd7afd138e70428a98aa3efbd10817096a2c7cb..6c8177b22ece10c0fee631b09424ce28d1d97e34 100644 (file)
--- 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 6a89ae7874351fb17e25620be25a081cc724cbca..0e28747e46193fd219b36b412ba68ce02d7336c5 100644 (file)
--- 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
+}