define apache2::site (
$source=undef,
- $content=false,
+ $content=undef,
$ensure=present,
$site=undef
) {
$link_target = $ensure ? {
present => $target,
- absent => absent,
- default => fail ( "Unknown ensure value: '$ensure'" ),
+ absent => absent
}
if $content {
ensure => $ensure,
content => $content,
require => Package['apache2'],
- notify => Service['apache2'],
+ notify => Exec['service apache2 reload'],
}
} else {
file { $target:
ensure => $ensure,
source => $source,
require => Package['apache2'],
- notify => Service['apache2'],
+ notify => Exec['service apache2 reload'],
}
}
- if $ensure == present {
+ if $::lsbmajdistrelease <= 7 {
+ $symlink = "/etc/apache2/sites-enabled/${name}"
+ } else {
+ $symlink = "/etc/apache2/sites-enabled/${name}.conf"
+
file { "/etc/apache2/sites-enabled/${name}":
+ ensure => absent,
+ notify => Exec['service apache2 reload'],
+ }
+ }
+
+ if $ensure == present {
+ file { $symlink:
ensure => link,
target => $link_target,
- notify => Service['apache2'],
+ notify => Exec['service apache2 reload'],
}
} else {
- file { "/etc/apache2/sites-enabled/${name}":
+ file { $symlink:
ensure => absent,
- notify => Service['apache2'],
+ notify => Exec['service apache2 reload'],
}
}
}