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

425 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Haughton
0922eb7210 check for 0 or 2 exit code 
See http://docs.puppetlabs.com/man/apply.html

puppet_apply from rspec-system-puppet runs with --detailed-exitcodes
 2013-11-30 19:11:00 -05:00
Matthew Haughton
d2ec91da6e Don't include RSpecSystemPuppet::Helpers twice 2013-11-30 17:57:32 -05:00
Matthew Haughton
a42f971fa6 remove SLES 11 from nodeset 
Doesn't work with current rspec-system-puppet gem (no puppet_install helper
support)
 2013-11-30 17:53:52 -05:00
Matthew Haughton
2533623695 lock serverspec to 0.11.x 
required to work around
https://github.com/puppetlabs/rspec-system-serverspec/issues/6
 2013-11-30 17:52:45 -05:00
Matthew Haughton
65168203cf no more Gemfile.lock 
It messes with rspec-system builds and isn't really relevant
for code that's running directly on Puppet
 2013-11-30 17:52:01 -05:00
Dominik Richter
aa611dc938 added specs for proxy_method and proxy_set_body 
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2013-11-28 11:42:34 +01:00
Dominik Richter
709c25e82e simplified checks if variables are set in vhost_location_proxy template 
kudos to Matthew Haughton for this suggestion

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2013-11-27 19:56:04 +01:00
Dominik Richter
a83c513ac4 feature: add configurable proxy_set_body to vhost and location resources 
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2013-11-27 15:12:56 +01:00
Dominik Richter
a578dcea50 feature: add configurable proxy_method to vhost and location resources 
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2013-11-27 15:12:56 +01:00
James Fryman
8691db1c83 Merge pull request #188 from 3flex/rspec-tests 
Rspec tests (and fixes)
 2013-11-22 09:27:53 -08:00
James Fryman
abc3093188 Merge pull request #183 from drfeelngood/nx_daemon_user_for_oracle_linux 
Update params to account for oracle linux.
 2013-11-22 09:27:22 -08:00
Matthew Haughton
8292be0748 set required variables before template declared 
correctly sets www_root in the vhost_header template
 2013-11-21 23:23:45 -05:00
Matthew Haughton
43d628d4f0 fix auth_basic/auth_basic_user_file variable detection 2013-11-21 23:22:01 -05:00
Matthew Haughton
99e9d82f12 accept boolean for ipv6_enable as documented 2013-11-21 23:18:04 -05:00
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
drfeelngood
9c787d92bf Updated params to account for oracle linux. 
We should analyze the $::osfamily fact to define $nx_daemon_user.  Support for
$::operatingsystem remains but is greeted with a deprecation warning that
suggests upgrading to factor >= 1.7.2.

Corrected spec failures in redhat.pp when evaluating an undef
$::lsbmajdistrelease.  Now the variable must be defined before comparison.
 2013-11-18 18:38:07 -06: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