Moving out require parameter from site definition

diff --git a/manifests/init.pp b/manifests/init.pp
index cd220da7811cc07e933e9483eb735356c940d773..b944e07da4c6f9bb0b18bd124e31476c6a6cd77e 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -75,7 +75,7 @@ class apache {
 
   # TODO: ensure folders exist with right modes and ownership
   define site($ensure = present, $docroot = false, $redirect = false,
-                 $protocol = 'http', $server_alias = false, $use = false) {
+              $protocol = 'http', $server_alias = false, $use = false) {
     file { "${apache2_sites}-available/$title":
       ensure  => $ensure,
       content => template('apache/website.erb'),
@@ -106,7 +106,6 @@ class apache {
           unless  => "/bin/sh -c '[ -L ${apache2_sites}-enabled/$name ] \
                   && [ ${apache2_sites}-enabled/$name -ef ${apache2_sites}-available/$name ]'",
           notify  => Exec["reload-apache2"],
-          require => Package[$require],
         }
       }
       'absent': {
@@ -114,7 +113,6 @@ class apache {
           onlyif  => "/bin/sh -c '[ -L ${apache2_sites}-enabled/$name ] \
                   && [ ${apache2_sites}-enabled/$name -ef ${apache2_sites}-available/$name ]'",
           notify  => Exec["reload-apache2"],
-          require => Package["apache2"],
         }
       }
       default: { err ("Unknown ensure value: '$ensure'") }