Commit graph

667 commits

Author SHA1 Message Date
James Fryman
8218c59d70 Merge pull request #295 from abraham1901/dev
Fix cert sanitized and add some options
2014-04-15 09:50:51 -05:00
James Fryman
c6857086fa Merge pull request #298 from pennycoders/master
Fix cannot generate tempfile error
2014-04-14 11:40:40 -05:00
James Fryman
5ce606cbb0 Merge pull request #296 from radford/avoid-global-root
Stop using $root from upper scopes
2014-04-14 11:37:08 -05:00
Lebedev Vadim
7b33e458a9 * fix 2014-04-13 13:26:25 +04:00
Alex
0e27ce101e Use md5 hash for the location temp files 2014-04-13 05:29:20 +03:00
Alex Pica
d4da8f8eff Use md5 for location concat filenames 2014-04-13 05:12:19 +03:00
Lebedev Vadim
19acfe0356 Add option proxy_connect_timeout
Bug fix
2014-04-12 23:17:45 +04:00
Jim Radford
60a9a823b4 Stop using $root from upper scopes 2014-04-11 15:12:54 -07:00
Lebedev Vadim
e1bcb3e2cb Remove duplicate location_allow & location_deny 2014-04-11 23:36:15 +04:00
Lebedev Vadim
3721ce1194 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev
Conflicts:
	manifests/package/debian.pp
2014-04-11 23:16:53 +04:00
James Fryman
e87864b7f9 Merge pull request #293 from dol/feature/add-hiera-resource-mailhost
Added nginx::resource::mailhost to be configured via hiera
2014-04-11 12:09:42 -05:00
Lebedev Vadim
2f20bcc2b0 Remove trailing whitespaces 2014-04-11 20:04:24 +04:00
Lebedev Vadim
f3bebdff28 Added options to vhost:
format_log
location_custom_cfg_prepend
location_custom_cfg_append
2014-04-11 19:55:16 +04:00
Lebedev Vadim
819e92dd36 Fixed cert name sanitized 2014-04-11 19:47:19 +04:00
Lebedev Vadim
24c93968b3 Added location_allow & location_deny to fastcgi location 2014-04-11 19:43:54 +04:00
James Fryman
20a7ea01b1 Merge pull request #289 from b4ldr/master
Add additional config to the locations resource and fix set_header in vhost resource
2014-04-09 12:13:11 -05:00
John Bond
1b7ac9ab43 Add additional config to the locations section of config
Following parameters where added to the location resourse.  These
already existsed in the vhost resource so the same logic and defaults
where used
  * proxy_set_header
  * proxy_connect_timeout
  * proxy_redirect
2014-04-09 17:48:32 +02:00
Dominic Luechinger
43a5e7d6ff Added nginx::resource::mailhost to be configured via hiera
There is a slight chance the SSL 'concat::fragment' of the mailhost and
virtualhost are get in the way, if the name is declared the same.
2014-04-08 00:36:36 +02:00
James Fryman
e95a3abd46 Merge pull request #282 from genehand/master
Make proxy_redirect configurable
2014-04-06 09:42:49 -05:00
James Fryman
259a363b6f Merge pull request #287 from justinhennessy/jh_fix_lint_issues
Fixed lint errors
2014-04-06 09:34:29 -05:00
James Fryman
b0efd27ae0 Merge pull request #290 from pderaaij/master
Add configuring multiple resolvers via an array instead of a string
2014-04-06 09:14:21 -05:00
James Fryman
e20a343a7a Merge pull request #285 from TracyWebTech/master
Removing default.conf and example_ssl.conf
2014-04-03 09:37:52 -05:00
Paul de Raaij
1fbfe531b7 Add configuring multiple resolvers via an array instead of a string 2014-04-03 11:59:47 +02:00
Justin Hennessy
885b85ee6c Fixed lint issue 2014-03-30 21:41:34 +10:00
Justin Hennessy
acc093db32 Fixed lint errors 2014-03-30 21:23:43 +10:00
Sergio Oliveira
940bf427ab Removing default.conf and example_ssl.conf 2014-03-28 09:37:49 -03:00
James Fryman
5e5f9d2ec7 Merge pull request #284 from CpuID/master
allow setting custom priority before and after default SSL priority
2014-03-28 07:27:25 -05:00
Nathan Sullivan
8160de83ac allow setting custom priority before and after default SSL priority 2014-03-28 17:20:15 +10:00
James Fryman
52f80a86cb bump to 0.0.9 2014-03-27 17:46:23 -05:00
James Fryman
cdbcca6661 Merge pull request #283 from jfryman/remove-deprecation-warnings
Remove Deprecation Warnings
2014-03-27 17:40:04 -05:00
James Fryman
364e2865aa Update suse.pp 2014-03-27 16:54:05 -05:00
James Fryman
338d3d8b2f Update redhat.pp 2014-03-27 16:53:51 -05:00
James Fryman
94ad2f3267 Update debian.pp 2014-03-27 16:53:41 -05:00
James Fryman
28018f5d35 Update service.pp 2014-03-27 16:52:40 -05:00
James Fryman
6a425e4365 Update params.pp 2014-03-27 16:52:26 -05:00
James Fryman
04520c7692 Update package.pp 2014-03-27 16:52:12 -05:00
James Fryman
c3646689f6 Update config.pp 2014-03-27 16:50:54 -05:00
Gene Hand
ea6129bf98 Make proxy_redirect configurable 2014-03-27 14:12:18 -07:00
James Fryman
ac0f4ca940 Merge pull request #280 from ok-devalias/master
SmartOS support
2014-03-24 17:15:13 -05:00
Joshua Moore
61dd9cd686 Deleted ruby 1.8.7 tests support 2014-03-24 17:21:33 -04:00
Joshua Moore
64047f42fb SmartOS support 2014-03-24 17:14:32 -04:00
Joshua Moore
6fe431f698 SmartOS support 2014-03-24 17:07:38 -04:00
James Fryman
53e9fe5e20 Merge pull request #281 from Mayflower/allow_deny_fastcgi
Add allow/deny rules to fastcgi template
2014-03-24 13:44:27 -05:00
Joshua Moore
3bc96ed8e4 Merge remote-tracking branch 'upstream/master' 2014-03-23 11:28:33 -04:00
Robin Gloster
08d46d02cb Add allow/deny rules to fastcgi template 2014-03-22 01:23:38 +01:00
Joshua Moore
8ee7964d2b Replaced ::operatingsystem with ::kernelversion 2014-03-20 18:00:56 -04:00
James Fryman
b6b7accb5c 0.0.8 release 2014-03-20 14:10:44 -05:00
Joshua Moore
c23e0ce7af conditionals for nx_conf_dir and SmartOS nx_daemon_user 2014-03-20 11:42:18 -04:00
Joshua Moore
bbf820c09e Replaced hardcoded values with scopelookup 2014-03-20 11:40:40 -04:00
James Fryman
aa89b20f98 Merge pull request #272 from DracoBlue/custom-template
Make template for nginx.conf.erb configurable
2014-03-19 11:21:48 -05:00