summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2016-11-14 17:49:15 -0800
committerClark Boylan <clark.boylan@gmail.com>2016-11-14 18:46:07 -0800
commit88d20d9a0f3ef11f123c1aa27a2963ac4f5fc59c (patch)
tree3e618e8e2732df3ff6b995b2ef7ddc0b863eadd5
parentd157f7c1a8a390ac22db43578184c6124541ea07 (diff)
Install curl as dep for etherpad dep install
Etherpads dependency install process requires curl, ensure that it is installed before we need it. Change-Id: I711e43f0dd9c8287c26e2861498eb3ebb191e878
Notes
Notes (review): Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 05 Jan 2017 22:14:42 +0000 Reviewed-on: https://review.openstack.org/397477 Project: openstack-infra/puppet-ethercalc Branch: refs/heads/master
-rw-r--r--manifests/init.pp6
1 files changed, 5 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 7c613c6..88a69f6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -49,6 +49,10 @@ class etherpad_lite (
49 ensure => present, 49 ensure => present,
50 } 50 }
51 51
52 package { 'curl':
53 ensure => present,
54 }
55
52 if ($nodejs_version != 'system') { 56 if ($nodejs_version != 'system') {
53 vcsrepo { "${base_install_dir}/nodejs": 57 vcsrepo { "${base_install_dir}/nodejs":
54 ensure => present, 58 ensure => present,
@@ -63,7 +67,6 @@ class etherpad_lite (
63 67
64 package { [ 68 package { [
65 'gzip', 69 'gzip',
66 'curl',
67 'python', 70 'python',
68 'libssl-dev', 71 'libssl-dev',
69 'pkg-config', 72 'pkg-config',
@@ -125,6 +128,7 @@ class etherpad_lite (
125 cwd => "${base_install_dir}/etherpad-lite", 128 cwd => "${base_install_dir}/etherpad-lite",
126 environment => "HOME=${base_log_dir}/${ep_user}", 129 environment => "HOME=${base_log_dir}/${ep_user}",
127 require => [ 130 require => [
131 Package['curl'],
128 Vcsrepo["${base_install_dir}/etherpad-lite"], 132 Vcsrepo["${base_install_dir}/etherpad-lite"],
129 Anchor['nodejs-anchor'], 133 Anchor['nodejs-anchor'],
130 ], 134 ],