From d40c64cd0a78e96f19d9fe109c740ab1241825b1 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 3 Jul 2018 15:32:13 +0000
Subject: [PATCH] Upgrade to LimeSurvey 3.15.6

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
---
 modules/openstack_project/manifests/survey.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/openstack_project/manifests/survey.pp b/modules/openstack_project/manifests/survey.pp
index ae7790f1e2..83afbcb542 100644
--- a/modules/openstack_project/manifests/survey.pp
+++ b/modules/openstack_project/manifests/survey.pp
@@ -45,8 +45,8 @@ class openstack_project::survey (
   $auth_openid = undef,
   $docroot = '/var/www',
   $runtime_dir_mode = '0755',
-  $download_url = 'https://github.com/LimeSurvey/LimeSurvey/archive/',
-  $version = '3.7.0+180418',
+  $download_url = 'https://download.limesurvey.org/latest-stable-release/',
+  $version = '3.15.6+190108',
   $www_group = 'www-data',
   $www_user = 'www-data',
   # These are required for bootstrapping, so do not have defaults.
@@ -76,7 +76,7 @@ class openstack_project::survey (
   exec { 'limesurvey-download':
     path    => '/bin:/usr/bin',
     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],
     user    => $www_user,
   }
@@ -85,7 +85,7 @@ class openstack_project::survey (
     path    => '/bin:/usr/bin',
     cwd     => '/tmp',
     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'],
     require => Exec['limesurvey-download'],
     user    => $www_user,
@@ -102,7 +102,7 @@ class openstack_project::survey (
     user        => $www_user,
   }
 
-  file { "/tmp/${version}.tar.gz":
+  file { "/tmp/limesurvey${version}.tar.gz":
     ensure  => absent,
     require => Exec['limesurvey-unzip'],
   }