Patch libreoffice

diff --git a/.gitmodules b/.gitmodules
index 0f216220e827334ddfa1636e1cb990ae4ff70491..d68cf4e6b0533f72af19a5ffa8ef25a8d0c34c8b 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -64,3 +64,6 @@
 [submodule "external_modules/slack"]
        path = external_modules/slack
        url = git://git.immae.eu/github/cegeka/puppet-slack
+[submodule "external_modules/patch"]
+       path = external_modules/patch
+       url = git://git.immae.eu/github/tohuwabohu/puppet-patch.git

diff --git a/external_modules/patch b/external_modules/patch
new file mode 160000 (submodule)
index 0000000..fed3814
--- /dev/null
+++ b/external_modules/patch
@@ -0,0 +1 @@
+Subproject commit fed3814e759347d72b919ebeb1b6837c5d13373f

diff --git a/modules/role/files/etherpad/libreoffice_patch.diff b/modules/role/files/etherpad/libreoffice_patch.diff
new file mode 100644 (file)
index 0000000..dbfdf1a
--- /dev/null
+++ b/modules/role/files/etherpad/libreoffice_patch.diff
@@ -0,0 +1,11 @@
+--- a/LibreOffice.js      2018-06-18 09:54:15.087161212 +0200
++++ b/LibreOffice.js    2018-06-18 10:33:27.534055021 +0200
+@@ -63,6 +63,7 @@
+         '--invisible',
+         '--nologo',
+         '--nolockcheck',
++        '-env:UserInstallation=file:///tmp/',
+         '--convert-to', task.type,
+         task.srcFile,
+         '--outdir', tmpDir
+

diff --git a/modules/role/manifests/etherpad.pp b/modules/role/manifests/etherpad.pp
index 826525ec47883f6fce480dec6c84563497cdf166..476a21083a4a39d279dba2833c1a2fc171f53519 100644 (file)
--- a/modules/role/manifests/etherpad.pp
+++ b/modules/role/manifests/etherpad.pp
@@ -13,6 +13,9 @@ class role::etherpad (
   ensure_packages(["libreoffice-fresh", "libreoffice-fresh-fr", "java-runtime-common", "jre8-openjdk"])
   ensure_packages(["tidy"])
   aur::package { "etherpad-lite": }
+  -> patch::file { "/usr/share/etherpad-lite/src/node/utils/LibreOffice.js":
+    diff_source => "puppet:///modules/role/etherpad/libreoffice_patch.diff",
+  }
 
   $modules = [
     "ep_aa_file_menu_toolbar",