]> gitweb.fluxo.info Git - puppet-apache.git/commitdiff
Minor change
authorSilvio Rhatto <rhatto@riseup.net>
Sun, 8 Nov 2009 15:59:55 +0000 (13:59 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Sun, 8 Nov 2009 15:59:55 +0000 (13:59 -0200)
manifests/init.pp

index f8dd454f364481610f58a6be6980eb9718dc84ff..202a753d7e26a482f41179a49e6b82f7886c2b80 100644 (file)
@@ -103,11 +103,6 @@ class apache {
 
     case $ensure {
       'present': {
-        exec { "/usr/sbin/a2ensite $name":
-          unless  => "/bin/sh -c '[ -L ${apache2_sites}-enabled/$name ] \
-                  && [ ${apache2_sites}-enabled/$name -ef ${apache2_sites}-available/$name ]'",
-          notify  => Exec["reload-apache2"],
-        }
         if !defined(File["${docroot}"]) {
           file { "${docroot}":
             ensure => directory,
@@ -116,6 +111,11 @@ class apache {
             mode   => 0755,
           }
         }
+        exec { "/usr/sbin/a2ensite $name":
+          unless  => "/bin/sh -c '[ -L ${apache2_sites}-enabled/$name ] \
+                  && [ ${apache2_sites}-enabled/$name -ef ${apache2_sites}-available/$name ]'",
+          notify  => Exec["reload-apache2"],
+        }
       }
       'absent': {
         exec { "/usr/sbin/a2dissite $name":