aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2018-06-18 10:40:00 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2018-06-26 00:50:56 +0200
commita1c3146595f8f6c7b78adfca8388dd35083b4c7f (patch)
tree18a5e5481d658a18e8ecffe7d329917d40b00f44 /modules
parentc230c6632aba600c34301e1664a4b16acec050e9 (diff)
downloadPuppet-a1c3146595f8f6c7b78adfca8388dd35083b4c7f.tar.gz
Puppet-a1c3146595f8f6c7b78adfca8388dd35083b4c7f.tar.zst
Puppet-a1c3146595f8f6c7b78adfca8388dd35083b4c7f.zip
Patch libreoffice
Diffstat (limited to 'modules')
-rw-r--r--modules/role/files/etherpad/libreoffice_patch.diff11
-rw-r--r--modules/role/manifests/etherpad.pp3
2 files changed, 14 insertions, 0 deletions
diff --git a/modules/role/files/etherpad/libreoffice_patch.diff b/modules/role/files/etherpad/libreoffice_patch.diff
new file mode 100644
index 0000000..dbfdf1a
--- /dev/null
+++ b/modules/role/files/etherpad/libreoffice_patch.diff
@@ -0,0 +1,11 @@
1--- a/LibreOffice.js 2018-06-18 09:54:15.087161212 +0200
2+++ b/LibreOffice.js 2018-06-18 10:33:27.534055021 +0200
3@@ -63,6 +63,7 @@
4 '--invisible',
5 '--nologo',
6 '--nolockcheck',
7+ '-env:UserInstallation=file:///tmp/',
8 '--convert-to', task.type,
9 task.srcFile,
10 '--outdir', tmpDir
11
diff --git a/modules/role/manifests/etherpad.pp b/modules/role/manifests/etherpad.pp
index 826525e..476a210 100644
--- a/modules/role/manifests/etherpad.pp
+++ b/modules/role/manifests/etherpad.pp
@@ -13,6 +13,9 @@ class role::etherpad (
13 ensure_packages(["libreoffice-fresh", "libreoffice-fresh-fr", "java-runtime-common", "jre8-openjdk"]) 13 ensure_packages(["libreoffice-fresh", "libreoffice-fresh-fr", "java-runtime-common", "jre8-openjdk"])
14 ensure_packages(["tidy"]) 14 ensure_packages(["tidy"])
15 aur::package { "etherpad-lite": } 15 aur::package { "etherpad-lite": }
16 -> patch::file { "/usr/share/etherpad-lite/src/node/utils/LibreOffice.js":
17 diff_source => "puppet:///modules/role/etherpad/libreoffice_patch.diff",
18 }
16 19
17 $modules = [ 20 $modules = [
18 "ep_aa_file_menu_toolbar", 21 "ep_aa_file_menu_toolbar",