opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
717 commits 2 branches 0 tags 1.4 MiB
Commit graph

717 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tassilo Schweyer
b2d586d758 remove duplicate ref to params in nginx::service 2014-03-04 17:46:45 +01:00
Tassilo Schweyer
7fc83f707d add service_ensure support 2014-03-04 16:59:32 +01:00
James Fryman
fb560784e8 Merge pull request #265 from huandu/master 
Puppet removes dir only if "force => true"
 2014-03-04 09:03:26 -06:00
Huan Du
eb11249734 puppet removes dir only if "force => true" 2014-03-04 17:03:17 +08:00
James Fryman
7cf6dac978 Merge pull request #259 from pessoa/master 
add location_custom_cfg_prepend support
 2014-02-19 09:51:01 -06:00
pessoa
ca151970e6 add location_custom_cfg_prepend support 2014-02-17 19:51:14 +00:00
James Fryman
e8c1cd70a8 Merge pull request #238 from 3flex/patch-1 
remove changelog
 2014-02-17 13:06:48 -06:00
James Fryman
2caf61ed91 Merge pull request #257 from swanke/master 
Bugfix: Add missing gzip parameter
 2014-02-14 07:03:06 -06:00
Siggi Wanke
559eba3d7b Bugfix: Add missing gzip parameter 2014-02-14 09:47:38 +01:00
James Fryman
7c99c703fa Merge pull request #247 from janorn/master 
Added basic support for nginx on Solaris.
 2014-02-12 10:43:44 -06:00
Jan Örnstedt
7938f05d18 Whitespace fix. 2014-02-12 10:01:22 +01:00
Jan Örnstedt
9bb83dd426 Cut and paste error. Removed debian from solaris case. 2014-02-12 09:19:01 +01:00
James Fryman
047b88d270 Merge pull request #253 from fadenb/bug/missing_allowdeny_vhost_location_proxy 
Allow location_{allow,deny} parameter to be used for proxy locations
 2014-02-11 09:14:18 -06:00
Jan Örnstedt
75d1478b37 Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2014-02-11 09:03:34 +01:00
James Fryman
eadc36ce9b Merge pull request #255 from bionix/bugfix_autoindex 
Bugfix autoindex in nginx::resource::vhost
 2014-02-10 12:50:51 -06:00
Markus Rekkenbeil
8cc32d4076 Bugfix: Add missing parameter for location template 2014-02-10 18:45:34 +01:00
Markus Rekkenbeil
971e1a7692 Update vhost_location documentation and template 2014-02-10 18:14:18 +01:00