Commit graph

752 commits

Author SHA1 Message Date
James Fryman
0030399d34 Merge pull request #325 from janorn/sort_parameters
Sorted all parameters alphabetically in the main nginx class
2014-06-04 19:49:36 +02:00
Jan Örnstedt
1bc31631d4 Sorted all parameters alphabetically in the main nginx class and the nginx::config class. 2014-06-04 18:08:40 +02:00
James Fryman
99df70b3dd Merge pull request #319 from cloudevelops/master
Enabled undef for service where we dont want puppet control service
2014-06-04 11:44:05 +02:00
James Fryman
4bc07a43c8 Merge pull request #323 from saz/multi_accept
add option for multi_accept and events_use
2014-06-04 10:47:24 +02:00
Steffen Zieger
7b80b1a3c6 make ssl listen option configurable 2014-06-02 00:23:07 +02:00
Steffen Zieger
ce2bd7f068 add option for multi_accept and events_use 2014-05-31 16:06:23 +02:00
James Fryman
e7890e1025 Merge pull request #321 from saz/patch-1
Fix error message if ssl_cert/ssl_key is not set.
2014-05-29 06:56:20 -07:00
Steffen Zieger
cb190e2c6d Fix error message if ssl_cert/ssl_key is not set. 2014-05-29 15:23:57 +02:00
James Fryman
6c890da8ec Merge pull request #320 from timmow/client-max-body-size-ssl-vhost
Add client_max_body_size to ssl vhost
2014-05-27 12:06:57 -05:00
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
Tim Mower
9d1e2e8806 Add client_max_body_size to ssl vhost 2014-05-27 11:38:32 +01:00
Zdenek Janda
48c0895423 Enabled undef for service where we dont want puppet control service 2014-05-25 12:03:53 +02: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