diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-06-26 00:53:16 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-06-26 00:53:16 +0200 |
| commit | bcc5318b2e938234fcc93f70d6af21367290c1ce (patch) | |
| tree | c85aa84d53c6dd66626b38a3b3092dde8c459a5f /modules/role/files/etherpad | |
| parent | a0fb226454d038c365d27bf5185c0831a487607f (diff) | |
| parent | 9313fa2ea3c7b796b448f6249f13a588c6618889 (diff) | |
| download | Puppet-bcc5318b2e938234fcc93f70d6af21367290c1ce.tar.gz Puppet-bcc5318b2e938234fcc93f70d6af21367290c1ce.tar.zst Puppet-bcc5318b2e938234fcc93f70d6af21367290c1ce.zip | |
Merge branch 'etherpad' into dev
Diffstat (limited to 'modules/role/files/etherpad')
| -rw-r--r-- | modules/role/files/etherpad/libreoffice_patch.diff | 11 |
1 files changed, 11 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 | |||