From 03d2d7dfd3a1c4fe31fecf6d705f8c4c01637111 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Sat, 11 Dec 2021 01:36:41 +0100 Subject: [PATCH] committing changes in /etc after apt run Package changes: -code-brand 6.4-23 all +code-brand 21.11-10 all +collaboraoffice 21.06.9-1 amd64 +collaboraoffice-ure 21.06.9-1 amd64 +collaboraofficebasis-calc 21.06.9-1 amd64 +collaboraofficebasis-core 21.06.9-1 amd64 +collaboraofficebasis-draw 21.06.9-1 amd64 +collaboraofficebasis-en-us 21.06.9-1 amd64 +collaboraofficebasis-extension-pdf-import 21.06.9-1 amd64 +collaboraofficebasis-graphicfilter 21.06.9-1 amd64 +collaboraofficebasis-images 21.06.9-1 amd64 +collaboraofficebasis-impress 21.06.9-1 amd64 +collaboraofficebasis-math 21.06.9-1 amd64 +collaboraofficebasis-ooofonts 21.06.9-1 amd64 +collaboraofficebasis-ooolinguistic 21.06.9-1 amd64 +collaboraofficebasis-writer 21.06.9-1 amd64 +coolwsd 21.11.0.5-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 | 225 ++++++++++++++++++ coolwsd/proof_key | 27 +++ coolwsd/proof_key.pub | 1 + group | 1 + group- | 1 + gshadow | 1 + gshadow- | 1 + nginx/snippets/coolwsd.conf | 42 ++++ passwd | 1 + passwd- | 2 + shadow | 1 + shadow- | 1 + .../multi-user.target.wants/coolwsd.service | 1 + 18 files changed, 409 insertions(+), 3 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 b44ad034..2c319f65 100755 --- a/.etckeeper +++ b/.etckeeper @@ -265,6 +265,7 @@ maybe chmod 0644 'apache2/.htpasswd' 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/gitweb.conf' maybe chmod 0644 'apache2/conf-available/httpd.conf' maybe chmod 0644 'apache2/conf-available/icingaweb2.conf' @@ -775,7 +776,7 @@ maybe chmod 0644 'apt/apt.conf.d/20archive' maybe chmod 0644 'apt/apt.conf.d/20auto-upgrades' maybe chmod 0644 'apt/apt.conf.d/20dbus' maybe chmod 0644 'apt/apt.conf.d/20packagekit' -maybe chmod 0644 'apt/apt.conf.d/25loolwsd' +maybe chmod 0644 'apt/apt.conf.d/25coolwsd' maybe chmod 0644 'apt/apt.conf.d/50appstream' maybe chmod 0644 'apt/apt.conf.d/50command-not-found' maybe chmod 0644 'apt/apt.conf.d/50unattended-upgrades' @@ -2025,6 +2026,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 'cracklib' maybe chmod 0644 'cracklib/cracklib.conf' maybe chmod 0755 'cron.d' @@ -10711,6 +10721,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 chmod 0644 'ntp.conf' diff --git a/apache2/conf-available/coolwsd.conf b/apache2/conf-available/coolwsd.conf new file mode 100644 index 00000000..f7ecb6f6 --- /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 00000000..be018476 --- /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 48a12763..00000000 --- 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 00000000..ac1e3759 --- /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 00000000..4afd8a10 --- /dev/null +++ b/coolwsd/coolwsd.xml @@ -0,0 +1,225 @@ + + + + + + + + + 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 00000000..c965fc0c --- /dev/null +++ b/coolwsd/proof_key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEogIBAAKCAQEAlylya+zXSR6UFsnQwYavTlCW1Cdd8IVHO8Ms/DDS8vSS/Zip +6Awq6C/qTM4VEIAdpGhAq7dudL43Bniqo/fscRs9RLTBufggQPq0Bz9RAKK6m3i2 +SF0DEuyMdjZOQf99YLI9IZ/aou3k3vmbAC5/BHomQzm+2cVZNA/skKy5jwo0IdeG +W5nqanJytdSUVHDlIrUGgDbhOw88lDEt1UQj5CpG5Kww9oeHIGQjdXdZH7yvOEvJ +u/FodMsHqQ2z92Qq1z0AtvAU6TSleKHgxnChoR+6WP8IIXfBu7Cgh9B0BYJOdUf6 +7es6FVhSwmgAQEPGJyzvPVnLR1m2hxbGxSNa3wIDAQABAoIBAGyFevn0fNKnu1Vo +6hAl63Fj9gS1hoGIjY1gH8mmG6wE3gpmMYTAR4WN8L3XLdQ8xgskNVmSRSBW9xYU +Rx2UfhDtp1zOEE68zhsYYWrakALO0P2Q+fyVmgFaBbVQY3qKO67SB4U+SC60b52M +wTSuLM5AC3wz1sptHg98Zy+ucUE4zaIrPZmILGH6fphJUVegMH8B9MPX8zdRquHB +XlG19uPFKXaY/+xh6x4j1H0UbCBUk8/ac/MBFPiTKTYf+GrCFKZAdWSt6eG9aAaz +YIqR9dzLBGnWr+69r/t62iDw3EHYFO4IL/FENdmi28ZWqcrhy1cgdy+lfYt3Sttt +ftk+AWECgYEAxgjPorHe/HEzma4/9tNNmfQGFDuv7Dmke50zZGE0qtzE39GtPTf0 +xmbldwSisHSllk/Ks264Xe3Ck7Go5IFekxS1m/nozxB/zvZKuuC+DasYqOaaISKb +ah6/2tAgjAmuZmsmgIcofLq8CQWQid1KtUHlZSl3D1M0mPtNPDyq9ccCgYEAw2hd +9OVdcUO9OooRSvWDUO60laFFWraLM/KVMDesqRtwx04uSUJEwMog2GCiHbjq3zWU +jmCFnkDHIRe3yHLzTabAe41FWhE1txeUePMDs4POD7vUv8ppTeOX0x1MWcuNnXbe +ceUGMPzCiqdFZGEae8juy2x5AjmGOZiVJ0u2EikCgYBe93K7DplkbdTU6d76urII +FiGkKkte+PWL4gL3LDZZia1Pt/lf1imny0hXHv31qLqProwCKCJ5yL76nMPlcLSt +y8ybk+i1A7CGy01i+MurOlWFCbD4GuR0q3JNuGkjPrFHpDK+iBI+Xj42BVkfA+QD +sCoVrSDPVJNwmXKcZGuHmQKBgBDLqq+++y4eFWivr1bTDWtqaQknaG+omwRnCF2x +m1yZqDLpTF8tm/06ImKWw7hsSXvP/inSsAlvJe55PGm1P6Zf+9FiziA0tHo9Q5y1 +vo6yeIavrVSi0DRKqKUTsplRPqXXLr15YvPY9du3DubW1dDn72Z6t1fym8/dhoxv +HIIpAoGAG9ao5yjsbkS54T2rWe+kXDAiSgdEsfufS7sdnV/Z3p7YiTtlQPMM7x5r +7Kxw7uXXcZC4Po80jbFaJYvVhyguOYQA97NZrDIj4kHKkeP+Bp6m4Cryz2f5yOsJ +yyz9QJqnVeEX/5MHZJnAINjwy/UB+9PxvvrhUrEGZn06Z1NuqvA= +-----END RSA PRIVATE KEY----- diff --git a/coolwsd/proof_key.pub b/coolwsd/proof_key.pub new file mode 100644 index 00000000..02699c04 --- /dev/null +++ b/coolwsd/proof_key.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXKXJr7NdJHpQWydDBhq9OUJbUJ13whUc7wyz8MNLy9JL9mKnoDCroL+pMzhUQgB2kaECrt250vjcGeKqj9+xxGz1EtMG5+CBA+rQHP1EAorqbeLZIXQMS7Ix2Nk5B/31gsj0hn9qi7eTe+ZsALn8EeiZDOb7ZxVk0D+yQrLmPCjQh14ZbmepqcnK11JRUcOUitQaANuE7DzyUMS3VRCPkKkbkrDD2h4cgZCN1d1kfvK84S8m78Wh0ywepDbP3ZCrXPQC28BTpNKV4oeDGcKGhH7pY/wghd8G7sKCH0HQFgk51R/rt6zoVWFLCaABAQ8YnLO89WctHWbaHFsbFI1rf root@homeserver diff --git a/group b/group index 787e2ff7..4505c5ca 100644 --- a/group +++ b/group @@ -105,3 +105,4 @@ systemd-coredump:x:157: plex:x:158: nelly:x:5005: Debian-snmp:x:121: +cool:x:137: diff --git a/group- b/group- index 1dd0286d..787e2ff7 100644 --- a/group- +++ b/group- @@ -104,3 +104,4 @@ autossh:x:5004: systemd-coredump:x:157: plex:x:158: nelly:x:5005: +Debian-snmp:x:121: diff --git a/gshadow b/gshadow index d34c59aa..f3989465 100644 --- a/gshadow +++ b/gshadow @@ -105,3 +105,4 @@ systemd-coredump:!:: plex:!:: nelly:!:: Debian-snmp:!:: +cool:!:: diff --git a/gshadow- b/gshadow- index b573743b..d34c59aa 100644 --- a/gshadow- +++ b/gshadow- @@ -104,3 +104,4 @@ autossh:!:: systemd-coredump:!:: plex:!:: nelly:!:: +Debian-snmp:!:: diff --git a/nginx/snippets/coolwsd.conf b/nginx/snippets/coolwsd.conf new file mode 100644 index 00000000..6d0814ea --- /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 549abafb..6b224aab 100644 --- a/passwd +++ b/passwd @@ -78,3 +78,4 @@ systemd-coredump:x:150:157:systemd core dump processing,,,:/run/systemd:/usr/sbi plex:x:151:158::/var/lib/plexmediaserver:/bin/bash nelly:x:5005:5005:Nelly:/home/nelly:/bin/sh Debian-snmp:x:133:121::/var/lib/snmp:/bin/false +cool:x:145:137::/opt/cool:/usr/sbin/nologin diff --git a/passwd- b/passwd- index 3ea9406c..6b224aab 100644 --- a/passwd- +++ b/passwd- @@ -77,3 +77,5 @@ autossh:x:5004:5004:ssh tunnel user:/var/lib/autossh:/bin/sh systemd-coredump:x:150:157:systemd core dump processing,,,:/run/systemd:/usr/sbin/nologin plex:x:151:158::/var/lib/plexmediaserver:/bin/bash nelly:x:5005:5005:Nelly:/home/nelly:/bin/sh +Debian-snmp:x:133:121::/var/lib/snmp:/bin/false +cool:x:145:137::/opt/cool:/usr/sbin/nologin diff --git a/shadow b/shadow index 48296f59..dcdad2c3 100644 --- a/shadow +++ b/shadow @@ -78,3 +78,4 @@ systemd-coredump:*:18049:0:99999:7::: plex:*:18115:0:99999:7::: nelly:!:18355:0:99999:7::: Debian-snmp:!:18499:0:99999:7::: +cool:*:18972:0:99999:7::: diff --git a/shadow- b/shadow- index 48296f59..dcdad2c3 100644 --- a/shadow- +++ b/shadow- @@ -78,3 +78,4 @@ systemd-coredump:*:18049:0:99999:7::: plex:*:18115:0:99999:7::: nelly:!:18355:0:99999:7::: Debian-snmp:!:18499:0:99999:7::: +cool:*:18972: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 00000000..d3e417b0 --- /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