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

299 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lebedev Vadim
757bb87031 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 
Conflicts:
	manifests/params.pp
	manifests/resource/location.pp
	manifests/resource/vhost.pp
	templates/vhost/vhost_header.erb
 2013-09-05 12:01:00 +04:00
Lebedev Vadim
4f27265047 remove each_line 2013-09-05 11:43:44 +04:00
James Fryman
2df378ef05 Merge pull request #131 from apenney/allow-deny 
location_allow and location_deny support.
 2013-09-04 13:05:58 -07:00
James Fryman
4e7a4531aa Merge pull request #133 from apenney/system 
Add basic rspec-system tests.
 2013-09-04 13:04:37 -07:00
James Fryman
7262d25c94 Merge pull request #132 from apenney/package-version 
#66: This commit allows you to set package_ensure in nginx and have that
 2013-09-04 13:03:46 -07:00
Ashley Penney
52e6aa49c7 Add basic rspec-system tests. 
This adds some really basic system tests so that we can test that
various refactorings work correctly and make life easier for you
before submitting.
 2013-09-04 15:11:36 -04:00
Ashley Penney
8ddc6f6ccf This commit allows you to set package_ensure in nginx and have that 
trickle through to the package classes.  I've avoided making them
into paramaterized classes and we just refer directly back to the main
nginx namespace to get the variable.  Makes for a cleaner looking
module!
 2013-09-04 13:29:30 -04:00
Ashley Penney
39bc3f16ac This commit addresses issue #49, the lack of ways to set allow and 
deny rules within a location.
 2013-09-04 13:04:28 -04:00
James Fryman
43d2e86a20 Merge pull request #123 from jhoblitt/sort_vhost_cfg_append 
sort $vhost_cfg_append hash in vhost_footer.erb template
 2013-09-03 08:08:20 -07:00
James Fryman
7cef7927a9 Merge pull request #125 from theospears/patch-1 
Fix typo in vhost_header
 2013-09-03 07:53:29 -07:00
James Fryman
28309b6556 Merge pull request #122 from blkperl/update_readme 
Update README to use syntax highlighting
 2013-09-03 07:22:31 -07:00
Theo Spears
2170297c87 Fix typo in vhost_header 2013-08-31 19:09:58 +01:00
Joshua Hoblitt
df4243491e sort $vhost_cfg_append hash in vhost_footer.erb template 
This is so the paremter ordering in the configuration is stable. It also
force the :allow key (if it exists) to be first in the sort ordering.
It would probably be better to change `$vhost_cfg_append` into an array
of one key hashes but would require a public API change.
 2013-08-28 10:14:13 -07:00
William Van Hevelingen
503fd9564b Remove empty README file 2013-08-25 22:27:16 -07:00
William Van Hevelingen
3f3ed9be6a Update README to use syntax highlighting 2013-08-25 22:21:53 -07:00
James Fryman
b13957c27d bumping to v0.0.5, fixing array bug 2013-08-25 18:17:52 -05:00
James Fryman
f8642b338f Merge pull request #121 from abraham1901/master 
* Bug fix, remove each_line method
 2013-08-25 16:17:10 -07:00
Lebedev Vadim
1efc72b53a * Bug fix, remove each_line method 2013-08-23 12:58:43 +04:00
Lebedev Vadim
82e5f474d7 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2013-08-23 01:08:40 +04:00
Lebedev Vadim
15519e7eef Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 
Conflicts:
	manifests/package/redhat.pp
	templates/vhost/vhost_footer.erb
	templates/vhost/vhost_header.erb
 2013-08-23 01:07:53 +04:00
James Fryman
d1aef6e718 bump to 0.0.4 2013-08-22 15:52:10 -05:00
James Fryman
bd57348454 Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-08-22 15:44:51 -05:00
James Fryman
e1aa65d20c Manual merge of https://github.com/jfryman/puppet-nginx/pull/100 2013-08-22 15:44:25 -05:00
James Fryman
41591a36ff Merge pull request #99 from jhoblitt/select_package_by_osfamily 
update nginx::package to select the package class by $::osfamily
 2013-08-22 13:41:40 -07:00
James Fryman
b246c13285 Merge pull request #104 from stephenrjohnson/vhost_template_cleanup 
fix template, should use @
 2013-08-22 13:39:59 -07:00
Joshua Hoblitt
8a1981f640 update nginx::package to select the package class by $::osfamily 
There were some bugs in the existing $::operatingsystem based approach.

