opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
838 commits 2 branches 0 tags 1.4 MiB
Commit graph

195 commits

Author SHA1 Message Date
Matthew Haughton
abe4b4952b vhost: fix rewrite to HTTPS for custom SSL ports 
Fixes #477
 2014-10-23 12:51:35 -04:00
Vincent Bernat
004ee68b89 vhost: add a blank line at the end of the header template 
Without it, we get something like this:

```
  error_log             /var/log/nginx/my_error.log;  location / {
    root      /var/www/html;
  }
```

With this commit, we get this:

```
  error_log             /var/log/nginx/my_error.log;

  location / {
    root      /var/www/html;
  }
```
 2014-10-22 22:22:46 +02:00
cdenneen
324179e7a4 Add include files to locations 2014-09-23 18:52:14 -04:00
James Fryman
d11d574e8c Merge pull request #443 from rabbitt/whitespace-cleanup 
cleanup whitespace and key/value alignment in config files
 2014-09-20 10:06:59 -05:00
Frederik Wagner
331338abdb added parameter ssl_session_timeout to vhost 2014-09-15 23:11:26 -04:00
Carl P. Corliss
fb880576a6 cleanup resultant whitespace and key/value alignment in config files 
- fix tests related to whitespace changes
 2014-09-13 04:13:18 -04:00
Pablo Fredrikson
ac1e9b70f6 Removed proxy_cache_valid as default when using proxy_cache option 
Added some tests also
 2014-09-03 18:39:55 -03:00
Matthew Haughton
bbf6f4584d Merge pull request #413 from zshahan/enable_streaming 
Add flv and mp4 parameters to vhost::location
 2014-08-22 13:24:12 -04:00
Matthew Haughton
82398b2fd2 Merge pull request #386 from xaque208/whitespace 
Align index to the rest of template contents
 2014-08-22 11:26:49 -04:00
zshahan
68a46d3ed1 added streaming options. 2014-08-18 20:34:43 -05:00
Cory Comer
3874221ddb Fixing deprecated variable access warning 2014-08-15 04:37:43 -07:00
Christoph Körner
9bedd7950a Renamed params to fastcgi_param and moved to fastcgi.erb 2014-08-13 12:24:59 +02:00
Christoph Körner
a128713520 Changed description of params in comment block 2014-08-11 10:19:41 +02:00
Christoph Körner
96138715d1 Add support of custom fastcgi_params 2014-08-11 10:04:21 +02:00
Zach Leslie
5dda0ad03c Align index to the rest of template contents 2014-07-28 14:12:42 -07:00
Carl P. Corliss
7be12d0870 new raw_prepend / raw_append feature for vhosts & locations 
- added raw_prepend / raw_append to vhosts & locations, which
    adds raw lines to the vhost/location /without/ semicolons
  - added location_raw_prepend / location_raw_append to vhost
    for passing through to default location
  - added spec tests for new parameters
  - cleaned up location specs to match new header/body/footer setup
    reducing duplicate checks by testing header/footer separately.
  - cleaned up whitespace (2 space) in touched files
  - used `<%-` in erb templates to allow the use of leading
    whitespace, making the logic flow more readable
  - Also adds spec tests for recent vhost updates:
    - client_body_timeout
    - client_header_timeout
    - gzip_types
    - testing that the first server_name is used when www_to_non_www is true
 2014-06-26 00:00:37 -04:00
James Fryman
8203f55894 Merge pull request #310 from kalmanolah/rewrite_non_www 
Use first server name for non-www redirects to prevent issues with naming of vhosts within defined types.
 2014-06-25 21:10:36 -05:00
eholzbach
7a91ff4c2e allow setting gzip_types to vhosts 2014-06-25 13:58:55 -07:00
eholzbach
508e9e8d62 allows setting client_body/header_timeout on vhosts 2014-06-25 11:55:26 -07:00
Kalman Olah
12d515f7f7 Use first server name for non-www redirects to prevent issues with naming of vhosts within defined types. 
Signed-off-by: Kalman Olah <kalman@inuits.eu>
 2014-06-24 19:22:43 +02:00
Carl P. Corliss
9b14ba901e add ability to designate location as internal 2014-06-24 10:42:27 -04:00
Carl P. Corliss
33303102fc refactor locations to remove a bit of redundancy 2014-06-23 17:41:21 -04:00
Carl P. Corliss
9519298aba use return instead of rewrite for simple redirects (e.g., www -> naked domain) 2014-06-23 11:46:43 -04:00
Jan Örnstedt
7459e91744 Made config dir available as a parameter. 2014-06-13 13:51:45 +02:00
James Fryman
70e772ed40 Merge pull request #332 from kimor79/master 
Allow format_log in ssl vhosts as well
 2014-06-11 12:29:59 -05:00
Kimo Rosenbaum
5495bd2617 Allow format_log in ssl as well 2014-06-09 15:49:33 -07:00
Steffen Zieger
7b80b1a3c6 make ssl listen option configurable 2014-06-02 00:23:07 +02:00
Tim Mower
9d1e2e8806 Add client_max_body_size to ssl vhost 2014-05-27 11:38:32 +01: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
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
4a5ed9ac7a Merge pull request #307 from ChartBoost/resolverfix 
allow resolvers in non-ssl vhosts
 2014-05-08 07:37:41 -05:00
Mike Lerch
73158c112d allow resolvers in non-ssl vhosts 2014-05-02 10:17:10 -07: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
Harry Danes
f5fac8b245 Introduced log_by_lua and log_by_lua_file params. 2014-04-18 11:57:31 +02:00
Lebedev Vadim
7b33e458a9 * fix 2014-04-13 13:26:25 +04:00
Lebedev Vadim
19acfe0356 Add option proxy_connect_timeout 
Bug fix
 2014-04-12 23:17:45 +04: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
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
Paul de Raaij
1fbfe531b7 Add configuring multiple resolvers via an array instead of a string 2014-04-03 11:59:47 +02:00
Robin Gloster
08d46d02cb Add allow/deny rules to fastcgi template 2014-03-22 01:23:38 +01:00
eSe
2271ce5255 Fix indent for location parameters to 4 spaces 2014-03-12 17:18:05 +01:00
eSe
0ade406a89 Remove Arrays as keys in templates 2014-03-11 17:24:30 +01:00
eSe
7614bceec1 Fix custom_cfg_[prepend,append] 2014-03-10 12:52:12 +01:00
eSe
3ef66c6f63 Fix formatting errors 2014-03-10 10:26:35 +01:00