Variable check and README update

diff --git a/README b/README
index 5274e38892d1ad9c8596b7d0cf535f09145957d5..3c607795d826b9ec059c5c5724537d4af385139f 100644 (file)
--- a/README
+++ b/README
@@ -1,8 +1,6 @@
 Puppet module for Drupal
 ========================
 
-This module has the following dependencies available at git.sarava.org that
-should be included before puppet-drupal:
+This module needs puppet-pear (available at git.sarava.org) to be included
+before puppet-drupal.
 
-  - puppet-apache
-  - puppet-pear

diff --git a/manifests/init.pp b/manifests/init.pp
index 1a8334a1dbc31293ab25239e8e7ea3b9251c8eb8..dcfaa7fda5a3db112d255107863e7ec93e1fc224 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,4 +1,9 @@
 class drupal inherits pear {
+
+  case $apache_www_folder {
+    '': { fail("you need to define \$apache_www_folder for drupal module") }
+  }
+
   # We use drupal source from upstream 
   package { "drupal6":
       ensure => absent,