reload apache instead of restarting it

[mirror/dsa-puppet.git] / modules / apache2 / manifests / config.pp

diff --git a/modules/apache2/manifests/config.pp b/modules/apache2/manifests/config.pp
index f44dc01..d185e42 100644 (file)
--- a/modules/apache2/manifests/config.pp
+++ b/modules/apache2/manifests/config.pp
@@ -22,14 +22,14 @@ define apache2::config (
                                ensure  => $ensure,
                                content => $content,
                                require => Package['apache2'],
-                               notify  => Service['apache2'],
+                               notify  => Exec['service apache2 reload'],
                        }
                } else {
                        file { "/etc/apache2/conf.d/${name}":
                                ensure  => $ensure,
                                source  => $source,
                                require => Package['apache2'],
-                               notify  => Service['apache2'],
+                               notify  => Exec['service apache2 reload'],
                        }
                }
        } else {
@@ -38,26 +38,26 @@ define apache2::config (
                                ensure  => $ensure,
                                content => $content,
                                require => Package['apache2'],
-                               notify  => Service['apache2'],
+                               notify  => Exec['service apache2 reload'],
                        }
                } else {
                        file { "/etc/apache2/conf-available/${name}.conf":
                                ensure  => $ensure,
                                source  => $source,
                                require => Package['apache2'],
-                               notify  => Service['apache2'],
+                               notify  => Exec['service apache2 reload'],
                        }
                }
 
-               $link_ensure = $ensure == present ? {
-                       present => 'link',
-                       absent  => 'absent'
+               $link_ensure = $ensure ? {
+                       present => link,
+                       absent  => absent
                }
 
-               file { "/etc/apache2/conf-enabled/${name}":
+               file { "/etc/apache2/conf-enabled/${name}.conf":
                        ensure => $link_ensure,
-                       target => "/etc/apache2/conf-available/${base}.conf",
-                       notify => Service['apache2'],
+                       target => "../conf-available/${name}.conf",
+                       notify  => Exec['service apache2 reload'],
                }
        }
 }