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

65 commits

Author SHA1 Message Date
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
Jan Örnstedt
8613a52be9 Added 4 proxy parameters. 
client_body_buffer_size
proxy_connect_timeout
proxy_read_timeout
proxy_send_timeout

And reference these variabels in the template.
 2014-06-04 22:19:10 +02:00
Jan Örnstedt
872d5970a8 Add proxy_read_timeout 2014-06-04 22:19:09 +02:00
Matthew Schmitt
f0f00c6ca8 Puppet-lint fixes 2014-06-04 13:06:37 -07: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
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
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
Nathan Sullivan
8160de83ac allow setting custom priority before and after default SSL priority 2014-03-28 17:20:15 +10:00
Jean-François Roche
4618ab180e fix missing ensure on concat::fragment resources 2014-03-18 13:35:57 +01:00
Lebedev Vadim
a4ddf886b2 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2014-01-14 19:57:45 +04:00
Lebedev Vadim
088f1414c9 revert change priority type 2014-01-14 19:57:13 +04:00
Matthew Haughton
dc3817f9ae added rewrite to location/proxy & vhost 
With credit to https://github.com/OmarzT
 2014-01-13 13:20:02 -05:00
Lebedev Vadim
e94af129e4 Fixed long names virtual hosts, such as nginx::resource::vhost { 'name1.domainname.org name2.domainname.org': } 
Add example nginx::vhost with HTTPS FastCGI and redirection of HTTP
Add location_custom_cfg_prepend & location_custom_cfg_append. Used for logical structures such as if.
Fix puppet-lint
 2014-01-12 23:15:14 +04:00
Matthew Haughton
8e71d33121 validations for nginx::resource::location 2014-01-07 23:04:49 -05:00
Matthew Haughton
5756568f21 variables should not be substituted in message 
Using $priority meant it would be substituted with the value of the
parameter when it should be shown as static text.
 2014-01-07 22:12:31 -05:00
Matthew Haughton
d22402c404 Add validation for $priority 
Valid range changed to 401-599:

vhost SSL header has priority 700. If $priority is set to 400 (which
resolves to 400+300=700 for SSL locations), then it would conflict with
the priority of the header. It must be 401 or higher to avoid this.

Top end of range is limited to 599 to reflect documentation however it
could be increased to 698 and still provide expected behavior.
 2014-01-03 13:03:55 -05:00
Omar Tamer
1566daa60f added rewrite to location/proxy & vhost 2014-01-02 18:13:59 +00:00
Lebedev Vadim
fc6d66fa0b Fixed location containing '\', such as '~ \.php$' 2013-12-25 02:36:01 +04:00
Jason Clark
c7566d9134 Fix for order statements. Concat requires strings 2013-12-17 22:12:31 -06:00
Markus Rekkenbeil
b79259ed8b Add nginx autoindex to resource nginx::location and style up the 
nginx::vhost directory template

Signed-off-by: Markus Rekkenbeil <markus@bionix-it.de>
 2013-12-16 17:36:24 +01:00
James Fryman
7c1674202a Merge pull request #170 from TelekomCloud/feature/set_proxy_method_and_body 
Add support for proxy method and body
 2013-12-05 07:48:18 -08:00
Matthew Haughton
d849c31c35 switch location resource to concat pattern 2013-11-30 21:24:55 -05:00
Dominik Richter
a83c513ac4 feature: add configurable proxy_set_body to vhost and location resources 
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2013-11-27 15:12:56 +01:00
Dominik Richter
a578dcea50 feature: add configurable proxy_method to vhost and location resources 
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2013-11-27 15:12:56 +01:00
Matthew Haughton
354a68ef63 validate all arrays 2013-10-20 17:58:25 -04:00
James Fryman
8845838390 regex replace / in resource::vhost Fixes #102 2013-10-19 15:55:52 -05:00
Lebedev Vadim
757bb87031 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 
Conflicts:
	manifests/params.pp
	manifests/resource/location.pp
	manifests/resource/vhost.pp
	templates/vhost/vhost_header.erb
 2013-09-05 12:01:00 +04:00
