From 957ecb6ceffd3180bc6c53b2abf77eddc3090b9d Mon Sep 17 00:00:00 2001
From: Samuel de Medeiros Queiroz <samueldmq@gmail.com>
Date: Wed, 16 Sep 2015 11:09:29 -0300
Subject: [PATCH] Ensure abiword package is always present

Change I9831526581a5fc1f2014c9985637664c79b937bf
moved the required packages list statement into a
conditional block, making it to be ensured only
in the case nodejs_version was set to 'system'.

This was causing the abiword library to not be
installed and then etherpad.o.o was appending the
following error message to new pads:

  Error: Abiword does not exist at this path,
  check your settings file -- To suppress these
  warning messages change suppressErrorsInPadText
  to true in your settings.json

This patch makes the abiword library to always be
installed by moving it out of that conditional
statement.

Change-Id: I50f55e4408d850b2bf449b121b9014d511518481
---
 manifests/init.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 08cdfce..64e377d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -45,6 +45,10 @@ class etherpad_lite (
     mode   => '0664',
   }
 
+  package { 'abiword':
+    ensure => present,
+  }
+
   if ($nodejs_version != 'system') {
     vcsrepo { "${base_install_dir}/nodejs":
       ensure   => present,
@@ -63,7 +67,6 @@ class etherpad_lite (
         'python',
         'libssl-dev',
         'pkg-config',
-        'abiword',
         'build-essential',
       ]:
       ensure => present,