Commit graph

246 commits

Author SHA1 Message Date
Jacob McCoy Wade
66524e22b4 Adding ability to add proxy_cache_use_stale and proxy_cache_key within a location resource
Adding spec tests for proxy_cache_key and proxy_cache_use_stale
2015-06-01 14:32:26 -07:00
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
a8cb664ef5 Fix uwsgi related tests 2015-05-08 18:00:35 +03: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
952805aaeb fix traling slash and aligment 2015-05-07 10:46:28 -03:00
Martin Loy
72bb663caf require vhost folder 2015-05-06 12:04:12 -03:00
Martin Loy
23fe0404c8 require conf.d folder 2015-05-06 12:03:26 -03:00
Matthew Haughton
3f95e281b9 Merge pull request #616 from Cofyc/cofyc_master
fix docs
2015-05-05 00:07:32 -04:00
Matthew Haughton
b8454400ac Merge pull request #613 from 3flex/test-on-puppet-4
travis: test on Puppet 4 for real
2015-05-01 12:00:27 -04: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
Yecheng Fu
b65a5f08f7 fix docs 2015-04-28 12:44:44 +08:00
Matthew Haughton
8d36089dff location: mini-refactor for puppet 4
Without this an undef will be passed to regsubst when vhost => undef,
which causes an error with Puppet 4 so the friendly message from the
module won't be shown.
2015-04-23 09:45:19 -04:00
Matthew Haughton
cc2f6387f0 Merge pull request #608 from 3flex/572-remove-auth_basic_user_file-resource
location: remove the auth_basic_user_file resource
2015-04-21 13:42:20 -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
Matthew Haughton
d1b9221a51 location: remove the auth_basic_user_file resource
All it's doing right now is copying a file, but the copy of the file is
never referenced by the template.
2015-04-14 23:45:51 -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
Matthew Haughton
8df2e752c6 don't ignore lint errors 2014-12-10 08:56:40 -05:00
Jim Radford
c9c8361990 location: fix ensure 2014-12-08 11:27:58 -08: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
Daniel Dreier
22c6a7cb57 Allow internal-only location resources
Location resources with internal == true are valid, but the module does
not allow them unless one or more of www_root, proxy, location_alias,
stub_status, fastcgi, or location_custom_cfg are set

This patch allows locations with none of those but internal == true to
be created.

This is a re-implementation of jfryman/nginx PR-388.
2014-09-25 09:40:32 -07:00
James Fryman
b8e2ccc540 Merge pull request #453 from jfryman/add-puppet-module-tool
Introducing Puppet Module Data
2014-09-24 15:07:28 -07:00
Pierre Radermecker
0a46f25c3c Guard against undef 2014-09-24 02:06:15 +02:00
cdenneen
324179e7a4 Add include files to locations 2014-09-23 18:52:14 -04:00
Matthew Haughton
00ec3f4e35 spec fixes 2014-09-21 01:27:35 -04:00
James Fryman
4c5f1e3b2a pass one of spec cleanup 2014-09-20 18:25:24 -05:00
Frederik Wagner
331338abdb added parameter ssl_session_timeout to vhost 2014-09-15 23:11:26 -04:00