Commit graph

360 commits

Author SHA1 Message Date
Matthew Haughton
e1c4c7470b sort vhost_cfg_append in vhost_ssl_footer 2013-11-21 23:08:36 -05:00
Matthew Haughton
4af2087867 fix spacing issues in various templates
Before this change, vhost_ssl_header would merge
"ssl" with any listen options, e.g.:
    listen       *:443 ssldefault;
when listen_options => 'default'.
2013-11-21 23:04:39 -05:00
Matthew Haughton
c8d9ad5680 only ensure yum repo file when yum repo created 2013-11-21 22:40:05 -05:00
Matthew Haughton
ef2a5e4f15 fix syntax of allow/deny directives 2013-11-21 22:35:44 -05:00
Matthew Haughton
3024f2927d fix IPv6 address fact detection 2013-11-21 22:32:23 -05:00
Matthew Haughton
4204dc908b Revert "Update vhost.pp"
This reverts commit 5ee2f65.

Fixes #186
2013-11-21 22:23:44 -05:00
Matthew Haughton
962fa6672a rspec tests for v0.0.6
Resolves #65
2013-11-21 22:14:00 -05:00
James Fryman
08854121df Merge pull request #184 from abraham1901/patch-1
Update vhost.pp
2013-11-18 08:49:14 -08:00
Vadim Lebedev
5ee2f654fb Update vhost.pp
bug fix. 
User priority for location 400-499, 501-599.
Header should have a priority lower than the others.
2013-11-18 08:45:27 -08:00
James Fryman
6f87f1cca7 Merge pull request #166 from gini/fix_upstream_prepend
Fix upstream_cfg_prepend loop to put every element on a dedicated line
2013-10-25 07:27:59 -07:00
James Fryman
7c65b80311 Merge pull request #163 from 3flex/travis-config
Add Travis config
2013-10-25 07:27:32 -07:00
James Fryman
4b818b7d80 Merge pull request #164 from 3flex/validations
Validate all arrays
2013-10-25 07:27:22 -07:00
James Fryman
3587c83255 Merge pull request #165 from 3flex/rspec-fixes
Rspec fixes
2013-10-25 07:25:09 -07:00
Daniel Kerwin
b17a8c2952 Fix upstream_cfg_prepend loop to put every element on a dedicated line 2013-10-22 23:19:34 +02:00
Matthew Haughton
3959823171 check apt::source in catalog, not the file it creates
We should trust the apt module to do the right thing,
and just test that apt::source is part of the catalogue.
2013-10-20 21:54:32 -04:00
Matthew Haughton
0da2fa17ea apt modules relies on lsbdistcodename fact 2013-10-20 21:43:33 -04:00
Matthew Haughton
a24e160024 fix specs for PR #158 2013-10-20 21:28:15 -04:00
Matthew Haughton
ad8c66a065 fix specs to cater for PR #162 2013-10-20 21:27:15 -04:00
Matthew Haughton
354a68ef63 validate all arrays 2013-10-20 17:58:25 -04:00
Matthew Haughton
89be74c6e5 add travis config 2013-10-19 23:25:07 -04:00
James Fryman
59cf9148c2 Merge pull request #162 from jfryman/sanitize_vhost_location
Regex replace / in resource::vhost
2013-10-19 15:54:57 -07:00
James Fryman
8845838390 regex replace / in resource::vhost Fixes #102 2013-10-19 15:55:52 -05:00
James Fryman
a2083e433f Merge pull request #158 from miguno/master
Fix RHEL installation support
2013-10-16 09:46:23 -07:00
Michael G. Noll
291d5d2532 Fix RHEL installation support 2013-10-16 16:32:14 +02:00
James Fryman
65465b24a3 Merge pull request #155 from fpletz/fix/apt-dependency-breakage
Fix dependency problems with APT repo handling
2013-10-08 20:46:22 -07:00
Franz Pletz
3edc7ad4ac Fix dependency problems with APT repo handling
The first issue was that Exec[apt_get_update_for_nginx] resource is only
needed if $manage_repo == true, so it was put inside the corresponding
if block.