Ashley Penney
39bc3f16ac This commit addresses issue #49, the lack of ways to set allow and 
deny rules within a location.
 2013-09-04 13:04:28 -04:00
root
eb73601aac Fix puppet-lint 2013-08-22 23:23:16 +04:00
Justice London
6911b91f9e Merge branch 'master' of https://github.com/jfryman/puppet-nginx into jfryman-master 
Conflicts:
	templates/vhost/vhost_location_fastcgi.erb
 2013-08-02 13:07:53 -04:00
Lebedev Vadim
49b5b79b76 * Option fastcgi_script fixed 
* Options location_cfg_append and location_cfg_prepend added to fastcgi template
* Option www_root is optional now
* Options logging fixed in http template
* Auth_basic fixed in SSL vhost header
 2013-08-01 01:07:59 +04:00
Justice London
06f50454cb Small doc fix 2013-07-19 12:07:41 -04:00
Justice London
aeef0711bb Added split file support to location (for fastcgi) 2013-07-19 11:56:03 -04:00
Lebedev Vadim
a3a1d11400 * Add location priority option 2013-07-08 23:06:02 +04:00
Jon Morton
d401841279 Change custom_cfg to location_custom_cfg 2013-07-03 15:54:33 -05:00
Jon Morton
d83822810e Add support for locations with only custom directives 2013-07-03 01:47:49 -05:00
Jon Morton
063f6b5670 Move location params checks above template calls 2013-07-02 19:18:14 -05:00
do
e20b7d11c3 fixing boolean comparisons 2013-05-26 14:24:40 +02:00
Lebedev Vadim
a5ebd57b3b Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-05-21 18:41:44 +04:00
Lebedev Vadim
8d33fd63f1 Merge branch 'master' of https://github.com/jfryman/puppet-nginx 
Conflicts:
	manifests/config.pp
	manifests/init.pp
	manifests/params.pp
	manifests/resource/location.pp
	manifests/resource/vhost.pp
	manifests/service.pp
	templates/vhost/vhost_footer.erb
	templates/vhost/vhost_header.erb
	templates/vhost/vhost_location_directory.erb
	templates/vhost/vhost_location_proxy.erb
	templates/vhost/vhost_ssl_header.erb
	tests/vhost.pp
 2013-05-21 16:30:21 +04:00
Lebedev Vadim
4f0c311901 * Fixed listen parameter in template vhost_ssl_header 
* Added auth basic support
* Added vhost_cfg_append parameter to `nginx::resource::vhost`
 2013-05-20 18:30:32 +04:00
Sander Hoentjen
4bcb0993c1 linting 2013-05-08 14:15:42 +02:00
Lebedev Vadim
9672b7d345 * Get ssl key/cert with provided file-locations 
* Parameter index has now become optional
* Fix typos
 2013-04-16 20:12:32 +04:00
do
8fcc6adbf9 removing wrong boolean quoting 2013-04-13 13:50:10 +02:00
Lebedev Vadim
6defe17d0f Add proxy_cache parameters 
Fix puppet-lint
 2013-03-27 22:13:52 +04:00
Lebedev Vadim
23c5bf7a9e Merge branch 'master' of https://github.com/joejulian/puppetlabs-nginx 
Conflicts:
	manifests/resource/location.pp
	manifests/resource/vhost.pp
 2013-03-20 21:44:45 +04:00
Lebedev Vadim
74cfbe6c72 Add $nx_types_hash_max_size params 
Fix puppet-lint ERROR
 2013-03-16 13:34:07 +04:00
Joe Julian
39f848c4ad Rebase bashtoni's pull request from a year ago: 
https://github.com/puppetlabs/puppetlabs-nginx/pull/9
 2012-12-05 23:11:29 -08:00