Compare commits

..

No commits in common. "master" and "github_url" have entirely different histories.

4 changed files with 15 additions and 6 deletions

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', '5.6.0' gem 'beaker-rspec', :require => false
gem 'serverspec', :require => false gem 'serverspec', :require => false
gem 'specinfra', :require => false gem 'specinfra', :require => false

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.57.0+161202' limesurvey::version: '2.51.4_160908'
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

View File

@ -52,20 +52,29 @@ 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 -C ${install_path} --strip-components=1'", command => "bash -c 'cd /tmp; tar zxf /tmp/${version}.tar.gz'",
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-unzip'], require => Exec['limesurvey-copy'],
} }
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-unzip'], require => Exec['limesurvey-copy'],
} }
} }

View File

@ -1,6 +1,6 @@
{ {
"name": "martialblog-limesurvey", "name": "martialblog-limesurvey",
"version": "0.1.3", "version": "0.1.2",
"author": "martialblog", "author": "martialblog",
"summary": "Installation and Configuration of Limesurvey", "summary": "Installation and Configuration of Limesurvey",
"license": "Apache-2.0", "license": "Apache-2.0",