From 80ca19617389d628087e9e4a271bae43e5dfbf74 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 12 Mar 2021 20:25:37 +0100 Subject: ma etherpad: increase timeouts to 30 minutes --- makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'makefu/2configs/deployment/docker') diff --git a/makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix b/makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix index 172e69c4d..48b947c58 100644 --- a/makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix +++ b/makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix @@ -6,7 +6,7 @@ in { services.nginx.virtualHosts."etherpad.euer.krebsco.de" = { # useACMEHost = "euer.krebsco.de"; extraConfig = '' - ssl_session_timeout 5m; + ssl_session_timeout 30m; ''; enableACME = true; forceSSL = true; @@ -27,7 +27,7 @@ in { # WebSocket proxying - from https://nginx.org/en/docs/http/websocket.html proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - proxy_read_timeout 61s; + proxy_read_timeout 1799s; ''; }; docker-containers."etherpad-lite" = { -- cgit v1.2.3 From ca13f21f885b608138779282013caf20ee92ddad Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 12 Mar 2021 20:26:27 +0100 Subject: ma etherpad: mv to bgt --- .../deployment/docker/etherpad.euer.krebsco.de.nix | 60 ---------------------- 1 file changed, 60 deletions(-) delete mode 100644 makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix (limited to 'makefu/2configs/deployment/docker') diff --git a/makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix b/makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix deleted file mode 100644 index 48b947c58..000000000 --- a/makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, ... }: -let - port = 19201; -in { - #services.nginx.virtualHosts."euer.krebsco.de".serverAliases = [ "etherpad.euer.krebsco.de" ]; - services.nginx.virtualHosts."etherpad.euer.krebsco.de" = { - # useACMEHost = "euer.krebsco.de"; - extraConfig = '' - ssl_session_timeout 30m; - ''; - enableACME = true; - forceSSL = true; - locations."/".proxyPass = "http://localhost:${toString port}"; - # from https://github.com/ether/etherpad-lite/wiki/How-to-put-Etherpad-Lite-behind-a-reverse-Proxy - locations."/".extraConfig = '' - - proxy_buffering off; # be careful, this line doesn't override any proxy_buffering on set in a conf.d/file.conf - proxy_set_header Host $host; - proxy_pass_header Server; - - # Note you might want to pass these headers etc too. - proxy_set_header X-Real-IP $remote_addr; # https://nginx.org/en/docs/http/ngx_http_proxy_module.html - proxy_set_header X-Forwarded-For $remote_addr; # EP logs to show the actual remote IP - proxy_set_header X-Forwarded-Proto $scheme; # for EP to set secure cookie flag when https is used - proxy_http_version 1.1; # recommended with keepalive connections - - # WebSocket proxying - from https://nginx.org/en/docs/http/websocket.html - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_read_timeout 1799s; - ''; - }; - docker-containers."etherpad-lite" = { - image = "makefoo/bgt-etherpad:2020-05-02.6"; - ports = [ "127.0.0.1:${toString port}:9001" ]; - volumes = [ - "/var/src/secrets/etherpad/apikey:/opt/etherpad-lite/APIKEY.txt" - "etherpad_data:/opt/etherpad-lite/var" # persistent dirtydb - ]; - # for postgres - #DB_TYPE=postgres - #DB_HOST=db.local - #DB_PORT=4321 - #DB_NAME=etherpad - #DB_USER=dbusername - #DB_PASS=mypassword - environment = { - # ADMIN_PASSWORD = "auf jeden fall nicht das echte admin passwort"; - SUPPRESS_ERRORS_IN_PAD_TEXT = "true"; - TITLE = "Binärgewitter Etherpad"; - SKIN_NAME = "no-skin"; - DEFAULT_PAD_TEXT = builtins.replaceStrings ["\n"] ["\\n"] (builtins.readFile ./template.md); - PAD_OPTIONS_USE_MONOSPACE_FONT = "true"; - PAD_OPTIONS_USER_NAME = "true"; - PAD_OPTIONS_USER_COLOR = "true"; - PAD_OPTIONS_CHAT_AND_USERS = "true"; - PAD_OPTIONS_LANG = "en-US"; - }; - }; -} -- cgit v1.2.3 From 921e46c16a8dc60f5f5679dffb269aad8f472cc5 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 12 Mar 2021 20:54:06 +0100 Subject: ma etherpad: also move template.md --- makefu/2configs/deployment/docker/template.md | 42 --------------------------- 1 file changed, 42 deletions(-) delete mode 100644 makefu/2configs/deployment/docker/template.md (limited to 'makefu/2configs/deployment/docker') diff --git a/makefu/2configs/deployment/docker/template.md b/makefu/2configs/deployment/docker/template.md deleted file mode 100644 index e53bad7e8..000000000 --- a/makefu/2configs/deployment/docker/template.md +++ /dev/null @@ -1,42 +0,0 @@ -# BGT - -0. Sendung twittern und mastodieren (eine Woche + eine Stunde vorher) -1. `eine` Person anrufen (den Host): - - markus 6407eb63@studio-link.de - - Felix1 f3d394f4ab@studio.link - - L33tFelix 842f85eb@studio-link.de - - Ingo 5c37dbab52@studio.link -2. studio-link aufnehmen drücken, schauen ob file local.flac größer wird (wichtig) -3. audiocity starten, 48000Hz einstellen, Audio-Device checken und aufnehmen drücken (wichtig) -3. alternative parecord: - `$ pacmd list-sources | grep -e device.string -e 'name:' # keins der "monitor" devices` - `$ parecord --channels=1 -d alsa_input.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo bgt.wav` -4. OBS starten und aufnehmen drücken (eher unwichtig) -5. darkice starten (wichtig) -6. klatschen -7. Hallihallo und Herzlich Willkommen -8. chapter-marker starten mit ctrl-u auf "H" von "Halli" (wichtig) -9. Blast markieren und ctrl-j drücken für neuen Eintrag - -## Vorschläge -### Backlog von Picks und Lesefoo aus der letzten Woche - ---- - -## Blast from the Past - -## Toter der Woche - -## Untoter der Woche - -## News - -## Themen - -## Mimimi der Woche - -## Lesefoo - -## Picks - -## Ende -- cgit v1.2.3