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

212 commits

Author SHA1 Message Date
Lee Packham
2a5e81feb5 Revert "Added ngnix::resources::upstream::member" 
Upstream members can no longer be exported and collected.

The change in #331 was fundamentally broken. I have therefore reverted
it as it shouldn't of been merged.

Essentially you can't use ensure with this change - meaning you can no
longer REMOVE an nginx config from the system - which is part of the
tests and also sane module practice.

The idea was nice - but the implementation broke things. This reverts
back to a good state, without modifying any tests where tests pass again
with the recent commits.

This reverts commit ebf3e4e58e.
 2014-06-12 10:08:59 +01: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
6107c768f1 Merge pull request #331 from rainopik/master 
Upstream members can be exported and collected
 2014-06-11 12:12:23 -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
Kimo Rosenbaum
2500373416 Keep style consistent 2014-06-09 15:49:58 -07:00
Kimo Rosenbaum
5495bd2617 Allow format_log in ssl as well 2014-06-09 15:49:33 -07:00
Rain Öpik
aa12db0961 Fix typo in doc 2014-06-06 22:25:41 -04:00
Rain Öpik
ebf3e4e58e Added ngnix::resources::upstream::member. Upstream members can now be exported and collected. 2014-06-06 21:56:29 -04:00
Jan Örnstedt
526620183d Added daemon_user as a parameter. 2014-06-05 00:00:41 +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
ba72229437 Replaced params references with config. 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
Steffen Zieger
7b80b1a3c6 make ssl listen option configurable 2014-06-02 00:23:07 +02:00
Steffen Zieger
cb190e2c6d Fix error message if ssl_cert/ssl_key is not set. 2014-05-29 15:23:57 +02: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
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
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
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
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
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
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
Markus Rekkenbeil
8cc32d4076 Bugfix: Add missing parameter for location template 2014-02-10 18:45:34 +01:00
Markus Rekkenbeil
971e1a7692 Update vhost_location documentation and template 2014-02-10 18:14:18 +01:00
cdenneen
408b0c8b12 Update vhost.pp 2014-02-07 18:40:52 -05:00
James Fryman
26a856e338 Merge pull request #248 from PierreR/patch-1 
Avoid creating undef variable
 2014-02-06 08:59:19 -06:00
Tristan Helmich
15a2695442 Move ipv6only=on option from template into puppet 
See jfryman#30
 2014-02-03 12:54:44 +01:00
Pi3r
27a6fd7532 Avoid creating undef variable 2014-02-01 19:33:49 +01:00
James Fryman
eeb0830b7f Merge pull request #246 from inflection/add_client_max_body_size 
Adding client_max_body_size.
 2014-01-28 13:08:28 -08:00
James Fryman
8b29715179 Merge pull request #171 from thomasbiddle/upstream_fail_timeout 
Adding upstream fail_timeout.
 2014-01-28 12:57:14 -08:00
TJ Biddle
52b124e505 Adding client_max_body_size. 2014-01-28 12:52:56 -08: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
545056cb1a validations for nginx::resource::upstream 2014-01-07 23:16:54 -05:00
Matthew Haughton
10a1691b9e validations for nginx::resource::mailhost 2014-01-07 23:16:54 -05:00
Matthew Haughton
d683fae9ff validations for nginx::resource::vhost 2014-01-07 23:16:52 -05: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
Matthew Haughton
0b93c0cebe Fix "invalid byte sequence in UTF-8" errors 2013-12-30 13:03:55 -05:00
Harry Danes
1d90dacfb3 Merge commit '96475098ebd4fba7dd951efcee1c6ee38b2935a9' into ssl_dhparam 
Conflicts:
	manifests/resource/vhost.pp
 2013-12-30 18:33:53 +01:00
Harry Danes
d0c3168592 Implementation of the resolver parameter. 2013-12-29 15:48:32 +01:00
Harry Danes
1aff2eabcb Implementation for the ssl_stapling_* parameters. 2013-12-29 15:39:21 +01:00
Harry Danes
3db6a726cb Add support for Diffie-Hellman parameters in VHOST resource. 2013-12-27 09:10:11 +01:00
Lebedev Vadim
611c80f75e Fixed the ability to disable the index_files 2013-12-25 04:13:22 +04:00
Lebedev Vadim
658b25fe30 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2013-12-25 02:40:22 +04:00
Lebedev Vadim
fc6d66fa0b Fixed location containing '\', such as '~ \.php$' 2013-12-25 02:36:01 +04:00
James Fryman
7d1540b3bb Merge pull request #208 from hdanes/add_header 
Add the possibility to add a header to the HTTP response
 2013-12-24 10:50:29 -08:00
