First attempt at making apache conf stuff work on jessie

diff --git a/modules/apache2/manifests/config.pp b/modules/apache2/manifests/config.pp
index 9a11115012d3e6aa70bfaa1e5d18962d37d103a4..f44dc019f11f52ada0d5b0c40d51e0e2b34844d1 100644 (file)
--- a/modules/apache2/manifests/config.pp
+++ b/modules/apache2/manifests/config.pp
@@ -16,19 +16,48 @@ define apache2::config (
                default: { fail ( "Unknown ensure value: '$ensure'" ) }
        }
 
-       if $content {
-               file { "/etc/apache2/conf.d/${name}":
-                       ensure  => $ensure,
-                       content => $content,
-                       require => Package['apache2'],
-                       notify  => Service['apache2'],
+       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'],
+                       }
                }
        } 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  => Service['apache2'],
+                       }
+               } else {
+                       file { "/etc/apache2/conf-available/${name}.conf":
+                               ensure  => $ensure,
+                               source  => $source,
+                               require => Package['apache2'],
+                               notify  => Service['apache2'],
+                       }
+               }
+
+               $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'],
                }
        }
 }