WMDE
/
puppet-limesurvey
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix_url'

This commit is contained in:
Markus Opolka 2016-12-07 09:44:38 +01:00
parent 4530cc6252 30835b82f2
commit 99dfa449b4
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -8,6 +8,6 @@ gem 'rspec-puppet', :require => false
gem 'rspec-puppet-facts', :require => false gem 'rspec-puppet-facts', :require => false
gem 'rake', :require => false gem 'rake', :require => false
# beaker related gems # beaker related gems
gem 'beaker-rspec', :require => false gem 'beaker-rspec', '5.6.0'
gem 'serverspec', :require => false gem 'serverspec', :require => false
gem 'specinfra', :require => false gem 'specinfra', :require => false

2
data/common.yaml
View File

@ -1,7 +1,7 @@
--- ---
limesurvey::dbhost: 'localhost' limesurvey::dbhost: 'localhost'
limesurvey::download_url: 'https://github.com/LimeSurvey/LimeSurvey/archive/' limesurvey::download_url: 'https://github.com/LimeSurvey/LimeSurvey/archive/'
limesurvey::version: '2.51.4_160908' limesurvey::version: '2.57.0+161202'
limesurvey::install_path: '/opt/limesurvey' limesurvey::install_path: '/opt/limesurvey'
limesurvey::manage_database: true limesurvey::manage_database: true
limesurvey::manage_webserver: true limesurvey::manage_webserver: true

15
manifests/extract.pp
View File

@ -52,29 +52,20 @@ class limesurvey::extract (
path => '/bin:/usr/bin', path => '/bin:/usr/bin',
cwd => '/tmp', cwd => '/tmp',
creates => "${install_path}/tmp/runtime", creates => "${install_path}/tmp/runtime",
command => "bash -c 'cd /tmp; tar zxf /tmp/${version}.tar.gz'", command => "bash -c 'cd /tmp; tar zxf /tmp/${version}.tar.gz -C ${install_path} --strip-components=1'",
require => Exec['limesurvey-download'], require => Exec['limesurvey-download'],
user => $www_user, user => $www_user,
} }
exec { 'limesurvey-copy':
path => '/bin:/usr/bin',
cwd => '/tmp',
creates => "${install_path}/tmp/runtime",
command => "bash -c 'cp -rf /tmp/LimeSurvey-${version}/* ${install_path}'",
require => Exec['limesurvey-unzip'],
user => $www_user,
}
file { "/tmp/${version}.tar.gz": file { "/tmp/${version}.tar.gz":
ensure => absent, ensure => absent,
require => Exec['limesurvey-copy'], require => Exec['limesurvey-unzip'],
} }
file { "${install_path}/tmp/runtime/": file { "${install_path}/tmp/runtime/":
ensure => directory, ensure => directory,
mode => $runtime_dir_mode, mode => $runtime_dir_mode,
require => Exec['limesurvey-copy'], require => Exec['limesurvey-unzip'],
} }
} }