opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #613 from 3flex/test-on-puppet-4

Browse source 
travis: test on Puppet 4 for real
This commit is contained in:
Matthew Haughton 2015-05-01 12:00:27 -04:00
commit b8454400ac
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -21,7 +21,7 @@ matrix:
- rvm: 2.1.0 - rvm: 2.1.0
env: PUPPET_GEM_VERSION="~> 3.0" env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.1.0 - rvm: 2.1.0
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" env: PUPPET_GEM_VERSION="~> 4.0"
allow_failures: allow_failures:
- rvm: 1.8.7 - rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7.0" env: PUPPET_GEM_VERSION="~> 2.7.0"

2
Gemfile
View file

@ -12,7 +12,7 @@ group :rake, :test do
end end
group :rake do group :rake do
gem 'rspec-puppet', '>=2', :require => false gem 'rspec-puppet', '>=2.1.0', :require => false
gem 'rake', '>=0.9.2.2' gem 'rake', '>=0.9.2.2'
gem 'puppet-lint', '>=1.0.1' gem 'puppet-lint', '>=1.0.1'
end end

12
manifests/resource/location.pp
View file

@ -298,12 +298,6 @@ define nginx::resource::location (
default => file, default => file,
} }
$vhost_sanitized = regsubst($vhost, ' ', '_', 'G')
$config_file = "${::nginx::config::conf_dir}/sites-available/${vhost_sanitized}.conf"
$location_sanitized_tmp = regsubst($location, '\/', '_', 'G')
$location_sanitized = regsubst($location_sanitized_tmp, '\\\\', '_', 'G')
## Check for various error conditions ## Check for various error conditions
if ($vhost == undef) { if ($vhost == undef) {
fail('Cannot create a location reference without attaching to a virtual host') fail('Cannot create a location reference without attaching to a virtual host')
@ -320,6 +314,12 @@ define nginx::resource::location (
warning('The $fastcgi_script parameter is deprecated; please use $fastcgi_param instead to define custom fastcgi_params!') warning('The $fastcgi_script parameter is deprecated; please use $fastcgi_param instead to define custom fastcgi_params!')
} }
$vhost_sanitized = regsubst($vhost, ' ', '_', 'G')
$config_file = "${::nginx::config::conf_dir}/sites-available/${vhost_sanitized}.conf"
$location_sanitized_tmp = regsubst($location, '\/', '_', 'G')
$location_sanitized = regsubst($location_sanitized_tmp, '\\\\', '_', 'G')
# Use proxy or fastcgi template if $proxy is defined, otherwise use directory template. # Use proxy or fastcgi template if $proxy is defined, otherwise use directory template.
if ($proxy != undef) { if ($proxy != undef) {
$content_real = template('nginx/vhost/locations/proxy.erb') $content_real = template('nginx/vhost/locations/proxy.erb')