projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove dak's sudoers entry for code signing
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
site.pp
diff --git
a/modules/apache2/manifests/site.pp
b/modules/apache2/manifests/site.pp
index
7acbfc6
..
6d5ec55
100644
(file)
--- a/
modules/apache2/manifests/site.pp
+++ b/
modules/apache2/manifests/site.pp
@@
-1,6
+1,6
@@
define apache2::site (
$source=undef,
define apache2::site (
$source=undef,
- $content=
false
,
+ $content=
undef
,
$ensure=present,
$site=undef
) {
$ensure=present,
$site=undef
) {
@@
-27,8
+27,7
@@
define apache2::site (
$link_target = $ensure ? {
present => $target,
$link_target = $ensure ? {
present => $target,
- absent => absent,
- default => fail ( "Unknown ensure value: '$ensure'" ),
+ absent => absent
}
if $content {
}
if $content {
@@
-36,27
+35,38
@@
define apache2::site (
ensure => $ensure,
content => $content,
require => Package['apache2'],
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'],
}
} else {
file { $target:
ensure => $ensure,
source => $source,
require => Package['apache2'],
- notify =>
Service['apache2
'],
+ notify =>
Exec['service apache2 reload
'],
}
}
}
}
- if $ensure == present {
+ if versioncmp($::lsbmajdistrelease, '7') <= 0 {
+ $symlink = "/etc/apache2/sites-enabled/${name}"
+ } else {
+ $symlink = "/etc/apache2/sites-enabled/${name}.conf"
+
file { "/etc/apache2/sites-enabled/${name}":
file { "/etc/apache2/sites-enabled/${name}":
+ ensure => absent,
+ notify => Exec['service apache2 reload'],
+ }
+ }
+
+ if $ensure == present {
+ file { $symlink:
ensure => link,
target => $link_target,
ensure => link,
target => $link_target,
- notify
=> Service['apache2
'],
+ notify
=> Exec['service apache2 reload
'],
}
} else {
}
} else {
- file {
"/etc/apache2/sites-enabled/${name}"
:
+ file {
$symlink
:
ensure => absent,
ensure => absent,
- notify
=> Service['apache2
'],
+ notify
=> Exec['service apache2 reload
'],
}
}
}
}
}
}