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