projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prefix ticharich volumes with OLD-
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
site.pp
diff --git
a/modules/apache2/manifests/site.pp
b/modules/apache2/manifests/site.pp
index
6d5ec55
..
dc9b1ce
100644
(file)
--- a/
modules/apache2/manifests/site.pp
+++ b/
modules/apache2/manifests/site.pp
@@
-46,15
+46,11
@@
define apache2::site (
}
}
}
}
- if versioncmp($::lsbmajdistrelease, '7') <= 0 {
- $symlink = "/etc/apache2/sites-enabled/${name}"
- } else {
- $symlink = "/etc/apache2/sites-enabled/${name}.conf"
+ $symlink = "/etc/apache2/sites-enabled/${name}.conf"
- file { "/etc/apache2/sites-enabled/${name}":
- ensure => absent,
- notify => Exec['service apache2 reload'],
- }
+ file { "/etc/apache2/sites-enabled/${name}":
+ ensure => absent,
+ notify => Exec['service apache2 reload'],
}
if $ensure == present {
}
if $ensure == present {