Commit graph

1241 commits

Author SHA1 Message Date
James Fryman
8997529a6c Bumping version: Bugfixes 2013-08-04 17:06:09 -05:00
James Fryman
c534763c64 Merge pull request #107 from ubc/fix-wildcard-cert
Fix #106 when using wildcard certificate on multiple vhosts
2013-08-04 14:59:25 -07:00
Pan
126fb413ea Fix #106 when using wildcard certificate on multiple vhosts 2013-08-04 14:54:41 -07:00
James Fryman
d15509e6cd Merge pull request #97 from justicel/master
Fixed RHEL package install and added some fastcgi options
2013-08-04 11:27:06 -07:00
Justice London
6911b91f9e Merge branch 'master' of https://github.com/jfryman/puppet-nginx into jfryman-master
Conflicts:
	templates/vhost/vhost_location_fastcgi.erb
2013-08-02 13:07:53 -04:00
James Fryman
fd4e3c5a37 Merge pull request #101 from adambrenecki/fix-ssl-config
auth_basic lines appearing in SSL vhost header when they shouldn't
2013-08-01 10:27:22 -07:00
James Fryman
b384339fa2 Merge pull request #103 from abraham1901/dev
Some changes have been made
2013-08-01 10:26:59 -07:00
James Fryman
1ca6a64f29 bumping to v0.0.2 2013-08-01 10:15:47 -07:00
James Fryman
1e91fdb9a3 Merge pull request #68 from maestrodev/forge
Push to forge
2013-08-01 10:09:48 -07:00
Lebedev Vadim
49b5b79b76 * Option fastcgi_script fixed
* Options location_cfg_append and location_cfg_prepend added to fastcgi template
* Option www_root is optional now
* Options logging fixed in http template
* Auth_basic fixed in SSL vhost header
2013-08-01 01:07:59 +04:00
Lebedev Vadim
5522f27d9b * Option fastcgi_script fixed
* Options location_cfg_append and location_cfg_prepend added to fastcgi template
* Option www_root is optional now
* Options logging fixed in http template
2013-08-01 00:56:32 +04:00
Adam Brenecki
58f2d2f7fc Fix erroneous auth_basic lines in SSL vhost header 2013-07-29 14:14:33 +09:30
James Fryman
4f5ea94b46 Merge pull request #98 from mnencia/patch-1
Inverted condition for IPv6 warning
2013-07-26 03:06:57 -07:00
Marco Nenciarini
e104fc5a89 Inverted condition for IPv6 warning
If $ipv6_enable is true ypu sshould warn the user only if the machine _doesn't have_ an ip address.

At the moment the warning is raised when ipv6 is configured properly
2013-07-26 10:15:55 +02:00
Justice London
30e9773aeb Merge pull request #1 from jfryman/master
Merging upstream changes
2013-07-25 09:51:45 -07:00
James Fryman
17d1edaf74 Merge pull request #96 from abraham1901/dev
Adding option http_cfg_append to class nginx
2013-07-21 11:30:02 -07:00
Lebedev Vadim
ae9303233c Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev
Conflicts:
	manifests/init.pp
2013-07-21 19:40:29 +04:00
James Fryman
a552e6b25a Merge pull request #90 from michaeltchapman/vhost_index
Add index_files to location for vhost
2013-07-21 04:33:04 -07:00
James Fryman
7b082fa823 Merge pull request #95 from ubc/hiera-support
Add Hiera support
2013-07-21 04:16:13 -07:00
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