Commit graph

784 commits

Author SHA1 Message Date
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
James Fryman
a0c565fa2b Merge pull request #278 from jfroche/concat-ensure
fix missing ensure on concat::fragment resources
2014-03-19 10:25:31 -05:00
James Fryman
ff76e4f055 Merge pull request #277 from jfroche/patch-1
remove unknown parameter
2014-03-19 10:22:26 -05:00
James Fryman
8173432d82 Merge pull request #266 from ese/master
Allow values to be hashes at prepend,append,custom cfg for locations
2014-03-19 09:54:17 -05:00
James Fryman
ebf8daafc2 Merge pull request #276 from grooverdan/patch-2
Update README.markdown - set minimium ruby version
2014-03-19 09:53:33 -05:00
Jean-François Roche
4618ab180e fix missing ensure on concat::fragment resources 2014-03-18 13:35:57 +01:00
Jean-François Roche
e0f716b0cf remove unknown parameter
The parameter nginx::params::nx_tcp_nopush is never defined.
2014-03-18 11:21:14 +01:00
Daniel Black
28eda7071b Update README.markdown
Set minimum version as per #266
2014-03-18 07:49:28 +11:00
James Fryman
15506a5f98 Merge pull request #275 from gini/worker_rlimit_nofile
New parameter worker_rlimit_nofile
2014-03-17 12:54:07 -05:00
James Fryman
e59468a71f Merge pull request #264 from welterde/feature-service_disable
add service_ensure support
2014-03-17 12:29:02 -05:00
eSe
b351b1eafd Deleted ruby 1.8.7 tests support 2014-03-13 19:31:27 +01:00
eSe
7e6794492e Fix tests 2014-03-13 12:27:50 +01:00
Daniel Kerwin
04b6c3dd7d Test worker_rlimit_nofile 2014-03-12 18:41:03 +01:00
Daniel Kerwin
d831a869fc Add setting worker_rlimit_nofile with default of 1024 2014-03-12 18:17:41 +01:00
eSe
2271ce5255 Fix indent for location parameters to 4 spaces 2014-03-12 17:18:05 +01:00
Daniel Black
5829559aca add hash/array support for upstream_cfg_prepend 2014-03-12 19:06:47 +11:00
Daniel Black
b27e446b3a Merge https://github.com/ese/puppet-nginx into hash 2014-03-12 18:21:24 +11:00
Daniel Black
7e56183c00 remove arrays from keys 2014-03-12 18:21:15 +11:00
eSe
0ade406a89 Remove Arrays as keys in templates 2014-03-11 17:24:30 +01:00
DracoBlue
e11e932365 Added proxy_conf_template option 2014-03-10 21:44:46 +01:00
DracoBlue
33d3c30015 Added template parameter to nginx class 2014-03-10 21:25:08 +01:00
DracoBlue
7e6dcdc1ec Added config variable for custom nginx.conf template 2014-03-10 21:19:25 +01:00
James Fryman
5c36913dcd Merge pull request #271 from cloudevelops/purge_vhost_parameter
Ensure that vhosts are purged with new parameter purge_vhost
2014-03-10 12:50:35 -05:00
eSe
7614bceec1 Fix custom_cfg_[prepend,append] 2014-03-10 12:52:12 +01:00
eSe
3ef66c6f63 Fix formatting errors 2014-03-10 10:26:35 +01:00
eSe
dd898c2a0a Fix syntax errors 2014-03-09 20:46:13 +01:00
Daniel Black
36f63ccc16 location_custom_cfg_{prepend,append} for vhost_location_alias 2014-03-08 12:32:40 +11:00
Daniel Black
4f8096c52c Extend hash based host_cfg_{ssl_,}{prepend,append} to vhost_{ssl_,}{header,footer}. fix vhost_location_alias/vhost_location_directory. Add {location_custom_cfg_prepend,append} to vhost_location_fastcgi, vhost_location_proxy and vhost_location_stub_status. 2014-03-08 12:16:07 +11:00
Zdenek Janda
58818b3a44 Ensure that vhosts are purged with new parameter purge_vhost 2014-03-07 22:18:10 +01:00
Daniel Black
fdc05942f5 vhost_location_directory merge fix - missing end 2014-03-08 01:38:39 +11:00
Daniel Black
a66cd98ea9 Merge https://github.com/ese/puppet-nginx into hash
Resolved Conflicts:
	spec/defines/resource_location_spec.rb
	templates/vhost/vhost_location_alias.erb
	templates/vhost/vhost_location_directory.erb
	templates/vhost/vhost_location_empty.erb
	templates/vhost/vhost_location_fastcgi.erb
	templates/vhost/vhost_location_proxy.erb
	templates/vhost/vhost_location_stub_status.erb
2014-03-08 01:20:58 +11:00
Daniel Black
04e34dce39 Key value parameter maps to take array as value
Allow arrays to be specified as values in location_cfg_{prepend,append} and
vhost_cfg_{ssl_,}{prepend,append} parameters.
2014-03-07 23:53:32 +11:00
eSe
e3f2b804d5 Added tests for hashes as values in location templates 2014-03-06 16:22:30 +01:00
eSe
c07d99c5db Allow values to be hashes at prepend,append,custom cfg for locations 2014-03-05 17:05:46 +01:00