Harry Danes
e0b8cb5f3f Implemented input validation - type hash - for the (optional) add_header parameter. 2013-12-24 19:47:15 +01:00
Lebedev Vadim
d9d77837e8 Fixed long names virtual hosts, such as nginx::resource::vhost { 'name1.domainname.org name2.domainname.org': } 2013-12-24 21:22:32 +04:00
Harry Danes
fcf11a8b18 Add the possibility to add a header to the HTTP response when response code is equal to 200, 204, 301, 302 or 304. 2013-12-24 13:07:58 +01:00
Daniel Black
520eb23ffd index_files to be defined at server level if specified in resource::vhost 
This partially avoids pitfall #2 (http://wiki.nginx.org/Pitfalls)
 2013-12-19 09:07:56 +10: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
Markus Rekkenbeil
b7986f3dc3 Add nginx::vhost option 'autoindex' 
Signed-off-by: Markus Rekkenbeil <markus@bionix-it.de>
 2013-12-12 17:27:29 +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
a9c445b3f9 Remove unused code in vhost 2013-12-02 13:50:22 -05:00
Matthew Haughton
0e1d4adbd5 Remove unused code in mailhost 2013-12-02 13:49:47 -05:00
Matthew Haughton
d849c31c35 switch location resource to concat pattern 2013-11-30 21:24:55 -05:00
Matthew Haughton
753283286f switch vhost resource to concat pattern 
Also uses sites-available/enabled pattern for config files
 2013-11-30 21:24:50 -05:00
Matthew Haughton
2023ca1d6d switch mailhost resource to concat pattern 2013-11-30 21:21:40 -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
8292be0748 set required variables before template declared 
correctly sets www_root in the vhost_header template
 2013-11-21 23:23:45 -05:00
Matthew Haughton
4204dc908b Revert "Update vhost.pp" 
This reverts commit 5ee2f65.

Fixes #186
 2013-11-21 22:23:44 -05:00
Vadim Lebedev
5ee2f654fb Update vhost.pp 
bug fix. 
User priority for location 400-499, 501-599.
Header should have a priority lower than the others.
 2013-11-18 08:45:27 -08:00
TJ Biddle
3536069f16 Adding upstream fail_timeout. 2013-10-29 11:55:40 -07: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
Tomas Barton
82ce9223a9 possibility to disable default location 2013-09-29 20:53:25 +02:00
Tomas Barton
2cc0a2fcf0 support ssl_cache and for passenger cgi params 2013-09-29 20:36:19 +02:00
Lebedev Vadim
20a37a220f Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 
Conflicts:
	manifests/config.pp
	manifests/resource/location.pp
 2013-09-08 16:50:16 +04:00
James Fryman
30d62246b2 Merge pull request #119 from alphagov/fix-permissions 
Fix SSL cert and key permissions
 2013-09-06 08:47:41 -07:00
James Fryman
59106eae7c Merge pull request #128 from leoc/fix-www-rewrite-port 
Use correct port for www rewrite
 2013-09-06 08:44:49 -07: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
531e523b0a Weird invalid characters in this comment. 2013-09-04 17:27:58 -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
Arthur Leonard Andersen
6934271b85 Use correct port for www rewrite 2013-09-03 23:42:16 +02:00
Tom Booth
af7ceb0eec Give key's group permission to read 2013-08-22 22:13:53 +01:00
root
eb73601aac Fix puppet-lint 2013-08-22 23:23:16 +04:00
root
f609f9601d Adding option http_cfg_prepend to class nginx 2013-08-22 23:02:04 +04:00
root
7ae4d3446c Merge branch 'user-defined-vhost-logs' of https://github.com/vrillusions/puppet-nginx into dev 2013-08-22 17:05:10 +04:00
Tom Booth
d149c43936 Fix SSL cert and key permissions 
It is bad practice to use 644 on a private key so we
have migrated the key mode to 0400. The cert is already
avaliable publicly through nginx so we have allowed it
0444.

Nothing should need to write either the cert of the key
after puppet has run, so we have denied any writing.
 2013-08-21 16:29:31 +01:00
Vikraman
b20b616bed Fix the error 'You cannot specify more than one of content, source, target' 
I get the above error message. It is easily fixed by removing the `ensure` inside `ensure_resource`, since `ensure_resource` should already be setting `$ensure` to `file`.
 2013-08-11 12:15:26 +05:30
Todd Eddy
8cb8a31ade Removed path checking to allow additional logging options. 2013-08-07 10:19:46 -04:00
Todd Eddy
c6cd476c82 Add custom logs to ssl vhosts as well. 2013-08-07 09:59:44 -04:00