aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-02-04 13:08:32 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-02-04 13:08:32 -0200
commitacc55e960f4613a1c403d9427b4981f517d44d15 (patch)
treeaabe709ec16bd0b7e47f2445babe48f754934025
parent0e28b997af94d6979851d4bdb1aa2c7e9cf2f917 (diff)
downloadpuppet-nodo-acc55e960f4613a1c403d9427b4981f517d44d15.tar.gz
puppet-nodo-acc55e960f4613a1c403d9427b4981f517d44d15.tar.bz2
Adding websites::dev
-rw-r--r--manifests/desktop.pp2
-rw-r--r--manifests/laptop.pp2
-rw-r--r--manifests/subsystems/websites.pp6
3 files changed, 8 insertions, 2 deletions
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
+}