Commit graph

1222 commits

Author SHA1 Message Date
James Fryman
3655f97078 Merge pull request #94 from ubc/fix-test
Remove GeoIP in spec to fix the tests
2013-07-21 04:12:23 -07:00
James Fryman
143d6122b1 Merge pull request #93 from ubc/fix-custom_cfg
Fix undefined method `sort_by' error from vhost_location_empty.erb
2013-07-21 04:11:34 -07:00
Lebedev Vadim
386026fda8 Adding option http_cfg_append to class nginx
Fix puppet-lint
2013-07-21 04:12:18 +04:00
Justice London
06f50454cb Small doc fix 2013-07-19 12:07:41 -04:00
Justice London
362dd85386 Added file definition to redhat package repo 2013-07-19 12:04:27 -04:00
Justice London
aeef0711bb Added split file support to location (for fastcgi) 2013-07-19 11:56:03 -04:00
Pan
1257cb3355 Add Hiera support
This supports creating resourses directly in Hiera for better separation of data
2013-07-18 15:10:12 -07:00
Pan
6ca7a8bd38 Remove GeoIP in spec to fix the tests
The GeoIP package has been removed from c01a7a8280 but not in tests
2013-07-18 14:46:27 -07:00
Pan
b6fb7ae54f Fix undefined method `sort_by' error from vhost_location_empty.erb
In the template, we should check if the variable is defined before use it
2013-07-18 14:36:56 -07:00
Justice London
acfdf04265 Added try_files to fastcgi 2013-07-17 19:29:49 -04:00
Justice London
f19a3b0a91 Lowered priority 2013-07-17 18:08:41 -04:00
Justice London
bdcad9a2ea Added priority to rhel 2013-07-17 18:01:52 -04:00
James Fryman
9c7712a190 Merge pull request #92 from leoc/master
Fix deprecated variable names
2013-07-17 12:27:21 -07:00
Arthur Leonard Andersen
0191a2fe28 Fix deprecated variable names 2013-07-17 20:42:57 +02:00
Michael Chapman
04c54170c7 Add index_files to location for vhost
This patch passes the index_files parameter
down from the vhost resource to its
associated location, where previsouly
it was ignored.
2013-07-13 15:28:49 +10:00
James Fryman
fc331e8173 Merge pull request #86 from abraham1901/master
Add location priority option
2013-07-09 07:22:14 -07:00
James Fryman
bf8851ee8b Merge pull request #87 from Jonanin/custom_cfg
Sort location_custom_cfg hash to prevent random ordering
2013-07-08 18:44:51 -07:00
Jon Morton
b3ea7b3170 Sort location_custom-cfg hash to prevent random ordering 2013-07-08 20:10:11 -05:00
Lebedev Vadim
a3a1d11400 * Add location priority option 2013-07-08 23:06:02 +04:00
James Fryman
8e34b31c2a Merge pull request #85 from abraham1901/master
Fixed log name  and better formatting
2013-07-08 08:09:50 -07:00
Lebedev Vadim
413271f84d * Fixed log name in template vhost_ssl_header
* Better formatting for vhost_autogen.conf
2013-07-08 18:58:05 +04:00
James Fryman
0ea33de6ac Merge pull request #84 from salekseev/feature/gpgcheck
Added gpgcheck to redhat yum repo configuration.
2013-07-07 18:33:21 -07:00
Stas Alekseev
b279978a32 Added gpgcheck to redhat yum repo configuration. 2013-07-05 10:56:38 -04:00
James Fryman
ca7d2dbd1d Merge pull request #83 from Jonanin/custom_cfg
Add support for fully custom location configurations.
2013-07-04 15:11:45 -07: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
James Fryman
44193003bc Merge pull request #81 from msiedlarek/master
Parameter server_tokens of nginx class is actually never used
2013-07-02 13:58:58 -07:00
Mikołaj Siedlarek
eed8a218bd actually using server_tokens in nginx class 2013-07-02 09:56:30 +02:00
James Fryman
ec17509cb7 Merge pull request #77 from igoraj/master
Changes to SSL and SPDY
2013-07-01 08:21:19 -07:00
Igor Ajdisek
8f49ffa775 vhosts_ssl_header.erb was missing access_log and error_log directives 2013-06-28 10:12:01 +02:00
Igor Ajdisek
e0e5757b55 Made SPDY a toggle param.
Added ssl_ciphers and ssl_protocols as params which default to values as proposed on nginx.org.
If SSL vhost then ssl is added to listen directive as proposed on nginx.org.
2013-06-27 15:42:38 +02:00
James Fryman
92fb4ae701 Merge pull request #75 from thaumazein/add-server-names-hash-bucket-size-param
Add server_names_hash_bucket_size param
2013-06-20 09:57:21 -07:00
James Fryman
c01a7a8280 Removing GeoIP Package from RH 2013-06-20 11:54:26 -05:00
Stefan Dorosz
179b1a4b5d Add server_names_hash_bucket_size param 2013-06-20 10:48:52 -04:00
James Fryman
73902bf8fb Merge pull request #72 from castiel/master
Gentoo support
2013-06-18 19:33:07 -07:00
Mark Burazin
72189931d3 Gentoo package 2013-06-17 11:11:26 +02:00
Mark Burazin
a43301d950 Gentoo OS added 2013-06-17 11:03:00 +02:00
James Fryman
fd6694c3a4 Merge pull request #69 from boldpi/typo-fix
Removed various puppet-lint warnings and fixed a typo
2013-06-13 10:40:59 -07:00
Maarten Dirkse
7714251f67 Removed various puppet-lint warnings and fixed a typo 2013-06-13 18:51:33 +02:00
Carlos Sanchez
d82c71ae7f Update Modulefile with current data 2013-06-05 19:40:31 +02:00
James Fryman
96af4c84af Delete Chapter 1 - The haunting Beginning.md 2013-06-05 12:22:19 -05:00
James Fryman
e36734c484 Merge pull request #67 from maestrodev/specs
Add specs using puppetlabs_spec_helper and librarian-puppet
2013-06-05 10:21:57 -07:00
Carlos Sanchez
a65355ef53 Add specs using puppetlabs_spec_helper and librarian-puppet 2013-06-05 18:35:34 +02:00
James Fryman
48370340b8 Merge pull request #63 from zoide/e20b7d11c3bea3aab515527d143e707f800783b6
Fixing boolean comparisons
2013-05-29 09:11:30 -07:00
do
e20b7d11c3 fixing boolean comparisons 2013-05-26 14:24:40 +02:00
James Fryman
f0323576fc Merge pull request #59 from abraham1901/master
Fixed errors and implemented new functions
2013-05-21 07:46:10 -07:00
Lebedev Vadim
a5ebd57b3b Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-05-21 18:41:44 +04:00
Lebedev Vadim
d7cdd68c63 Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-05-21 17:15:59 +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