But even inside the if-block, Exec[apt_get_update_for_nginx] could fail
when $package_source has an invalid value and no Apt::Source[nginx] is
defined, so the respective Apt::Source[nginx], if defined, will now notify
Exec[apt_get_update_for_nginx] and Exec[apt_get_update_for_nginx] will
no longer subscribe to Apt::Source[nginx].

It would probably make sense to add a call to fail() in the default case
of $package_source.
2013-10-09 05:17:33 +02:00
James Fryman
d2877413f3 Merge pull request #151 from deric/readme-passenger
Added example of passenger usage
2013-10-08 10:15:44 -07:00
James Fryman
8989d56dee Merge pull request #154 from narkisr/master
Fixing broken merge
2013-10-08 10:07:12 -07:00
Ronen Narkis
a54f7ad762 clearing miss placed line 2013-10-08 18:20:33 +03:00
Ronen Narkis
f54031f842 fixing broken merge 2013-10-08 15:42:12 +03:00
Tomas Barton
e8c2a92070 Added example of passenger usage 2013-10-08 10:20:57 +02:00
James Fryman
7ea6b570c3 Merge branch 'disable-yum-repo-management' of github.com:rytis/puppet-nginx into rytis-disable-yum-repo-management
Conflicts:
	manifests/init.pp
	manifests/package.pp
	manifests/params.pp
2013-10-07 14:46:42 -05:00
James Fryman
c314aa6e36 Merge pull request #145 from deric/master
support for nginx passenger debian repositories
2013-10-07 12:42:00 -07:00
Tomas Barton
303efc634d fixed calling out of scope variables 2013-10-07 16:27:17 +02:00
Rytis Sileika
b6ee1e5973 Added param to package.pp to explicitly specify whether or not repository should be managed 2013-10-07 13:36:39 +00:00
Tomas Barton
6ab27d00b1 ensure_resource instead of !defined 2013-10-03 20:53:36 +02:00
Tomas Barton
4e41871dac fixed acces to vhost_cfg_append via instance variable 2013-09-30 00:46:17 +02:00
Tomas Barton
82ce9223a9 possibility to disable default location 2013-09-29 20:53:25 +02:00
Tomas Barton
2cc0a2fcf0 support ssl_cache and for passenger cgi params 2013-09-29 20:36:19 +02:00
Tomas Barton
e3ce014354 support for nginx passenger debian repositories 2013-09-27 14:48:51 +02:00
Rytis Sileika
9db6a82ad1 Added class param to disable YUM repo management on RedHat platforms 2013-09-26 13:32:59 +00:00
James Fryman
315d7e109f Merge pull request #120 from abraham1901/dev
Aggregated some PR & tested & simple bug fix & add new option
2013-09-15 17:29:56 -07:00
James Fryman
6f2eb74558 Merge pull request #140 from alanpearce/patch-1
Fix deprecated variable access warning in vhost footer template
2013-09-15 17:26:14 -07:00
James Fryman
4cf2406459 Merge pull request #141 from vrillusions/stub-status-line-endings
Fix stub_status location so it has line breaks.
2013-09-15 17:25:55 -07:00
Todd Eddy
9252351986 Fix stub_status location so it has line breaks. 2013-09-14 04:24:01 -04:00
Alan Pearce
05c260a963 Fix deprecated variable access warning in vhost footer template 2013-09-13 15:29:50 +01:00
Lebedev Vadim
20a37a220f Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev
Conflicts:
	manifests/config.pp
	manifests/resource/location.pp
2013-09-08 16:50:16 +04:00
James Fryman
30d62246b2 Merge pull request #119 from alphagov/fix-permissions
Fix SSL cert and key permissions
2013-09-06 08:47:41 -07:00
James Fryman
59106eae7c Merge pull request #128 from leoc/fix-www-rewrite-port
Use correct port for www rewrite
2013-09-06 08:44:49 -07:00
James Fryman
741f5432b3 Merge pull request #134 from apenney/apt
Switch to using puppetlabs-apt
2013-09-06 08:43:56 -07:00