opendev/system-config
Code Issues Proposed changes

Upgrade to LimeSurvey 3.15.6

Browse Source 
LimeSurvey releases early and often (yay!) but as a result we're
rather many versions behind just in the time it took us to finalize
our automation. Upgrade to the latest tagged version now. Also
switch to downloading from limesurvey.org instead of github.com as
the latter seems to only house a (delayed) mirror of their releases.
The updated location also implies slightly different file naming, so
a few of the Puppet execs dealing with retrieval and unpacking that
file have to be adjusted to match.

Change-Id: Ib6faa4cedcef6685f6992d61de9a29cd72f05aa2
This commit is contained in:
Jeremy Stanley 2018-07-03 15:32:13 +00:00
parent d5e634c889
commit d40c64cd0a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/openstack_project/manifests/survey.pp
View File

@ -45,8 +45,8 @@ class openstack_project::survey (
$auth_openid = undef, $auth_openid = undef,
$docroot = '/var/www', $docroot = '/var/www',
$runtime_dir_mode = '0755', $runtime_dir_mode = '0755',
$download_url = 'https://github.com/LimeSurvey/LimeSurvey/archive/', $download_url = 'https://download.limesurvey.org/latest-stable-release/',
$version = '3.7.0+180418', $version = '3.15.6+190108',
$www_group = 'www-data', $www_group = 'www-data',
$www_user = 'www-data', $www_user = 'www-data',
# These are required for bootstrapping, so do not have defaults. # These are required for bootstrapping, so do not have defaults.
@ -76,7 +76,7 @@ class openstack_project::survey (
exec { 'limesurvey-download': exec { 'limesurvey-download':
path => '/bin:/usr/bin', path => '/bin:/usr/bin',
creates => "${docroot}/tmp/runtime", creates => "${docroot}/tmp/runtime",
command => "bash -c 'cd /tmp; wget ${download_url}${version}.tar.gz'", command => "bash -c 'cd /tmp; wget ${download_url}limesurvey${version}.tar.gz'",
require => File[$docroot], require => File[$docroot],
user => $www_user, user => $www_user,
} }
@ -85,7 +85,7 @@ class openstack_project::survey (
path => '/bin:/usr/bin', path => '/bin:/usr/bin',
cwd => '/tmp', cwd => '/tmp',
creates => "${docroot}/tmp/runtime", creates => "${docroot}/tmp/runtime",
command => "bash -c 'cd /tmp; tar zxf /tmp/${version}.tar.gz -C ${docroot} --strip-components=1'", command => "bash -c 'cd /tmp; tar zxf /tmp/limesurvey${version}.tar.gz -C ${docroot} --strip-components=1'",
notify => Exec['limesurvey-install'], notify => Exec['limesurvey-install'],
require => Exec['limesurvey-download'], require => Exec['limesurvey-download'],
user => $www_user, user => $www_user,
@ -102,7 +102,7 @@ class openstack_project::survey (
user => $www_user, user => $www_user,
} }
file { "/tmp/${version}.tar.gz": file { "/tmp/limesurvey${version}.tar.gz":
ensure => absent, ensure => absent,
require => Exec['limesurvey-unzip'], require => Exec['limesurvey-unzip'],
} }