From ceaf0a09a2bba72f8db89da6c11e246201165fd3 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 15 May 2021 13:08:41 +0200 Subject: ma bgt/etherpad: bump to latest version --- makefu/2configs/bgt/etherpad.euer.krebsco.de.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'makefu/2configs/bgt') diff --git a/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix b/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix index 48b947c58..cf5b22bae 100644 --- a/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix +++ b/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix @@ -30,8 +30,12 @@ in { proxy_read_timeout 1799s; ''; }; - docker-containers."etherpad-lite" = { - image = "makefoo/bgt-etherpad:2020-05-02.6"; + state = [ "/var/lib/docker/volumes/etherpad_data/_data/" ]; + virtualisation.oci-containers.containers."etherpad-lite" = { + image = "makefoo/bgt-etherpad:2021-04-16.3"; # --build-arg ETHERPAD_PLUGINS="ep_markdown" + # ep_codepad does not work anymore + + #image = "etherpad/etherpad:1.8.13"; ports = [ "127.0.0.1:${toString port}:9001" ]; volumes = [ "/var/src/secrets/etherpad/apikey:/opt/etherpad-lite/APIKEY.txt" @@ -46,7 +50,10 @@ in { #DB_PASS=mypassword environment = { # ADMIN_PASSWORD = "auf jeden fall nicht das echte admin passwort"; + # LOGLEVEL = "DEBUG"; + SUPPRESS_ERRORS_IN_PAD_TEXT = "true"; + TRUST_PROXY = "true"; TITLE = "Binärgewitter Etherpad"; SKIN_NAME = "no-skin"; DEFAULT_PAD_TEXT = builtins.replaceStrings ["\n"] ["\\n"] (builtins.readFile ./template.md); -- cgit v1.2.3 From db56b51ab4d1cecc0e7e664e51b89f04d360680a Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 15 May 2021 13:10:57 +0200 Subject: ma social-to-irc: restart brockman --- makefu/2configs/bgt/social-to-irc.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'makefu/2configs/bgt') diff --git a/makefu/2configs/bgt/social-to-irc.nix b/makefu/2configs/bgt/social-to-irc.nix index dc975c359..ac4c6cad3 100644 --- a/makefu/2configs/bgt/social-to-irc.nix +++ b/makefu/2configs/bgt/social-to-irc.nix @@ -1,10 +1,16 @@ { - # systemd.services.brockman.environment."BROCKMAN_LOG_LEVEL" = "DEBUG"; + systemd.services.brockman.environment."BROCKMAN_LOG_LEVEL" = "DEBUG"; + systemd.services.restart-brockman = { + after = [ "brockman.service" ]; + wantedBy = [ "multi-user.target" ]; + startAt = "daily"; + script = "${pkgs.systemd}/bin/systemctl try-restart brockman.service"; + }; krebs.brockman = { enable = true; config = { channel = "#binaergewitter"; - notifyErrors = false; + notifyErrors = false; irc = { host = "irc.freenode.net"; port = 6667; -- cgit v1.2.3 From 4d08eada4ede46463abfc74b7a03881c26d34b00 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 15 May 2021 13:12:03 +0200 Subject: ma bgt/template: add note about three dashes --- makefu/2configs/bgt/template.md | 1 + 1 file changed, 1 insertion(+) (limited to 'makefu/2configs/bgt') diff --git a/makefu/2configs/bgt/template.md b/makefu/2configs/bgt/template.md index d30cb49eb..af5de0697 100644 --- a/makefu/2configs/bgt/template.md +++ b/makefu/2configs/bgt/template.md @@ -21,6 +21,7 @@ ## Vorschläge ### Backlog von Picks und Lesefoo aus der letzten Woche +die Nachfolgenden 3 Striche sind sehr wichtig, bitte nicht löschen --- ## Blast from the Past -- cgit v1.2.3 From 5bf33d683cbf6f43599ae97aa1c56b1fd0d7d3f3 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 15 May 2021 14:03:43 +0200 Subject: ma gum: disable social-to-irc, fix import for omo --- makefu/2configs/bgt/social-to-irc.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'makefu/2configs/bgt') diff --git a/makefu/2configs/bgt/social-to-irc.nix b/makefu/2configs/bgt/social-to-irc.nix index ac4c6cad3..8e81f9b50 100644 --- a/makefu/2configs/bgt/social-to-irc.nix +++ b/makefu/2configs/bgt/social-to-irc.nix @@ -1,3 +1,4 @@ +{ pkgs, ... }: { systemd.services.brockman.environment."BROCKMAN_LOG_LEVEL" = "DEBUG"; systemd.services.restart-brockman = { -- cgit v1.2.3