puppet 4 foo

[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..13697cb 100644 (file)
--- a/modules/apache2/manifests/config.pp
+++ b/modules/apache2/manifests/config.pp
@@ -1,6 +1,7 @@
 define apache2::config (
        $source=undef,
        $content=undef,
+       $nocontentok=undef,
        $ensure=present
 ) {
 
@@ -8,56 +9,43 @@ define apache2::config (
 
        case $ensure {
                present: {
-                       if ! ($source or $content) {
+                       if ! ($source or $content or $nocontentok) {
                                fail ( "No configuration found for ${name}" )
                        }
-               }
-               absent:  {}
-               default: { fail ( "Unknown ensure value: '$ensure'" ) }
-       }
 
-       if $::lsbmajdistrelease <= 7 {
-               if $content {
-                       file { "/etc/apache2/conf.d/${name}":
-                               ensure  => $ensure,
-                               content => $content,
-                               require => Package['apache2'],
-                               notify  => Service['apache2'],
-                       }
-               } else {
-                       file { "/etc/apache2/conf.d/${name}":
-                               ensure  => $ensure,
-                               source  => $source,
-                               require => Package['apache2'],
-                               notify  => Service['apache2'],
+                       if $content {
+                               file { "/etc/apache2/conf-available/${name}.conf":
+                                       ensure  => $ensure,
+                                       content => $content,
+                                       require => Package['apache2'],
+                                       notify  => Exec['service apache2 reload'],
+                               }
+                       } elsif $source {
+                               file { "/etc/apache2/conf-available/${name}.conf":
+                                       ensure  => $ensure,
+                                       source  => $source,
+                                       require => Package['apache2'],
+                                       notify  => Exec['service apache2 reload'],
+                               }
                        }
                }
-       } else {
-               if $content {
-                       file { "/etc/apache2/conf-available/${name}.conf":
-                               ensure  => $ensure,
-                               content => $content,
-                               require => Package['apache2'],
-                               notify  => Service['apache2'],
-                       }
-               } else {
+               absent:  {
                        file { "/etc/apache2/conf-available/${name}.conf":
                                ensure  => $ensure,
-                               source  => $source,
                                require => Package['apache2'],
-                               notify  => Service['apache2'],
+                               notify  => Exec['service apache2 reload'],
                        }
                }
+               default: { fail ( "Unknown ensure value: '$ensure'" ) }
+       }
+       $link_ensure = $ensure ? {
+               present => link,
+               absent  => absent
+       }
 
-               $link_ensure = $ensure == present ? {
-                       present => 'link',
-                       absent  => 'absent'
-               }
-
-               file { "/etc/apache2/conf-enabled/${name}":
-                       ensure => $link_ensure,
-                       target => "/etc/apache2/conf-available/${base}.conf",
-                       notify => Service['apache2'],
-               }
+       file { "/etc/apache2/conf-enabled/${name}.conf":
+               ensure => $link_ensure,
+               target => "../conf-available/${name}.conf",
+               notify  => Exec['service apache2 reload'],
        }
 }