* amazon was it's own package set when it's properly part of $::osfamily ==
'redhat' as of facter >= 1.7.2

* gentoo was improperly part of the amazon package set; this patch removes
support for gentoo but it was broken anyways

modifications to nginx:📦:redhat were made as well

* it no longer tries to setup the nginx.org yumrepo for fedora as no packages
for fedora are currently provided

* amazon release numbers are inconsistent with EL.  Unknown
$::lsbmajdistrelease values are now mapped to 6 so it's no longer nessicary to
test for $::lsbmajdistrelease being undefined.  This logic will need to be
reworked after RHEL7.x is released.

* the url to the nginx repo was including $::operatingsystem in it but
nginx.org only has package dirs for 'rhel' & 'centos' which are presently
identical; the usage of the 'rhel' dir has been hardcoded.  This fixes broken
yum repo setup for all $::osfamily == 'redhat' platforms other than redhat and
centos.
 2013-08-22 13:32:54 -07:00
James Fryman
f98feea476 Merge pull request #114 from helldorado/master 
Please reconsidere my pull request: Fix syntax "each" for ruby1.9 => each_line and add listen_port on rewrite_www_to_non_www
 2013-08-22 13:22:41 -07:00
root
eb73601aac Fix puppet-lint 2013-08-22 23:23:16 +04:00
root
f609f9601d Adding option http_cfg_prepend to class nginx 2013-08-22 23:02:04 +04:00
root
0a53d710c2 Merge branch 'sort_vhost_cfg_append' of https://github.com/jhoblitt/puppet-nginx into dev 2013-08-22 22:24:55 +04:00
root
7ae4d3446c Merge branch 'user-defined-vhost-logs' of https://github.com/vrillusions/puppet-nginx into dev 2013-08-22 17:05:10 +04:00
James Fryman
304c12974e Last webhook Fixes #118 2013-08-18 16:26:38 -05:00
James Fryman
5f69bd3c3a Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-08-18 16:12:37 -05:00
James Fryman
eb438df54e Another ServiceHook Test Fixes #117 2013-08-18 16:12:28 -05:00
James Fryman
07ff2d821e Merge pull request #109 from vikraman/patch-1 
Fix the error 'You cannot specify more than one of content, source, target'
 2013-08-18 14:03:27 -07:00
James Fryman
9bc079f7cd testing close webhook Fixes #116 2013-08-18 15:58:39 -05:00
Joshua Hoblitt
b8189496a3 sort $vhost_cfg_append hash in vhost_footer.erb template 
This is so the paremter ordering in the configuration is stable. It also
force the :allow key (if it exists) to be first in the sort ordering.
It would probably be better to change `$vhost_cfg_append` into an array
of one key hashes but would require a public API change.
 2013-08-16 16:29:05 -07:00
Abdoul Bah
b40196f843 Update vhost_location_stub_status.erb 
this does not affect ruby1.9
 2013-08-15 21:08:03 +02:00
Abdoul Bah
e0f2666077 Update vhost_location_proxy.erb 
this does not affect ruby1.9
 2013-08-15 21:07:40 +02:00
Abdoul Bah
81c46e165e Update vhost_location_fastcgi.erb 2013-08-15 21:07:06 +02:00
Abdoul Bah
2915ff22db Update vhost_location_empty.erb 
this does not affect ruby1.9
 2013-08-15 21:06:23 +02:00
Abdoul Bah
e408cdc2f4 Update vhost_location_directory.erb 
this does not affect ruby1.9
 2013-08-15 21:05:38 +02:00
Abdoul Bah
3a2dd716a0 Update vhost_location_alias.erb 
this does not affect ruby1.9
 2013-08-15 21:05:02 +02:00
Abdoul Bah
029e40b836 Update vhost_location_stub_status.erb 2013-08-15 18:57:22 +02:00
Abdoul Bah
be5dd67875 Update vhost_location_proxy.erb 2013-08-15 18:56:58 +02:00
Abdoul Bah
0be9924df5 Update vhost_location_fastcgi.erb 2013-08-15 18:56:05 +02:00
Abdoul Bah
f87d4770df Update vhost_location_empty.erb 2013-08-15 18:55:14 +02:00
Abdoul Bah
d10eaa423a Update vhost_location_directory.erb 2013-08-15 18:54:41 +02:00
Abdoul Bah
939d0bd458 Update vhost_location_alias.erb 2013-08-15 18:53:45 +02:00
Abdoul Bah
b432d5269c Update vhost_header.erb 2013-08-15 18:52:35 +02:00