Commit graph

162 commits

Author SHA1 Message Date
Matthew Haughton
796bf63893 Merge pull request #624 from Tombar/master
Require base folder for resources
2015-05-26 12:05:09 -04:00
Steve Maddison
62c8a1e558 Simplify default vhost configuration by passing parameters directly to resource.
Prevent missing resource errors if custom configuration is used without default location.
2015-05-20 12:38:20 +02:00
Matthew Haughton
678a361106 vhost: add ssl_crl parameter 2015-05-09 00:51:49 -04:00
Matthew Haughton
be4decdb78 vhost: don't copy any SSL files 2015-05-09 00:40:57 -04:00
Marin Vintila
77aa952b20 Merge from master 2015-05-08 12:11:46 +03:00
Marin Vintila
5624e4ca55 Merge from master 2015-05-08 12:04:22 +03:00
Martin Loy
7912f0074b remove ensure from concat::fragment as its deprecated 2015-05-07 11:30:44 -03:00
Martin Loy
72bb663caf require vhost folder 2015-05-06 12:04:12 -03:00
Michael Marod
7e524d0785 change variable names as requested to match nginx params exactly... Also passenger_env_var is not set with passenger_set_env_var and this commit undoes that 2015-04-29 17:37:58 -04:00
Michael Marod
d0464923d1 Add passenger_env_var parameter which deprecates passenger_cgi_param to support Passenger 5.0+ 2015-04-29 12:33:42 -04:00
Michael Marod
0aed6c1978 Add passenger_header parameter which deprecates passenger_cgi_param to support Passenger 5.0+ 2015-04-29 12:24:38 -04:00
Matthew Haughton
51291ebee6 Merge pull request #530 from scottsb/master
Fixing default location to use specified index files.
2015-04-15 12:51:19 -04:00
James Fryman
2354132aa9 Merge pull request #584 from brunoleon/maintenance
feat (maintenance): allow to specify maintenance behavior. Add docs.
2015-03-26 07:06:29 -05:00
Bruno Léon
6f1744b11d feat (maintenance): allow to specify maintenance behavior. Add docs. 2015-03-24 15:45:29 +01:00
James R. Carr
466641a1f0 Copy and pasta error. 2015-03-23 14:14:15 -05:00
James R. Carr
e333db6c39 provides ssl_client_verify support 2015-03-23 13:59:30 -05:00
Bruno Léon
c18ba1d499 feat: add an easy maintenance page support 2015-03-17 17:06:54 +01:00
James Fryman
2c52e08925 Merge pull request #546 from b4ldr/master
allow listen_ip and ipv6_listen_ip to contain a String or Array
2015-02-05 14:09:29 -06:00
Barry Allard
4d0a2dd969
maybe closes #541 2015-01-24 14:14:17 -08:00
b4ldr
fdca7199f6 allow listen_ip and ipv6_listen_ip to contain a String or Array 2015-01-13 20:44:58 +00:00
Scott Buchanan
e3f19ee042 Fixing default location to use specified index files. 2014-12-15 10:14:28 -05:00
Sebastian Brückner
8f793211a5 Fix proxy_set_header for default location 2014-12-04 11:27:48 +01:00
Matthew Haughton
f07058a5fb fix a future parser failure introduced by #510 2014-12-03 23:41:53 -05:00
Matthew Haughton
f18dcf0f1f fully qualify classes, defines and variables 2014-11-26 23:37:11 -05:00
Pierre Radermecker
c25c957a65 Use combined as a default for $format_log 2014-11-25 23:41:45 -05:00
James Fryman
0d939d3e13 fixing up specs/config parameters 2014-11-22 12:40:01 -06:00
James Fryman
cb5cb839c7 make sure to call the right variable for log_dir 2014-11-17 12:56:45 -06:00
James Fryman
dce2212d53 Update default SSL Ciphers 2014-10-20 11:48:55 -05:00
James Fryman
db15848deb Merge pull request #483 from ghoneycutt/strengthen_cipher_list
Use stronger ciphers
2014-10-20 11:47:39 -05:00
Garrett Honeycutt
db3c4a4955 Use stronger ciphers
As suggested by Mozilla

https://wiki.mozilla.org/Security/Server_Side_TLS#Nginx
2014-10-16 09:23:54 -04:00
Derrick Dymock
06ee2ca3ce Remove the SSLv3 by default in the vhost resource. 2014-10-15 10:52:31 -07:00
Pierre Radermecker
0a46f25c3c Guard against undef 2014-09-24 02:06:15 +02:00
Frederik Wagner
331338abdb added parameter ssl_session_timeout to vhost 2014-09-15 23:11:26 -04:00
Matthew Haughton
88d8984876 Fix remaining lint warnings 2014-08-18 23:04:24 -04:00
Marin Vintila
1172268a18 Sync repo from upstream 2014-08-12 19:06:13 +03:00
Alkivi
bfbded71d4 Added owner group and mode parameter. For all users, per sites-available directory and per sites conf 2014-07-03 16:06:54 +02: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
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
Marin Vintila
2e7e059c06 Fix typos 2014-06-24 20:05:10 +03:00
Marin Vintila
2778df07fb Add uwsgi support 2014-06-24 19:17:08 +03:00
eholzbach
1317810c92 allow override of proxy_redirect = off 2014-06-23 11:39:56 -07:00
Maksym Melnychok
5b28d0553d configuration revamp
- make many more things configurable
- stop using ::params::* for things that are configurable
- add worker_rlimit_nofile option
- add tcp_nopush option
2014-06-21 11:08:29 +02:00
James Fryman
03094eabe5 Merge pull request #337 from rabbitt/master
add ability to define geo and map mappings
2014-06-16 09:43:15 -05:00
Jan Örnstedt
d8e6d603e7 Replace hardcoded paths referring to '/etc/nginx' with config variable instead. 2014-06-13 13:51:45 +02:00
Jan Örnstedt
7459e91744 Made config dir available as a parameter. 2014-06-13 13:51:45 +02:00
Carl P. Corliss
d3810eb61c add geo and map mappings 2014-06-12 14:12:24 -04:00
James Fryman
9c7cf2d182 Merge pull request #328 from janorn/run_as_unprivileged
Run as unprivileged user
2014-06-11 12:55:12 -05: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
James Fryman
04b78c416d Merge pull request #330 from saz/master
make ssl listen option configurable
2014-06-11 11:31:07 -05:00