From ee6c87bf640c77584dc35da8864dddf70e39c203 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 19 Jun 2012 18:34:10 +0000 Subject: [PATCH] Add etherpad-lite to etherpad.openstack.org Update node definition for etherpad.openstack.org to include bits from the etherpad_lite module. This will install etherpad-lite with nginx as a reverse proxy and mysql as the DB. Change-Id: I5a2e3f45a24c7d1c4749b2201c58d0e1eb134f53 --- manifests/site.pp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index bbbc25ee51..6d2b824ad2 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -444,24 +444,17 @@ node 'etherpad.openstack.org' { iptables_public_tcp_ports => [22, 80, 443] } - realize ( - User::Virtual::Localuser["clarkb"], - ) -} - -node 'etherpadlite.openstack.org' { - include openstack_cron - class { 'openstack_server': - iptables_public_tcp_ports => [22, 80, 443] - } - include etherpad_lite class { 'etherpad_lite::nginx': - server_name => 'etherpadlite.openstack.org' + server_name => 'etherpad.openstack.org' } include etherpad_lite::site include etherpad_lite::mysql include etherpad_lite::backup + + realize ( + User::Virtual::Localuser["clarkb"], + ) } # A bare machine, but with a jenkins user