opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #86 from abraham1901/master

Browse source 
Add location priority option
This commit is contained in:
James Fryman 2013-07-09 07:22:14 -07:00
commit fc331e8173
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
manifests/resource/location.pp
View file

@ -23,14 +23,18 @@
# [*location_cfg_append*] - Expects a hash with extra directives to put after everything else inside location (used with all other types except custom_cfg) # [*location_cfg_append*] - Expects a hash with extra directives to put after everything else inside location (used with all other types except custom_cfg)
# [*try_files*] - An array of file locations to try # [*try_files*] - An array of file locations to try
# [*option*] - Reserved for future use # [*option*] - Reserved for future use
# [*proxy_cache*] - This directive sets name of zone for caching. # [*proxy_cache*] - This directive sets name of zone for caching.
# The same zone can be used in multiple places. # The same zone can be used in multiple places.
# [*proxy_cache_valid*] - This directive sets the time for caching # [*proxy_cache_valid*] - This directive sets the time for caching
# different replies. # different replies.
# [*auth_basic*] - This directive includes testing name and password # [*auth_basic*] - This directive includes testing name and password
# with HTTP Basic Authentication. # with HTTP Basic Authentication.
# [*auth_basic_user_file*] - This directive sets the htpasswd filename for # [*auth_basic_user_file*] - This directive sets the htpasswd filename for
# the authentication realm. # the authentication realm.
# [*priority*] - Location priority. Default: 500. User priority
# 400-499, 501-599. If the priority is higher than the default priority,
# the location will be defined after root, or before root.
#
# #
# Actions: # Actions:
# #
@ -85,7 +89,8 @@ define nginx::resource::location (
$proxy_cache = false, $proxy_cache = false,
$proxy_cache_valid = false, $proxy_cache_valid = false,
$auth_basic = undef, $auth_basic = undef,
$auth_basic_user_file = undef $auth_basic_user_file = undef,
$priority = 500
) { ) {
File { File {
owner => 'root', owner => 'root',
@ -128,7 +133,7 @@ define nginx::resource::location (
## Create stubs for vHost File Fragment Pattern ## Create stubs for vHost File Fragment Pattern
if ($ssl_only != true) { if ($ssl_only != true) {
file {"${nginx::config::nx_temp_dir}/nginx.d/${vhost}-500-${name}": file {"${nginx::config::nx_temp_dir}/nginx.d/${vhost}-${priority}-${name}":
ensure => $ensure_real, ensure => $ensure_real,
content => $content_real, content => $content_real,
} }
@ -136,7 +141,8 @@ define nginx::resource::location (
## Only create SSL Specific locations if $ssl is true. ## Only create SSL Specific locations if $ssl is true.
if ($ssl == true) { if ($ssl == true) {
file {"${nginx::config::nx_temp_dir}/nginx.d/${vhost}-800-${name}-ssl": $ssl_priority = $priority + 300
file {"${nginx::config::nx_temp_dir}/nginx.d/${vhost}-${ssl_priority}-${name}-ssl":
ensure => $ensure_real, ensure => $ensure_real,
content => $content_real, content => $content_real,
} }

2
templates/vhost/vhost_header.erb
View file

@ -18,6 +18,6 @@ server {
<% end -%> <% end -%>
<% if @rewrite_to_https -%> <% if @rewrite_to_https -%>
if ($ssl_protocol = "") { if ($ssl_protocol = "") {
return 301 https://$host$request_uri ; return 301 https://$host$request_uri;
} }
<% end -%> <% end -%>