Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

nginx: changing use of nginx::site::proxy

  • Loading branch information...
commit 9803242331669f78c2e222617240189a246d2dfc 1 parent 057f5d9
@daks authored
View
8 nginx/README
@@ -75,11 +75,11 @@ nginx::site::proxy
port (optional, default: 80):
its port
- media_url (optional):
- url where media will be served
+ location_url (optional):
+ url for a location block
- media_dir (optional):
- directory from which media will be served
+ location_content (optional):
+ content of this location block
default_vhost (optional, default: false):
is this vhost the default one?
View
4 nginx/manifests/site/proxy.pp
@@ -4,8 +4,8 @@
$port='80',
$upstream='',
$root_dir='',
- $media_url='',
- $media_dir='',
+ $location_url='',
+ $location_content='',
$default_vhost=false,
$enabled=true) {
View
8 nginx/templates/proxy.erb
@@ -18,10 +18,10 @@ server {
root <%= root_dir %>;
- <% if media_url != "" then %>
- location <%= media_url %> {
- alias <%= media_dir %>;
- }
+ <% if location_url != "" then %>
+ location <%= location_url %> {
+ <%= location_content %>
+ }
<% end %>
location / {
Please sign in to comment.
Something went wrong with that request. Please try again.