Merge pull request #176 from simong/etherpad-1.5.7

Bump all environments to Etherpad 1.5.7
mrvisser · Nov 4, 2015 · 219be84 · 219be84
2 parents f743940 + 293d867
commit 219be84
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 18 deletions.
diff --git a/environments/local/hiera/common.json b/environments/local/hiera/common.json
@@ -72,7 +72,7 @@
     "etherpad_enable_abiword": true,
     "etherpad_install_config": {
         "version_major_minor": "1.5",
-        "version_patch": "6-46-5615bab",
+        "version_patch": "7-56-c337a05_0",
         "version_nodejs": "0.10.17"
     },
 

diff --git a/environments/performance/hiera/common.json b/environments/performance/hiera/common.json
@@ -108,7 +108,7 @@
     "etherpad_enable_abiword": true,
     "etherpad_install_config": {
         "version_major_minor": "1.5",
-        "version_patch": "6-46-5615bab",
+        "version_patch": "7-56-c337a05_0",
         "version_nodejs": "0.10.17"
     },
 

diff --git a/environments/performance/hiera/etherpad.json b/environments/performance/hiera/etherpad.json
@@ -1,7 +1,8 @@
 {
     "classes": [
-        "::oaeservice::etherpad"
+        "::oaeservice::etherpad",
+        "::oaeservice::deps::libreoffice"
     ],
 
     "nagios_hostgroup": "etherpadservers"
-}
+}
diff --git a/environments/production/hiera/common.json b/environments/production/hiera/common.json
@@ -116,7 +116,7 @@
     "etherpad_enable_abiword": true,
     "etherpad_install_config": {
         "version_major_minor": "1.5",
-        "version_patch": "6-46-5615bab",
+        "version_patch": "7-56-c337a05_0",
         "version_nodejs": "0.10.17"
     },
 

diff --git a/environments/production/hiera/etherpad.json b/environments/production/hiera/etherpad.json
@@ -1,6 +1,7 @@
 {
     "classes": [
-        "::oaeservice::etherpad"
+        "::oaeservice::etherpad",
+        "::oaeservice::deps::libreoffice"
     ],
 
     "rsyslog::imfiles": [
@@ -23,4 +24,4 @@
     ],
 
     "nagios_hostgroup": "etherpadservers"
-}
+}
diff --git a/environments/qa/hiera/common.json b/environments/qa/hiera/common.json
@@ -89,7 +89,7 @@
     "etherpad_enable_abiword": true,
     "etherpad_install_config": {
         "version_major_minor": "1.5",
-        "version_patch": "6-46-5615bab",
+        "version_patch": "7-56-c337a05_0",
         "version_nodejs": "0.10.17"
     },
 

diff --git a/environments/staging/hiera/common.json b/environments/staging/hiera/common.json
@@ -111,7 +111,7 @@
     "etherpad_enable_abiword": true,
     "etherpad_install_config": {
         "version_major_minor": "1.5",
-        "version_patch": "6-46-5615bab",
+        "version_patch": "7-56-c337a05_0",
         "version_nodejs": "0.10.17"
     },
 

diff --git a/environments/staging/hiera/etherpad.json b/environments/staging/hiera/etherpad.json
@@ -1,6 +1,7 @@
 {
     "classes": [
-        "::oaeservice::etherpad"
+        "::oaeservice::etherpad",
+        "::oaeservice::deps::libreoffice"
     ],
 
     "rsyslog::imfiles": [
@@ -23,4 +24,4 @@
     ],
 
     "nagios_hostgroup": "etherpadservers"
-}
+}
diff --git a/modules/etherpad/templates/etherpad.settings.json.erb b/modules/etherpad/templates/etherpad.settings.json.erb
@@ -83,6 +83,10 @@
   "abiword" : null,
 <% end -%>
 
+  /* This is the absolute path to the soffice executable. Setting it to null, disables LibreOffice exporting.
+     LibreOffice can be used in lieu of Abiword to export pads */
+  "soffice" : "/usr/bin/soffice",
+
   /* This is the path to the Tidy executable. Setting it to null, disables Tidy.
      Tidy is used to improve the quality of exported pads*/
   "tidyHtml" : "/usr/bin/tidy",

diff --git a/modules/etherpad/templates/upstart_etherpad.conf.erb b/modules/etherpad/templates/upstart_etherpad.conf.erb
@@ -21,7 +21,7 @@ end script
 
 script
   cd $EPHOME/
-  exec su -s /bin/sh -c 'exec "$0" "$@"' $EPUSER -- node node_modules/ep_etherpad-lite/node/server.js \
+  exec su -s /bin/sh -c 'HOME=/tmp exec "$0" "$@"' $EPUSER -- node node_modules/ep_etherpad-lite/node/server.js \
                         >> $EPLOGS/access.log \
                         2>> $EPLOGS/error.log
-end script
+end script
diff --git a/modules/oaeservice/manifests/deps/libreoffice.pp b/modules/oaeservice/manifests/deps/libreoffice.pp
@@ -0,0 +1,8 @@
+class oaeservice::deps::libreoffice {
+    include oaeservice::deps::ppa::oae
+
+    # Install the correct version of libreoffice
+    package {'libreoffice':
+        ensure   => '1:4.3.0-0ubuntu1~precise1'
+    }
+}
diff --git a/modules/oaeservice/manifests/deps/pp.pp b/modules/oaeservice/manifests/deps/pp.pp
@@ -1,6 +1,7 @@
 class oaeservice::deps::pp {
     include oaeservice::deps::common
     include oaeservice::deps::ppa::oae
+    include oaeservice::deps::libreoffice
 
     # Necessary packages for the preview processor
     $pp_packages = [
@@ -17,11 +18,6 @@
         ensure   => installed
     }
 
-    # Install the correct version of libreoffice
-    package {'libreoffice':
-        ensure   => '1:4.3.0-0ubuntu1~precise1'
-    }
-
     # Install some more fonts because libreoffice 4.3
     # doesn't seem to autoguess any longer
     exec { 'accept-msttcorefonts-license':