Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure isn't being respected on location. #676

Closed
wants to merge 30 commits into from
Closed

Ensure isn't being respected on location. #676

Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
87664ad
Ensure was not being respected on locations.
kwolf Sep 2, 2015
fa5d913
for some reason using ensure_real here breaks two tests.
kwolf Sep 2, 2015
6fed8b4
Ensure was not being respected on locations.
kwolf Sep 2, 2015
c4b63c2
Merge branch 'master' of github.com:kwolf/puppet-nginx
kwolf Oct 29, 2015
322b737
Merge branch 'master' of github.com:jfryman/puppet-nginx
kwolf Oct 29, 2015
684594f
adding semi-colon to end of location_custom_cfg_append options.
kwolf Aug 7, 2015
bb9ba22
Update hiera.md
Hufschmidt Aug 11, 2015
aeacfad
Update hiera.md
Hufschmidt Aug 11, 2015
f6f3926
Add an ensure option to nginx::resource::upstream::member.
kwolf Aug 28, 2015
4f8adc2
Did not need the trailing ";".
kwolf Aug 28, 2015
41ae004
Ensure was not being respected on locations.
kwolf Sep 2, 2015
e17d69a
Ensure was not being respected on locations.
kwolf Sep 2, 2015
ca8c7c3
for some reason using ensure_real here breaks two tests.
kwolf Sep 2, 2015
c429aa0
adding a max_fails parameter to upstream member[s]
Sep 1, 2015
c1e0ca5
iterate server_name when rewrite_www_to_non_www is used
kronos-pbrideau Sep 15, 2015
cd4c43d
Correct spec test
kronos-pbrideau Sep 15, 2015
d81335a
Convert $priority to integer before comparison
erikanderson Sep 22, 2015
c49d7e4
First commit of the QuickStart
chadothompson Oct 10, 2015
fda8beb
Add sections to the quickstart
chadothompson Oct 10, 2015
6cb4cde
Remove the preamble as unnecessary
chadothompson Oct 10, 2015
e322ddc
Add a link to the QuickStart guide
chadothompson Oct 10, 2015
4aa5ea2
Fix the link to the QuickStart Guice
chadothompson Oct 10, 2015
5acf316
Fix the link to the QuickStart Guice
chadothompson Oct 10, 2015
bfd48ec
Break the link to a variable
chadothompson Oct 10, 2015
6b13e63
Adding support for stream configuration
Oct 2, 2015
02d3fcf
Added spec tests and set proxy to undef for streamhost
Oct 9, 2015
88324b2
add http2 as possible param for a vhost
jhooyberghs Oct 23, 2015
caaaec3
change some spaces for layout reasons
jhooyberghs Oct 23, 2015
d272a08
change some spaces for layout reasons / second attempt
jhooyberghs Oct 23, 2015
dc32c60
Merge branch 'master' of github.com:kwolf/puppet-nginx
kwolf Oct 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions manifests/resource/location.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,7 @@
$tmpFile=md5("${vhost_sanitized}-${priority}-${location_sanitized}")

concat::fragment { $tmpFile:
ensure => $ensure_real,
target => $config_file,
content => join([
template('nginx/vhost/location_header.erb'),
Expand All @@ -396,6 +397,7 @@

$sslTmpFile=md5("${vhost_sanitized}-${ssl_priority}-${location_sanitized}-ssl")
concat::fragment { $sslTmpFile:
ensure => $ensure_real,
target => $config_file,
content => join([
template('nginx/vhost/location_header.erb'),
Expand Down