From 9674b5ef59d3a52a1058c9cfd02ee1ea22c8ce17 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 23 Sep 2016 21:51:17 +0200 Subject: [PATCH] Dedicated block for absent case --- modules/apache2/manifests/config.pp | 39 ++++++++++++++++------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/modules/apache2/manifests/config.pp b/modules/apache2/manifests/config.pp index 59c14df31..0bb6a6e49 100644 --- a/modules/apache2/manifests/config.pp +++ b/modules/apache2/manifests/config.pp @@ -11,27 +11,32 @@ define apache2::config ( if ! ($source or $content) { fail ( "No configuration found for ${name}" ) } - } - absent: {} - default: { fail ( "Unknown ensure value: '$ensure'" ) } - } - if $content { - file { "/etc/apache2/conf-available/${name}.conf": - ensure => $ensure, - content => $content, - require => Package['apache2'], - notify => Exec['service apache2 reload'], + if $content { + file { "/etc/apache2/conf-available/${name}.conf": + ensure => $ensure, + content => $content, + require => Package['apache2'], + notify => Exec['service apache2 reload'], + } + } else { + file { "/etc/apache2/conf-available/${name}.conf": + ensure => $ensure, + source => $source, + require => Package['apache2'], + notify => Exec['service apache2 reload'], + } + } } - } else { - file { "/etc/apache2/conf-available/${name}.conf": - ensure => $ensure, - source => $source, - require => Package['apache2'], - notify => Exec['service apache2 reload'], + 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 -- 2.20.1