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

288 commits

Author SHA1 Message Date
Jan Örnstedt
7938f05d18 Whitespace fix. 2014-02-12 10:01:22 +01:00
Jan Örnstedt
9bb83dd426 Cut and paste error. Removed debian from solaris case. 2014-02-12 09:19:01 +01:00
Jan Örnstedt
75d1478b37 Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2014-02-11 09:03:34 +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
James Fryman
d2f7f1403d Merge pull request #254 from cdenneen/master 
Added vhost ssl prepend and append
 2014-02-10 09:45:09 -06:00
cdenneen
408b0c8b12 Update vhost.pp 2014-02-07 18:40:52 -05:00
Peter Rhoades
4b807acbef Checks $caller_module_name is defined 
[See #240]
 2014-02-06 22:21:19 +00: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
Jan Örnstedt
4a0a857a38 Added basic support for nginx on Solaris. 2014-01-30 16:41:44 +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
2252d96fe8 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2014-01-21 15:22:19 +04:00
Lebedev Vadim
26cf99c8e4 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2014-01-17 20:08:56 +04:00
Maurits Landewers
e36aa73b6e Make gzip configurable 2014-01-17 10:29:56 +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
Slava Semushin
643e803298 manifests/conf.pp: fixed a typo in error message. 2014-01-14 14:46:26 +03: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
Nathan Sullivan
70256dcb2a improved version of support for server_names_hash_bucket_size and server_names_hash_max_size for https://github.com/jfryman/puppet-nginx/pull/178 - also a few puppet-lint fixes 2014-01-10 13:42:16 +10:00
James Fryman
7086aea8c0 Merge pull request #228 from PierreR/patch-1 
Fix multi-line comment indentation
 2014-01-08 08:40:25 -08:00
Pi3r
d26d9a41a8 Fix multi-line comment indentation 
`puppetresources` is complaining about the wrong indentation scheme.
 2014-01-08 15:46:56 +01:00
Matthew Haughton
2a82028a7b warn on inclusion of nginx:📦:suse 2014-01-07 23:16:54 -05:00
Matthew Haughton
5309136fc8 warn on inclusion of nginx:📦:redhat 2014-01-07 23:16:54 -05:00
Matthew Haughton
d7800f44ee warn on inclusion of nginx:📦:debian 2014-01-07 23:16:54 -05:00
Matthew Haughton
e2eba1dbe9 warn on inclusion of nginx::service 2014-01-07 23:16:54 -05:00
Matthew Haughton
2f36def38a warn on inclusion of nginx::params 2014-01-07 23:16:54 -05:00
Matthew Haughton
2fb7072e6e warn on inclusion of nginx::package 2014-01-07 23:16:54 -05:00
Matthew Haughton
ac8c74d78b warn on inclusion of nginx::config 2014-01-07 23:16:54 -05: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
5a9767dcd8 validations for nginx::init 2014-01-07 22:17:03 -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
486d03b685 required to remove unused file fragments from /tmp 2013-12-02 13:54:02 -05:00
Matthew Haughton
684fafc559 Remove the now unused file fragments from /tmp 2013-12-02 13:53:10 -05: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
eb31df40d6 Remove vhost and mailhost vhost_autogen.conf 
Don't generate it anymore, and remove any existing file from
people's systems
 2013-11-30 21:24:55 -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
James Fryman
8691db1c83 Merge pull request #188 from 3flex/rspec-tests 
Rspec tests (and fixes)
 2013-11-22 09:27:53 -08:00
James Fryman
abc3093188 Merge pull request #183 from drfeelngood/nx_daemon_user_for_oracle_linux 
Update params to account for oracle linux.
 2013-11-22 09:27:22 -08: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
c8d9ad5680 only ensure yum repo file when yum repo created 2013-11-21 22:40:05 -05:00
Matthew Haughton
4204dc908b Revert "Update vhost.pp" 
This reverts commit 5ee2f65.

Fixes #186
 2013-11-21 22:23:44 -05:00
drfeelngood
9c787d92bf Updated params to account for oracle linux. 
We should analyze the $::osfamily fact to define $nx_daemon_user.  Support for
$::operatingsystem remains but is greeted with a deprecation warning that
suggests upgrading to factor >= 1.7.2.

Corrected spec failures in redhat.pp when evaluating an undef
$::lsbmajdistrelease.  Now the variable must be defined before comparison.
 2013-11-18 18:38:07 -06: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
Michael G. Noll
291d5d2532 Fix RHEL installation support 2013-10-16 16:32:14 +02:00
Franz Pletz
3edc7ad4ac Fix dependency problems with APT repo handling 
The first issue was that Exec[apt_get_update_for_nginx] resource is only
needed if $manage_repo == true, so it was put inside the corresponding
if block.

But even inside the if-block, Exec[apt_get_update_for_nginx] could fail
when $package_source has an invalid value and no Apt::Source[nginx] is
defined, so the respective Apt::Source[nginx], if defined, will now notify
Exec[apt_get_update_for_nginx] and Exec[apt_get_update_for_nginx] will
no longer subscribe to Apt::Source[nginx].

It would probably make sense to add a call to fail() in the default case
of $package_source.
 2013-10-09 05:17:33 +02:00
Ronen Narkis
a54f7ad762 clearing miss placed line 2013-10-08 18:20:33 +03:00
Ronen Narkis
f54031f842 fixing broken merge 2013-10-08 15:42:12 +03:00
James Fryman
7ea6b570c3 Merge branch 'disable-yum-repo-management' of github.com:rytis/puppet-nginx into rytis-disable-yum-repo-management 
Conflicts:
	manifests/init.pp
	manifests/package.pp
	manifests/params.pp
 2013-10-07 14:46:42 -05:00
Tomas Barton
303efc634d fixed calling out of scope variables 2013-10-07 16:27:17 +02:00
Rytis Sileika
b6ee1e5973 Added param to package.pp to explicitly specify whether or not repository should be managed 2013-10-07 13:36:39 +00:00
Tomas Barton
6ab27d00b1 ensure_resource instead of !defined 2013-10-03 20:53:36 +02: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
Tomas Barton
e3ce014354 support for nginx passenger debian repositories 2013-09-27 14:48:51 +02:00
Rytis Sileika
9db6a82ad1 Added class param to disable YUM repo management on RedHat platforms 2013-09-26 13:32:59 +00: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
James Fryman
741f5432b3 Merge pull request #134 from apenney/apt 
Switch to using puppetlabs-apt
 2013-09-06 08:43:56 -07:00
Omar Z
4da3e46207 added proxy_buffer_size with default value of 8k 2013-09-05 23:15:45 +01:00
Omar Z
53b4986b5d make proxy_buffers configurable 2013-09-05 22:57:50 +01:00
Omar Z
08c815d01e Merge remote-tracking branch 'upstream/master' 2013-09-05 22:27:59 +01: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
46a17f97c5 Refactor to use puppetlabs-apt. 
This is just the first step of fixing up the repo stuff and allowing
the module to take in a package_name, but this helps replace the
execs{} with puppetlabs-apt.

Tested on:  Debian 7, Ubuntu 12.04.
 2013-09-04 17:57:41 -04:00
Ashley Penney
531e523b0a Weird invalid characters in this comment. 2013-09-04 17:27:58 -04:00