From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 19 Mar 2012 02:09:22 +0000 (-0300)
Subject: Putting abiword back
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=ecd2bd05284bf82be8aff34bf9255001fb90ddb4;p=puppet-etherpad.git

Putting abiword back
---

diff --git a/templates/settings.json.erb b/templates/settings.json.erb
index e06fd24..af1ca63 100644
--- a/templates/settings.json.erb
+++ b/templates/settings.json.erb
@@ -33,7 +33,7 @@
   
   /* This is the path to the Abiword executable. Setting it to null, disables abiword.
      Abiword is needed to enable the import/export of pads*/  
-  "abiword" : null,
+  "abiword" : "/usr/bin/abiword",
   
   /* This setting is used if you need http basic auth */
   // "httpAuth" : "user:pass",