From 708ed2497595f70f0410c6dbcf9288570a780179 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 20 Aug 2015 17:10:29 +0000 Subject: [PATCH] Upgrade etherpad to Ubuntu Trusty Upgrade etherpad to Ubuntu Trusty and switch from node.js compiled from source to the nodejs/npm distro packages there, and switch to the current latest "develop" branch tip tested and known working from the etherpad-dev server. Change-Id: I5ce02ad5424c3f6cf0dbd1bc067babacf13a3b2f --- manifests/site.pp | 2 +- modules/openstack_project/manifests/etherpad.pp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 61b4f9bd38..500b6ce316 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -327,7 +327,7 @@ node 'eavesdrop.openstack.org' { } } -# Node-OS: precise +# Node-OS: trusty node 'etherpad.openstack.org' { class { 'openstack_project::server': iptables_public_tcp_ports => [22, 80, 443], diff --git a/modules/openstack_project/manifests/etherpad.pp b/modules/openstack_project/manifests/etherpad.pp index 122aa2f527..66832dd4c4 100644 --- a/modules/openstack_project/manifests/etherpad.pp +++ b/modules/openstack_project/manifests/etherpad.pp @@ -12,7 +12,8 @@ class openstack_project::etherpad ( ) { class { 'etherpad_lite': ep_ensure => 'latest', - eplite_version => '2bf16fe09fe9a6af804666d15ff4704620369d9f', + eplite_version => 'cc9f88e7ed4858b72feb64c99beb3e13445ab6d9', + nodejs_version => 'system', } class { 'etherpad_lite::apache':