Commit graph

1222 commits

Author SHA1 Message Date
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
Arthur Leonard Andersen
6934271b85 Use correct port for www rewrite 2013-09-03 23:42:16 +02:00
James Fryman
43d2e86a20 Merge pull request #123 from jhoblitt/sort_vhost_cfg_append
sort $vhost_cfg_append hash in vhost_footer.erb template
2013-09-03 08:08:20 -07:00
James Fryman
7cef7927a9 Merge pull request #125 from theospears/patch-1
Fix typo in vhost_header
2013-09-03 07:53:29 -07:00
James Fryman
28309b6556 Merge pull request #122 from blkperl/update_readme
Update README to use syntax highlighting
2013-09-03 07:22:31 -07:00
Theo Spears
2170297c87 Fix typo in vhost_header 2013-08-31 19:09:58 +01:00
Joshua Hoblitt
df4243491e sort $vhost_cfg_append hash in vhost_footer.erb template
This is so the paremter ordering in the configuration is stable. It also
force the :allow key (if it exists) to be first in the sort ordering.
It would probably be better to change `$vhost_cfg_append` into an array
of one key hashes but would require a public API change.
2013-08-28 10:14:13 -07:00
William Van Hevelingen
503fd9564b Remove empty README file 2013-08-25 22:27:16 -07:00
William Van Hevelingen
3f3ed9be6a Update README to use syntax highlighting 2013-08-25 22:21:53 -07:00
James Fryman
b13957c27d bumping to v0.0.5, fixing array bug 2013-08-25 18:17:52 -05:00
James Fryman
f8642b338f Merge pull request #121 from abraham1901/master
* Bug fix, remove each_line method
2013-08-25 16:17:10 -07:00
Lebedev Vadim
1efc72b53a * Bug fix, remove each_line method 2013-08-23 12:58:43 +04:00
Tom Booth
af7ceb0eec Give key's group permission to read 2013-08-22 22:13:53 +01:00
Lebedev Vadim
82e5f474d7 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2013-08-23 01:08:40 +04:00
Lebedev Vadim
15519e7eef Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev
Conflicts:
	manifests/package/redhat.pp
	templates/vhost/vhost_footer.erb
	templates/vhost/vhost_header.erb
2013-08-23 01:07:53 +04:00
James Fryman
d1aef6e718 bump to 0.0.4 2013-08-22 15:52:10 -05:00
James Fryman
bd57348454 Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-08-22 15:44:51 -05:00
James Fryman
e1aa65d20c Manual merge of https://github.com/jfryman/puppet-nginx/pull/100 2013-08-22 15:44:25 -05:00
James Fryman
41591a36ff Merge pull request #99 from jhoblitt/select_package_by_osfamily
update nginx::package to select the package class by $::osfamily
2013-08-22 13:41:40 -07:00
James Fryman
b246c13285 Merge pull request #104 from stephenrjohnson/vhost_template_cleanup
fix template, should use @
2013-08-22 13:39:59 -07:00
Joshua Hoblitt
8a1981f640 update nginx::package to select the package class by $::osfamily
There were some bugs in the existing $::operatingsystem based approach.

* amazon was it's own package set when it's properly part of $::osfamily ==
'redhat' as of facter >= 1.7.2

* gentoo was improperly part of the amazon package set; this patch removes
support for gentoo but it was broken anyways

modifications to nginx:📦:redhat were made as well

* it no longer tries to setup the nginx.org yumrepo for fedora as no packages
for fedora are currently provided

* amazon release numbers are inconsistent with EL.  Unknown
$::lsbmajdistrelease values are now mapped to 6 so it's no longer nessicary to
test for $::lsbmajdistrelease being undefined.  This logic will need to be
reworked after RHEL7.x is released.

* the url to the nginx repo was including $::operatingsystem in it but
nginx.org only has package dirs for 'rhel' & 'centos' which are presently
identical; the usage of the 'rhel' dir has been hardcoded.  This fixes broken
yum repo setup for all $::osfamily == 'redhat' platforms other than redhat and
centos.
2013-08-22 13:32:54 -07:00
James Fryman
f98feea476 Merge pull request #114 from helldorado/master
Please reconsidere my pull request: Fix syntax "each" for ruby1.9 => each_line and add listen_port on rewrite_www_to_non_www
2013-08-22 13:22:41 -07:00
root
eb73601aac Fix puppet-lint 2013-08-22 23:23:16 +04:00