diff --git a/.travis.yml b/.travis.yml index f3f1a2d..0aac430 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,6 @@ cache: bundler matrix: fast_finish: true include: - - rvm: 2.0 - env: PUPPET_VERSION="4.3.0" STRICT_VARIABLES="yes" - services: docker - sudo: required - script: bundle exec rake - rvm: 2.1 env: PUPPET_VERSION="4.5.0" STRICT_VARIABLES="yes" services: docker @@ -20,9 +15,10 @@ matrix: services: docker sudo: required script: bundle exec rake - allow_failures: - rvm: 2.2 - env: PUPPET_VERSION="4.6.1" STRICT_VARIABLES="yes" BEAKER_set="centos-7-x64" + env: PUPPET_VERSION="4.6.1" STRICT_VARIABLES="yes" BEAKER_set="debian-7-x64" services: docker sudo: required script: bundle exec rake +notifications: + email: false diff --git a/Rakefile b/Rakefile index d666a3a..90f4dee 100644 --- a/Rakefile +++ b/Rakefile @@ -4,7 +4,7 @@ require 'metadata-json-lint/rake_task' PuppetLint.configuration.send('disable_80chars') PuppetLint.configuration.relative = true -PuppetLint.configuration.ignore_paths = ['spec/**/*.pp', 'pkg/**/*.pp'] +PuppetLint.configuration.ignore_paths = ['spec/**/*.pp', 'pkg/**/*.pp', "vendor/**/*.pp"] desc 'Validate manifests, templates, and ruby files' task :validate do diff --git a/data/common.yaml b/data/common.yaml index d28275b..9617de9 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -1,7 +1,6 @@ --- limesurvey::archive_path: '/tmp/limesurvey.tar.gz' limesurvey::dir_name: 'limesurvey' -limesurvey::file_name: '%{::limesurvey::dir_name}.tar.gz' limesurvey::dbhost: 'localhost' limesurvey::download_url: 'https://www.limesurvey.org/stable-release?download=1853:limesurvey2514%20160908targz' limesurvey::extract_path: '/opt/' diff --git a/manifests/init.pp b/manifests/init.pp index df51826..f36a225 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -73,7 +73,6 @@ class limesurvey ( String $dir_name, String $download_url, String $extract_path, - String $file_name, String $runtime_dir_mode, String $www_group, String $www_user,