Commit graph

494 commits

Author SHA1 Message Date
Matthew Haughton
a24e160024 fix specs for PR #158 2013-10-20 21:28:15 -04:00
Matthew Haughton
ad8c66a065 fix specs to cater for PR #162 2013-10-20 21:27:15 -04:00
Matthew Haughton
354a68ef63 validate all arrays 2013-10-20 17:58:25 -04:00
Matthew Haughton
89be74c6e5 add travis config 2013-10-19 23:25:07 -04:00
James Fryman
59cf9148c2 Merge pull request #162 from jfryman/sanitize_vhost_location
Regex replace / in resource::vhost
2013-10-19 15:54:57 -07:00
James Fryman
8845838390 regex replace / in resource::vhost Fixes #102 2013-10-19 15:55:52 -05:00
James Fryman
a2083e433f Merge pull request #158 from miguno/master
Fix RHEL installation support
2013-10-16 09:46:23 -07:00
Michael G. Noll
291d5d2532 Fix RHEL installation support 2013-10-16 16:32:14 +02:00
James Fryman
65465b24a3 Merge pull request #155 from fpletz/fix/apt-dependency-breakage
Fix dependency problems with APT repo handling
2013-10-08 20:46:22 -07: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
James Fryman
d2877413f3 Merge pull request #151 from deric/readme-passenger
Added example of passenger usage
2013-10-08 10:15:44 -07:00
James Fryman
8989d56dee Merge pull request #154 from narkisr/master
Fixing broken merge
2013-10-08 10:07:12 -07: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
Tomas Barton
e8c2a92070 Added example of passenger usage 2013-10-08 10:20:57 +02: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
James Fryman
c314aa6e36 Merge pull request #145 from deric/master
support for nginx passenger debian repositories
2013-10-07 12:42:00 -07: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
4e41871dac fixed acces to vhost_cfg_append via instance variable 2013-09-30 00:46:17 +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
James Fryman
315d7e109f Merge pull request #120 from abraham1901/dev
Aggregated some PR & tested & simple bug fix & add new option
2013-09-15 17:29:56 -07:00
James Fryman
6f2eb74558 Merge pull request #140 from alanpearce/patch-1
Fix deprecated variable access warning in vhost footer template
2013-09-15 17:26:14 -07:00
James Fryman
4cf2406459 Merge pull request #141 from vrillusions/stub-status-line-endings
Fix stub_status location so it has line breaks.
2013-09-15 17:25:55 -07:00
Todd Eddy
9252351986 Fix stub_status location so it has line breaks. 2013-09-14 04:24:01 -04:00
Alan Pearce
05c260a963 Fix deprecated variable access warning in vhost footer template 2013-09-13 15:29:50 +01: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
James Fryman
96c9305035 Merge pull request #139 from OmarzT/master
make proxy_buffers, proxy_buffer_size, client_max_body_size configurable
2013-09-06 08:19:47 -07:00
Omar Tamer
b384727314 Merge pull request #1 from OmarzT/configurable_parms
added proxy_buffer_size with default value of 8k
2013-09-06 03:32:41 -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
Lebedev Vadim
4f27265047 remove each_line 2013-09-05 11:43:44 +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
James Fryman
2df378ef05 Merge pull request #131 from apenney/allow-deny
location_allow and location_deny support.
2013-09-04 13:05:58 -07:00
James Fryman
4e7a4531aa Merge pull request #133 from apenney/system
Add basic rspec-system tests.
2013-09-04 13:04:37 -07:00
James Fryman
7262d25c94 Merge pull request #132 from apenney/package-version
#66: This commit allows you to set package_ensure in nginx and have that
2013-09-04 13:03:46 -07:00
Ashley Penney
52e6aa49c7 Add basic rspec-system tests.
This adds some really basic system tests so that we can test that
various refactorings work correctly and make life easier for you
before submitting.
2013-09-04 15:11:36 -04:00
Ashley Penney
8ddc6f6ccf This commit allows you to set package_ensure in nginx and have that
trickle through to the package classes.  I've avoided making them
into paramaterized classes and we just refer directly back to the main
nginx namespace to get the variable.  Makes for a cleaner looking
module!
2013-09-04 13:29:30 -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
Omar Tamer
fda2969c20 make client_max_body_size configurable 2013-09-04 17:37:18 +01:00