From a221fd15ce2d3a935d0398adaf5d0e1acf7b8a9c Mon Sep 17 00:00:00 2001 From: mhoellein Date: Thu, 23 Dec 2021 12:03:44 +0100 Subject: [PATCH] committing changes in /etc made by "apt install coolwsd code-brand" Package changes: -code-brand 6.4-23 all +code-brand 21.11-12 all +collaboraoffice 21.06.10-1 amd64 +collaboraoffice-ure 21.06.10-1 amd64 +collaboraofficebasis-calc 21.06.10-1 amd64 +collaboraofficebasis-core 21.06.10-1 amd64 +collaboraofficebasis-draw 21.06.10-1 amd64 +collaboraofficebasis-en-us 21.06.10-1 amd64 +collaboraofficebasis-extension-pdf-import 21.06.10-1 amd64 +collaboraofficebasis-graphicfilter 21.06.10-1 amd64 +collaboraofficebasis-images 21.06.10-1 amd64 +collaboraofficebasis-impress 21.06.10-1 amd64 +collaboraofficebasis-math 21.06.10-1 amd64 +collaboraofficebasis-ooofonts 21.06.10-1 amd64 +collaboraofficebasis-ooolinguistic 21.06.10-1 amd64 +collaboraofficebasis-writer 21.06.10-1 amd64 +coolwsd 21.11.0.6-1 amd64 --- .etckeeper | 13 +- apache2/conf-available/coolwsd.conf | 38 +++ apt/apt.conf.d/25coolwsd | 2 + apt/apt.conf.d/25loolwsd | 2 - coolwsd/coolkitconfig.xcu | 52 ++++ coolwsd/coolwsd.xml | 229 ++++++++++++++++++ coolwsd/proof_key | 39 +++ coolwsd/proof_key.pub | 1 + group | 1 + group- | 2 +- gshadow | 1 + gshadow- | 2 +- nginx/snippets/coolwsd.conf | 42 ++++ passwd | 1 + passwd- | 2 + shadow | 1 + shadow- | 2 + .../multi-user.target.wants/coolwsd.service | 1 + 18 files changed, 426 insertions(+), 5 deletions(-) create mode 100644 apache2/conf-available/coolwsd.conf create mode 100644 apt/apt.conf.d/25coolwsd delete mode 100644 apt/apt.conf.d/25loolwsd create mode 100644 coolwsd/coolkitconfig.xcu create mode 100644 coolwsd/coolwsd.xml create mode 100644 coolwsd/proof_key create mode 100644 coolwsd/proof_key.pub create mode 100644 nginx/snippets/coolwsd.conf create mode 120000 systemd/system/multi-user.target.wants/coolwsd.service diff --git a/.etckeeper b/.etckeeper index ef3606134..be7d101a5 100755 --- a/.etckeeper +++ b/.etckeeper @@ -313,6 +313,7 @@ maybe chmod 0755 'apache2' maybe chmod 0644 'apache2/apache2.conf' maybe chmod 0755 'apache2/conf-available' maybe chmod 0644 'apache2/conf-available/charset.conf' +maybe chmod 0644 'apache2/conf-available/coolwsd.conf' maybe chmod 0644 'apache2/conf-available/icingaweb2.conf' maybe chmod 0644 'apache2/conf-available/javascript-common.conf' maybe chmod 0644 'apache2/conf-available/localized-error-pages.conf' @@ -670,7 +671,7 @@ maybe chmod 0444 'apt/apt.conf.d/01autoremove-kernels' maybe chmod 0644 'apt/apt.conf.d/05etckeeper' maybe chmod 0644 'apt/apt.conf.d/20apt-esm-hook.conf' maybe chmod 0644 'apt/apt.conf.d/20apt-show-versions' -maybe chmod 0644 'apt/apt.conf.d/25loolwsd' +maybe chmod 0644 'apt/apt.conf.d/25coolwsd' maybe chmod 0644 'apt/apt.conf.d/50command-not-found' maybe chmod 0644 'apt/apt.conf.d/70debconf' maybe chmod 0755 'apt/auth.conf.d' @@ -804,6 +805,15 @@ maybe chmod 0644 'console-setup/compose.VISCII.inc' maybe chmod 0644 'console-setup/remap.inc' maybe chmod 0644 'console-setup/vtrgb' maybe chmod 0644 'console-setup/vtrgb.vga' +maybe chmod 0755 'coolwsd' +maybe chmod 0644 'coolwsd/coolkitconfig.xcu' +maybe chown 'cool' 'coolwsd/coolwsd.xml' +maybe chgrp 'cool' 'coolwsd/coolwsd.xml' +maybe chmod 0640 'coolwsd/coolwsd.xml' +maybe chown 'cool' 'coolwsd/proof_key' +maybe chgrp 'cool' 'coolwsd/proof_key' +maybe chmod 0600 'coolwsd/proof_key' +maybe chmod 0644 'coolwsd/proof_key.pub' maybe chmod 0755 'cron.d' maybe chmod 0644 'cron.d/.placeholder' maybe chmod 0644 'cron.d/amavisd-new' @@ -8756,6 +8766,7 @@ maybe chmod 0644 'newt/palette.original' maybe chmod 0644 'newt/palette.ubuntu' maybe chmod 0755 'nginx' maybe chmod 0755 'nginx/snippets' +maybe chmod 0644 'nginx/snippets/coolwsd.conf' maybe chmod 0644 'nginx/snippets/loolwsd.conf' maybe chmod 0644 'nsswitch.conf' maybe chgrp 'opendkim' 'opendkim' diff --git a/apache2/conf-available/coolwsd.conf b/apache2/conf-available/coolwsd.conf new file mode 100644 index 000000000..f7ecb6f66 --- /dev/null +++ b/apache2/conf-available/coolwsd.conf @@ -0,0 +1,38 @@ +# Apache2 reverse proxy configuration for Collabora Online +# Internet <-- SSL --> Reverse Proxy <-- No SSL --> coolwsd +# Make sure that you enable the following Apache2 modules: proxy, proxy_wstunnel, and proxy_http. +# Create a virtual host for Collabora Online and include this configuration file. + + Options -Indexes + + # Encoded slashes need to be allowed + AllowEncodedSlashes NoDecode + + # keep the host + ProxyPreserveHost On + + # static html, js, images, etc. served from coolwsd + # browser is the client part of Collabora Online + ProxyPass /browser http://127.0.0.1:9980/browser retry=0 + ProxyPassReverse /browser http://127.0.0.1:9980/browser + + # WOPI discovery URL + ProxyPass /hosting/discovery http://127.0.0.1:9980/hosting/discovery retry=0 + ProxyPassReverse /hosting/discovery http://127.0.0.1:9980/hosting/discovery + + # Capabilities + ProxyPass /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities retry=0 + ProxyPassReverse /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities + + # Main websocket + ProxyPassMatch "/cool/(.*)/ws$" ws://127.0.0.1:9980/cool/$1/ws nocanon + + # Admin Console websocket + ProxyPass /cool/adminws ws://127.0.0.1:9980/cool/adminws + + # Download as, Fullscreen presentation and Image upload operations + ProxyPass /cool http://127.0.0.1:9980/cool + ProxyPassReverse /cool http://127.0.0.1:9980/cool + # Compatibility with integrations that use the /lool/convert-to endpoint + ProxyPass /lool http://127.0.0.1:9980/cool + ProxyPassReverse /lool http://127.0.0.1:9980/cool diff --git a/apt/apt.conf.d/25coolwsd b/apt/apt.conf.d/25coolwsd new file mode 100644 index 000000000..be0184769 --- /dev/null +++ b/apt/apt.conf.d/25coolwsd @@ -0,0 +1,2 @@ +// Rebuild systemplate of Collabora Online Development Edition +DPkg::Post-Invoke { "echo Updating coolwsd systemplate;coolwsd-systemplate-setup /opt/cool/systemplate /opt/collaboraoffice >/dev/null 2>&1 || true"; }; diff --git a/apt/apt.conf.d/25loolwsd b/apt/apt.conf.d/25loolwsd deleted file mode 100644 index 48a127635..000000000 --- a/apt/apt.conf.d/25loolwsd +++ /dev/null @@ -1,2 +0,0 @@ -// Rebuild systemplate of Collabora Online Development Edition -DPkg::Post-Invoke { "echo Updating loolwsd systemplate;loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice6.4 >/dev/null 2>&1 || true"; }; diff --git a/coolwsd/coolkitconfig.xcu b/coolwsd/coolkitconfig.xcu new file mode 100644 index 000000000..ac1e37598 --- /dev/null +++ b/coolwsd/coolkitconfig.xcu @@ -0,0 +1,52 @@ + + + + +false + + +11 + + +false + + +https://help.collaboraoffice.com/help.html? + + +true + + +false + + +file:///tmp + + +true + + +collabora_svg +2 + + +false +false +false + + +NeverMatchAnyUrlSuffix + + +Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif +Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif +Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif +Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif + + +false +false +false +false + + diff --git a/coolwsd/coolwsd.xml b/coolwsd/coolwsd.xml new file mode 100644 index 000000000..7348fef6e --- /dev/null +++ b/coolwsd/coolwsd.xml @@ -0,0 +1,229 @@ + + + + + + + + + de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru + + + + + + + + + + + 1 + + 4 + 5 + + false + 96 + 3600 + + + 30 + 300 + false + 0 + 8000 + 0 + 0 + 100 + 100 + + 10000 + 60 + 300 + 3072 + 85 + 120 + + + + + 120 + 900 + + + + + + true + + warning + notice + fatal + false + + -INFO-WARN + + + /var/log/coolwsd.log + never + timestamp + true + 10 days + 10 + true + false + + + false + 82589933 + + + + + + /var/log/coolwsd.trace.json + + + false + + + + + + + + false + + + + + + all + any + + + + 192\.168\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:192\.168\.[0-9]{1,3}\.[0-9]{1,3} + 127\.0\.0\.1 + ::ffff:127\.0\.0\.1 + ::1 + 172\.17\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:172\.17\.[0-9]{1,3}\.[0-9]{1,3} + 10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} + + + + + + + + + + + true + + false + /etc/coolwsd/cert.pem + /etc/coolwsd/key.pem + /etc/coolwsd/ca-chain.cert.pem + + + 1000 + + + + + + + + + true + true + 1800 + false + 1 + false + + + + + + + + + + + + + true + false + + + + + default + + + + + + localhost + 10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} + 172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3} + 172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3} + 172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3} + 192\.168\.[0-9]{1,3}\.[0-9]{1,3} + 192\.168\.1\.1 + 0 + + 900 + + + + true + + + + + + + + + true + + + true + false + + + + + + + + + + + + + + + + + + + diff --git a/coolwsd/proof_key b/coolwsd/proof_key new file mode 100644 index 000000000..c9e092257 --- /dev/null +++ b/coolwsd/proof_key @@ -0,0 +1,39 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff --git a/coolwsd/proof_key.pub b/coolwsd/proof_key.pub new file mode 100644 index 000000000..95e5eeb3d --- /dev/null +++ b/coolwsd/proof_key.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDH1GJOMf+v1BK7eAA0VP5tytexyJpTLv6VG1b6BQbatzrrOXr6PRn1swDlhUCkHpeR/XqEbXlSNomp/DiG7z5bismmrnQgK1AQEqPQuQUNVE42945g84xJp+mAmzHc14RhAamOqLmr34rMU3dwLL4IMwDXM8j4il+cJMZp2Fbe7gtrDLD1dlHiG10J5Sz6EhjR9Ptxkb17zrPbh9qTjY15jZ0KP57wwO9LgiX3aQ6uBeFYuJQFhdVUjWlrAWYVbad1vSrgFiXFzAIQJ9KjKK5e+QcdCbzZu9f+g9ol7/dEQQRr5qk4MK1bf8xjVrudOiAQna0ooe3yBiyAN/G6z/NDdqB3aqajei75pMcUbkXZSOyUiGWj2GqXjEcWTcROz6BvS8jdzAT/ZbGuGuI0VCito04NOdXzRzQZuwC93iA/rBeBBJB0vij/FPayIlpT8B1UcwkJeK3OCBOETa9rwzpG07Q3kQGZnTn5TcO8jqOpNEL1m5IfXepJ1dk64k/lKa8= root@mail diff --git a/group b/group index 0197f284a..6603f2d5d 100644 --- a/group +++ b/group @@ -73,3 +73,4 @@ icingaweb2:x:130:www-data icingacmd:x:131:www-data _graphite:x:132: netdata:x:998: +cool:x:133: diff --git a/group- b/group- index cf63774a4..0197f284a 100644 --- a/group- +++ b/group- @@ -2,7 +2,7 @@ root:x:0: daemon:x:1: bin:x:2: sys:x:3: -adm:x:4:syslog +adm:x:4:syslog,netdata tty:x:5:syslog disk:x:6: lp:x:7: diff --git a/gshadow b/gshadow index 0d3a222e9..5e93bef65 100644 --- a/gshadow +++ b/gshadow @@ -73,3 +73,4 @@ icingaweb2:!::www-data icingacmd:!::www-data _graphite:!:: netdata:!:: +cool:!:: diff --git a/gshadow- b/gshadow- index 438423b9e..0d3a222e9 100644 --- a/gshadow- +++ b/gshadow- @@ -2,7 +2,7 @@ root:*:: daemon:*:: bin:*:: sys:*:: -adm:*::syslog +adm:*::syslog,netdata tty:*::syslog disk:*:: lp:*:: diff --git a/nginx/snippets/coolwsd.conf b/nginx/snippets/coolwsd.conf new file mode 100644 index 000000000..6d0814ea5 --- /dev/null +++ b/nginx/snippets/coolwsd.conf @@ -0,0 +1,42 @@ + # static files + location ^~ /browser { + proxy_pass http://localhost:9980; + proxy_set_header Host $http_host; + } + + # WOPI discovery URL + location ^~ /hosting/discovery { + proxy_pass http://localhost:9980; + proxy_set_header Host $http_host; + } + + # Capabilities + location ^~ /hosting/capabilities { + proxy_pass http://localhost:9980; + proxy_set_header Host $http_host; + } + + # main websocket + location ~ ^/cool/(.*)/ws$ { + proxy_pass http://localhost:9980; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $http_host; + proxy_read_timeout 36000s; + } + + # download, presentation and image upload + # we accept 'lool' to be backward compatible + location ~ ^/(c|l)ool { + proxy_pass http://localhost:9980; + proxy_set_header Host $http_host; + } + + # Admin Console websocket + location ^~ /cool/adminws { + proxy_pass http://localhost:9980; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $http_host; + proxy_read_timeout 36000s; + } diff --git a/passwd b/passwd index 1e4681608..5f5c9d69c 100644 --- a/passwd +++ b/passwd @@ -45,3 +45,4 @@ nagios:x:122:129::/var/lib/nagios:/usr/sbin/nologin icingadirector:x:998:130::/var/lib/icingadirector:/bin/false _graphite:x:123:132:Graphite User,,,:/var/lib/graphite:/bin/false netdata:x:997:998::/var/lib/netdata:/bin/sh +cool:x:124:133::/opt/cool:/usr/sbin/nologin diff --git a/passwd- b/passwd- index 4633a1a80..5f5c9d69c 100644 --- a/passwd- +++ b/passwd- @@ -44,3 +44,5 @@ systemd-coredump:x:999:999:systemd Core Dumper:/:/usr/sbin/nologin nagios:x:122:129::/var/lib/nagios:/usr/sbin/nologin icingadirector:x:998:130::/var/lib/icingadirector:/bin/false _graphite:x:123:132:Graphite User,,,:/var/lib/graphite:/bin/false +netdata:x:997:998::/var/lib/netdata:/bin/sh +cool:x:124:133::/opt/cool:/usr/sbin/nologin diff --git a/shadow b/shadow index cdb83f159..1c80f90bb 100644 --- a/shadow +++ b/shadow @@ -45,3 +45,4 @@ nagios:!:18451:0:99999:7::: icingadirector:!:18452:::::: _graphite:*:18452:0:99999:7::: netdata:!:18774:::::: +cool:*:18984:0:99999:7::: diff --git a/shadow- b/shadow- index 7c3ec69a1..1c80f90bb 100644 --- a/shadow- +++ b/shadow- @@ -44,3 +44,5 @@ systemd-coredump:!!:18450:::::: nagios:!:18451:0:99999:7::: icingadirector:!:18452:::::: _graphite:*:18452:0:99999:7::: +netdata:!:18774:::::: +cool:*:18984:0:99999:7::: diff --git a/systemd/system/multi-user.target.wants/coolwsd.service b/systemd/system/multi-user.target.wants/coolwsd.service new file mode 120000 index 000000000..d3e417b0a --- /dev/null +++ b/systemd/system/multi-user.target.wants/coolwsd.service @@ -0,0 +1 @@ +/lib/systemd/system/coolwsd.service \ No newline at end of file -- 2.43.0