summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-06-06 18:36:54 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-06-06 18:36:54 -0300
commit323ee2f4236c1310d3075b5212a7b34c05d4747d (patch)
tree11184733112fb5a33a8ba417ecd1a7310602b290 /manifests
parent12cdb4bdd7b6f1d67076fdc8e3f5a197e66f615d (diff)
downloadpuppet-apache-323ee2f4236c1310d3075b5212a7b34c05d4747d.tar.gz
puppet-apache-323ee2f4236c1310d3075b5212a7b34c05d4747d.tar.bz2
Renaming additional_directives to custom_directives
Diffstat (limited to 'manifests')
-rw-r--r--manifests/site.pp62
1 files changed, 31 insertions, 31 deletions
diff --git a/manifests/site.pp b/manifests/site.pp
index f90bcbc..fd7914a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,35 +1,35 @@
define apache::site(
- $ensure = present,
- $docroot = false,
- $redirect = false,
- $redirect_match = false,
- $protocol = 'http',
- $aliases = false,
- $server_alias = false,
- $use = false,
- $ticket = false,
- $source = false,
- $template = 'apache/site.erb',
- $filename = '',
- $manage_docroot = true,
- $owner = 'root',
- $group = 'root',
- $mpm = true,
- $mpm_user = '',
- $mpm_group = '',
- $password = '*',
- $comment = '',
- $sshkey = absent,
- $groups = '',
- $shell = '/bin/false',
- $manage_user = true,
- $ssl = false,
- $listen = '*',
- $https_redirect = false,
- $canonical = false,
- $canonical_exceptions = '',
- $hidden_service = false,
- $additional_directives = false
+ $ensure = present,
+ $docroot = false,
+ $redirect = false,
+ $redirect_match = false,
+ $protocol = 'http',
+ $aliases = false,
+ $server_alias = false,
+ $use = false,
+ $ticket = false,
+ $source = false,
+ $template = 'apache/site.erb',
+ $filename = '',
+ $manage_docroot = true,
+ $owner = 'root',
+ $group = 'root',
+ $mpm = true,
+ $mpm_user = '',
+ $mpm_group = '',
+ $password = '*',
+ $comment = '',
+ $sshkey = absent,
+ $groups = '',
+ $shell = '/bin/false',
+ $manage_user = true,
+ $ssl = false,
+ $listen = '*',
+ $https_redirect = false,
+ $canonical = false,
+ $canonical_exceptions = '',
+ $hidden_service = false,
+ $custom_directives = false
) {
$vhost = $filename ? {