summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-02-12 20:54:57 +0000
committerGerrit Code Review <review@openstack.org>2019-02-12 20:54:57 +0000
commita79e6dd6bc1d792143a99c590cfd827cee3df146 (patch)
treeebc3a7c815e6b88aad21c8d28684608c4a3b06a4
parente6a478ee051b39265527c7338a1ad469e4bba942 (diff)
parentd40c64cd0a78e96f19d9fe109c740ab1241825b1 (diff)
Merge "Upgrade to LimeSurvey 3.15.6"
-rw-r--r--modules/openstack_project/manifests/survey.pp10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/openstack_project/manifests/survey.pp b/modules/openstack_project/manifests/survey.pp
index ae7790f..83afbcb 100644
--- a/modules/openstack_project/manifests/survey.pp
+++ b/modules/openstack_project/manifests/survey.pp
@@ -45,8 +45,8 @@ class openstack_project::survey (
45 $auth_openid = undef, 45 $auth_openid = undef,
46 $docroot = '/var/www', 46 $docroot = '/var/www',
47 $runtime_dir_mode = '0755', 47 $runtime_dir_mode = '0755',
48 $download_url = 'https://github.com/LimeSurvey/LimeSurvey/archive/', 48 $download_url = 'https://download.limesurvey.org/latest-stable-release/',
49 $version = '3.7.0+180418', 49 $version = '3.15.6+190108',
50 $www_group = 'www-data', 50 $www_group = 'www-data',
51 $www_user = 'www-data', 51 $www_user = 'www-data',
52 # These are required for bootstrapping, so do not have defaults. 52 # These are required for bootstrapping, so do not have defaults.
@@ -76,7 +76,7 @@ class openstack_project::survey (
76 exec { 'limesurvey-download': 76 exec { 'limesurvey-download':
77 path => '/bin:/usr/bin', 77 path => '/bin:/usr/bin',
78 creates => "${docroot}/tmp/runtime", 78 creates => "${docroot}/tmp/runtime",
79 command => "bash -c 'cd /tmp; wget ${download_url}${version}.tar.gz'", 79 command => "bash -c 'cd /tmp; wget ${download_url}limesurvey${version}.tar.gz'",
80 require => File[$docroot], 80 require => File[$docroot],
81 user => $www_user, 81 user => $www_user,
82 } 82 }
@@ -85,7 +85,7 @@ class openstack_project::survey (
85 path => '/bin:/usr/bin', 85 path => '/bin:/usr/bin',
86 cwd => '/tmp', 86 cwd => '/tmp',
87 creates => "${docroot}/tmp/runtime", 87 creates => "${docroot}/tmp/runtime",
88 command => "bash -c 'cd /tmp; tar zxf /tmp/${version}.tar.gz -C ${docroot} --strip-components=1'", 88 command => "bash -c 'cd /tmp; tar zxf /tmp/limesurvey${version}.tar.gz -C ${docroot} --strip-components=1'",
89 notify => Exec['limesurvey-install'], 89 notify => Exec['limesurvey-install'],
90 require => Exec['limesurvey-download'], 90 require => Exec['limesurvey-download'],
91 user => $www_user, 91 user => $www_user,
@@ -102,7 +102,7 @@ class openstack_project::survey (
102 user => $www_user, 102 user => $www_user,
103 } 103 }
104 104
105 file { "/tmp/${version}.tar.gz": 105 file { "/tmp/limesurvey${version}.tar.gz":
106 ensure => absent, 106 ensure => absent,
107 require => Exec['limesurvey-unzip'], 107 require => Exec['limesurvey-unzip'],
108 } 108 }