Commit graph

641 commits

Author SHA1 Message Date
James Fryman
5933b360e0 Merge pull request #301 from yath/parser-future-backslash
fix location sanitizing with parser 'future'
2014-05-27 12:05:44 -05:00
James Fryman
5056ecb899 Merge pull request #311 from alexskr/master
add location_allow/deny directives for alias and stub_status templates
2014-05-16 13:19:03 +02:00
James Fryman
8b7588dccc Merge pull request #315 from gini/basic_auth_for_proxy_locations
Allow basic_auth for proxy locations and ...
2014-05-16 13:18:01 +02:00
James Fryman
5cb8ea8fa8 Merge pull request #316 from edvinasme/archlinux
Add Archlinux support
2014-05-16 13:14:49 +02:00
Edvinas Klovas
0373c8492f typo fixes & trailing whitespace cleanup 2014-05-15 23:58:44 +02:00
Edvinas Klovas
949a000e80 Add Archlinux support
This commit adds Archlinux support. This needs changes in nginx.conf.erb
template and manifests to support pid value set to `false` (this skips it from
nginx.conf). This is due to `-pid /run/nginx.pid` being hardcoded to Archlinux
template. If you specify pid additionally in `nginx.conf` then nginx fails to
start.
2014-05-15 23:55:24 +02:00
Daniel Kerwin
b793058afb Add proxy_headers_hash_bucket_size to nginx::config 2014-05-15 16:34:01 +02:00
Daniel Kerwin
d11c6be681 Allow basic_auth for proxy locations and introducing parameter proxy_headers_hash_bucket_size with default of 64 2014-05-15 16:18:27 +02:00
Alex Skrenchuk
31f2cce35e add location_allow/deny directives 2014-05-14 14:34:28 -07:00
Alex Skrenchuk
874ddcac2a add location_allow/deny directives 2014-05-14 14:33:58 -07:00
James Fryman
35a71ad2d3 Add additional clarity RE: 1.8.7 support 2014-05-12 10:16:43 +02:00
James Fryman
4a5ed9ac7a Merge pull request #307 from ChartBoost/resolverfix
allow resolvers in non-ssl vhosts
2014-05-08 07:37:41 -05:00
Sebastian Schmidt
c78ee8c551 fix location sanitizing with parser 'future'
With parser 'future', a '\\' counts as one backslash whereas with
parser 'current' it's two. Therefore with 'future' only one gets passed
to regsubst which in turn aborts with

 Error: regsubst(): Bad regular expression `\'

The 'future' behaviour is indeed the correct one but 'current' won't be
fixed either. Therefore, use "\\\\" which produces two backslashes with
both parser (ref: https://tickets.puppetlabs.com/browse/PUP-1814).
2014-05-05 17:07:41 +02:00
Mike Lerch
73158c112d allow resolvers in non-ssl vhosts 2014-05-02 10:17:10 -07:00
James Fryman
cd95690796 Merge pull request #306 from mtomic/master
Added support for fastcgi parameters.
2014-04-30 08:03:44 -07:00
root
402febc599 Add fastcgi_cache_key and fastcgi_cache_use_stale parameters 2014-04-27 09:49:45 -04:00
root
659a8cd4d0 add additional fastcgi parameters 2014-04-26 11:14:55 -04:00
root
024cc33d62 add support for fastcgi_cache_path 2014-04-26 10:34:29 -04:00
James Fryman
4d816c990a Merge pull request #305 from andschwa/patch-alias_autoindex
Adding autoindex to location alias
2014-04-24 11:13:07 -05:00
Andrew Schwartzmeyer
12004e86b7 Adding autoindex to location alias
Fix for issue #304

I don't see any reason why autoindex shouldn't be used with alias
directive, nor does jaybe on #nginx.
2014-04-23 22:11:21 -07:00
James Fryman
eb623b43dd Merge pull request #302 from yath/conditional-include-apt
nginx:📦:debian: only include ::apt when needed
2014-04-22 10:47:24 -05:00
Sebastian Schmidt
048001e859 nginx:📦:debian: only include ::apt when needed
Only include ::apt when $manage_repo is true, it's not needed otherwise.
2014-04-19 20:46:04 +02:00
James Fryman
fbb71f222b Merge pull request #300 from hdanes/feature/log_by_lua_file
Introduced log_by_lua and log_by_lua_file params.
2014-04-18 10:28:38 -05:00
Harry Danes
f5fac8b245 Introduced log_by_lua and log_by_lua_file params. 2014-04-18 11:57:31 +02:00
James Fryman
8218c59d70 Merge pull request #295 from abraham1901/dev
Fix cert sanitized and add some options
2014-04-15 09:50:51 -05:00
James Fryman
c6857086fa Merge pull request #298 from pennycoders/master
Fix cannot generate tempfile error
2014-04-14 11:40:40 -05:00
James Fryman
5ce606cbb0 Merge pull request #296 from radford/avoid-global-root
Stop using $root from upper scopes
2014-04-14 11:37:08 -05:00
Lebedev Vadim
7b33e458a9 * fix 2014-04-13 13:26:25 +04:00
Alex
0e27ce101e Use md5 hash for the location temp files 2014-04-13 05:29:20 +03:00
Alex Pica
d4da8f8eff Use md5 for location concat filenames 2014-04-13 05:12:19 +03:00
Lebedev Vadim
19acfe0356 Add option proxy_connect_timeout
Bug fix
2014-04-12 23:17:45 +04:00
Jim Radford
60a9a823b4 Stop using $root from upper scopes 2014-04-11 15:12:54 -07:00
Lebedev Vadim
e1bcb3e2cb Remove duplicate location_allow & location_deny 2014-04-11 23:36:15 +04:00
Lebedev Vadim
3721ce1194 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev
Conflicts:
	manifests/package/debian.pp
2014-04-11 23:16:53 +04:00
James Fryman
e87864b7f9 Merge pull request #293 from dol/feature/add-hiera-resource-mailhost
Added nginx::resource::mailhost to be configured via hiera
2014-04-11 12:09:42 -05:00
Lebedev Vadim
2f20bcc2b0 Remove trailing whitespaces 2014-04-11 20:04:24 +04:00
Lebedev Vadim
f3bebdff28 Added options to vhost:
format_log
location_custom_cfg_prepend
location_custom_cfg_append
2014-04-11 19:55:16 +04:00
Lebedev Vadim
819e92dd36 Fixed cert name sanitized 2014-04-11 19:47:19 +04:00
Lebedev Vadim
24c93968b3 Added location_allow & location_deny to fastcgi location 2014-04-11 19:43:54 +04:00
James Fryman
20a7ea01b1 Merge pull request #289 from b4ldr/master
Add additional config to the locations resource and fix set_header in vhost resource
2014-04-09 12:13:11 -05:00
John Bond
1b7ac9ab43 Add additional config to the locations section of config
Following parameters where added to the location resourse.  These
already existsed in the vhost resource so the same logic and defaults
where used
  * proxy_set_header
  * proxy_connect_timeout
  * proxy_redirect
2014-04-09 17:48:32 +02:00
Dominic Luechinger
43a5e7d6ff Added nginx::resource::mailhost to be configured via hiera
There is a slight chance the SSL 'concat::fragment' of the mailhost and
virtualhost are get in the way, if the name is declared the same.
2014-04-08 00:36:36 +02:00
James Fryman
e95a3abd46 Merge pull request #282 from genehand/master
Make proxy_redirect configurable
2014-04-06 09:42:49 -05:00
James Fryman
259a363b6f Merge pull request #287 from justinhennessy/jh_fix_lint_issues
Fixed lint errors
2014-04-06 09:34:29 -05:00
James Fryman
b0efd27ae0 Merge pull request #290 from pderaaij/master
Add configuring multiple resolvers via an array instead of a string
2014-04-06 09:14:21 -05:00
James Fryman
e20a343a7a Merge pull request #285 from TracyWebTech/master
Removing default.conf and example_ssl.conf
2014-04-03 09:37:52 -05:00
Paul de Raaij
1fbfe531b7 Add configuring multiple resolvers via an array instead of a string 2014-04-03 11:59:47 +02:00
Justin Hennessy
885b85ee6c Fixed lint issue 2014-03-30 21:41:34 +10:00
Justin Hennessy
acc093db32 Fixed lint errors 2014-03-30 21:23:43 +10:00
Sergio Oliveira
940bf427ab Removing default.conf and example_ssl.conf 2014-03-28 09:37:49 -03:00