diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-06-06 18:36:54 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-06-06 18:36:54 -0300 |
| commit | 323ee2f4236c1310d3075b5212a7b34c05d4747d (patch) | |
| tree | 11184733112fb5a33a8ba417ecd1a7310602b290 | |
| parent | 12cdb4bdd7b6f1d67076fdc8e3f5a197e66f615d (diff) | |
| download | puppet-apache-323ee2f4236c1310d3075b5212a7b34c05d4747d.tar.gz puppet-apache-323ee2f4236c1310d3075b5212a7b34c05d4747d.tar.bz2 | |
Renaming additional_directives to custom_directives
| -rw-r--r-- | manifests/site.pp | 62 | ||||
| -rw-r--r-- | templates/site.erb | 4 |
2 files changed, 33 insertions, 33 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 ? { diff --git a/templates/site.erb b/templates/site.erb index aef58e0..7090e7d 100644 --- a/templates/site.erb +++ b/templates/site.erb @@ -32,7 +32,7 @@ RewriteCond %{HTTP_HOST} !=<%= canonical %> [NC] RewriteCond %{HTTP_HOST} !="" RewriteRule ^/(.*) <%= protocol %>://<%= canonical %>/$1 [L,R=301] -<%- if additional_directives != false -%><%= additional_directives %><%- end -%> +<%- if custom_directives != false -%><%= custom_directives %><%- end -%> <% end %> </VirtualHost> # end vhost for <%= title %> @@ -50,7 +50,7 @@ <% if use != false %><% use.each do |instance| -%> Use <%= instance %> <% end -%><% end -%> -<%- if additional_directives != false -%><%= additional_directives %><%- end -%> +<%- if custom_directives != false -%><%= custom_directives %><%- end -%> <% if mpm == true %> <IfModule mpm_itk_module> AssignUserId <%= user %> <%= gid %> |