projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into staging
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
config.pp
diff --git
a/modules/apache2/manifests/config.pp
b/modules/apache2/manifests/config.pp
index
0bb6a6e
..
13697cb
100644
(file)
--- a/
modules/apache2/manifests/config.pp
+++ b/
modules/apache2/manifests/config.pp
@@
-1,6
+1,7
@@
define apache2::config (
$source=undef,
$content=undef,
define apache2::config (
$source=undef,
$content=undef,
+ $nocontentok=undef,
$ensure=present
) {
$ensure=present
) {
@@
-8,7
+9,7
@@
define apache2::config (
case $ensure {
present: {
case $ensure {
present: {
- if ! ($source or $content) {
+ if ! ($source or $content
or $nocontentok
) {
fail ( "No configuration found for ${name}" )
}
fail ( "No configuration found for ${name}" )
}
@@
-19,7
+20,7
@@
define apache2::config (
require => Package['apache2'],
notify => Exec['service apache2 reload'],
}
require => Package['apache2'],
notify => Exec['service apache2 reload'],
}
- } else {
+ } els
if $sourc
e {
file { "/etc/apache2/conf-available/${name}.conf":
ensure => $ensure,
source => $source,
file { "/etc/apache2/conf-available/${name}.conf":
ensure => $ensure,
source => $source,