From f0f0bc51bf02b94894a5e64e1ea6e0536bdece92 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 2 May 2020 22:57:45 +0200 Subject: ma gum.r: enable etherpad via docker-container --- krebs/3modules/makefu/default.nix | 2 ++ makefu/1systems/gum/config.nix | 1 + .../deployment/docker/etherpad.euer.krebsco.de.nix | 39 ++++++++++++++++++++++ makefu/2configs/deployment/docker/template.md | 34 +++++++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix create mode 100644 makefu/2configs/deployment/docker/template.md diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index c76ed0ad1..e204b4f31 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -182,7 +182,9 @@ in { gum IN A ${nets.internet.ip4.addr} io IN NS gum.krebsco.de. iso.euer IN A ${nets.internet.ip4.addr} + feed.euer IN A ${nets.internet.ip4.addr} board.euer IN A ${nets.internet.ip4.addr} + etherpad.euer IN A ${nets.internet.ip4.addr} rss.euer IN A ${nets.internet.ip4.addr} mediengewitter IN CNAME over.dose.io. mon.euer IN A ${nets.internet.ip4.addr} diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index 5639691e2..a38a671f4 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -140,6 +140,7 @@ in { + diff --git a/makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix b/makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix new file mode 100644 index 000000000..a01f924e7 --- /dev/null +++ b/makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix @@ -0,0 +1,39 @@ +{ 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"; + enableACME = true; + forceSSL = true; + locations."/".proxyPass = "http://localhost:${toString port}"; + }; + docker-containers."etherpad-lite" = { + image = "makefoo/bgt-etherpad:2020-05-02.5"; + 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"; + }; + }; +} diff --git a/makefu/2configs/deployment/docker/template.md b/makefu/2configs/deployment/docker/template.md new file mode 100644 index 000000000..6cf20b1f5 --- /dev/null +++ b/makefu/2configs/deployment/docker/template.md @@ -0,0 +1,34 @@ +# BGT + +1. studio-link aufnehmen drücken (wichtig) + - markus 6407eb63@studio-link.de + - Felix1 1f1021b2@studio-link.de + - L33tFelix 4d47a82a@studio-link.de + - Ingo 03b33b4a@studio-link.de +2. audiocity starten, 48000Hz einstellen, Audio-Device checken und aufnehmen drücken (wichtig) +3. obs starten und aufnehmen drücken (eher unwichtig) +4. darkice starten (wichtig) +4. klatschen +5. Hallo und herzlich Willkommen + +### Backlog von Picks und Lesefoo aus der letzten Woche + + + +## Blast from the Past + +## Vorschläge + +## Toter der Woche + +## Untoter der Woche + +## News + +## Themen + +## Mimimi der Woche + +## Lesefoo + +## Picks -- cgit v1.2.3 From f58fd301fd4e60b9d43d04b9a86cb857cc786c92 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 2 May 2020 23:09:54 +0200 Subject: ma gecloudpad: use config parameters to set baseurl --- makefu/2configs/deployment/gecloudpad/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/makefu/2configs/deployment/gecloudpad/default.nix b/makefu/2configs/deployment/gecloudpad/default.nix index e13ec6ae6..8b88626a3 100644 --- a/makefu/2configs/deployment/gecloudpad/default.nix +++ b/makefu/2configs/deployment/gecloudpad/default.nix @@ -4,12 +4,14 @@ let wsgi-sock = "${workdir}/uwsgi-gecloudpad.sock"; workdir = config.services.uwsgi.runDir; gecloudpad = pkgs.python3Packages.callPackage ./gecloudpad.nix {}; + gecloudpad_settings = pkgs.writeText "gecloudpad_settings" '' + BASEURL = "https://etherpad.euer.krebsco.de" + ''; in { services.uwsgi = { enable = true; user = "nginx"; - # runDir = "/var/lib/photostore"; plugins = [ "python3" ]; instance = { type = "emperor"; @@ -18,6 +20,7 @@ in { type = "normal"; pythonPackages = self: with self; [ gecloudpad ]; socket = wsgi-sock; + env = ["GECLOUDPAD_SETTINGS=${gecloudpad_settings}"]; }; }; }; -- cgit v1.2.3 From ab0906f7aab8a49186e64c4942a516686a132558 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 2 May 2020 23:16:26 +0200 Subject: ma etherpad: update template --- makefu/2configs/deployment/docker/template.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/makefu/2configs/deployment/docker/template.md b/makefu/2configs/deployment/docker/template.md index 6cf20b1f5..a26b2f042 100644 --- a/makefu/2configs/deployment/docker/template.md +++ b/makefu/2configs/deployment/docker/template.md @@ -11,14 +11,13 @@ 4. klatschen 5. Hallo und herzlich Willkommen +## Vorschläge ### Backlog von Picks und Lesefoo aus der letzten Woche - +--- ## Blast from the Past -## Vorschläge - ## Toter der Woche ## Untoter der Woche -- cgit v1.2.3 From a6e2a31e0cb4724a8b56ac03c158316add31ee79 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 21 May 2020 08:38:52 +0200 Subject: nixpkgs: 5adf2a6 -> f45ccd9 --- krebs/nixpkgs.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index d180b5f3b..ecf2df035 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "5adf2a6c11646898742b0c08f7e94101620ba707", - "date": "2020-05-11T09:54:07+01:00", - "sha256": "0wf7pwma2qyfak39b242mcq8z7cdj65sds7hcjxchy0448shapzi", + "rev": "f45ccd9d20b4e90e43c4562b9941ea1dbd8f07a4", + "date": "2020-05-20T11:42:56+02:00", + "sha256": "10476ij19glhs2yy1pmvm0azd75ifjchpfbljn7h1cnnpii1xprc", "fetchSubmodules": false } -- cgit v1.2.3 From 84172b9484e3e0544cc9b9e0cd7455bb23d8259c Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 21 May 2020 10:57:25 +0200 Subject: ma ham/androidtv: bump dependency from 0.0.37 to 0.0.38 --- makefu/2configs/ham/androidtv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefu/2configs/ham/androidtv/default.nix b/makefu/2configs/ham/androidtv/default.nix index b7d397db4..9899b2dd3 100644 --- a/makefu/2configs/ham/androidtv/default.nix +++ b/makefu/2configs/ham/androidtv/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.38"; + version = "0.0.39"; src = fetchPypi { inherit pname version; - sha256 = "0ri1fnc63zashc667w2mlpb0c7ri3x6wnhnf54klb89v73pdnb8k"; + sha256 = "06lrjj74g2f3pkhsn3c8h13mkykgqqf4g9q6x5yv23z6ghjnk2dz"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From 6eb00a342fc674b698ed0296391364e773113cfd Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 21 May 2020 10:58:00 +0200 Subject: ma home-assistant: requires empty config to start up ui --- makefu/2configs/bureautomation/default.nix | 1 + makefu/2configs/ham/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/makefu/2configs/bureautomation/default.nix b/makefu/2configs/bureautomation/default.nix index 3c1659558..c115bcb6c 100644 --- a/makefu/2configs/bureautomation/default.nix +++ b/makefu/2configs/bureautomation/default.nix @@ -41,6 +41,7 @@ in { }; autoExtraComponents = true; config = { + config = {}; discovery = {}; homeassistant = { name = "Bureautomation"; diff --git a/makefu/2configs/ham/default.nix b/makefu/2configs/ham/default.nix index ddcf65b5a..2db4ad4de 100644 --- a/makefu/2configs/ham/default.nix +++ b/makefu/2configs/ham/default.nix @@ -35,6 +35,7 @@ in { ]; }; config = { + config = {}; input_select = zigbee.input_select; # dict timer = zigbee.timer // kurzzeitwecker.timer; # dict homeassistant = { -- cgit v1.2.3 From 2f244cf3a85c82a57d34b42e3aaf80162bdf65a7 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 21 May 2020 10:58:53 +0200 Subject: ma zigbee2mqtt: start up after network is available --- makefu/2configs/ham/zigbee2mqtt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/makefu/2configs/ham/zigbee2mqtt/default.nix b/makefu/2configs/ham/zigbee2mqtt/default.nix index 7c55326f9..84d32c872 100644 --- a/makefu/2configs/ham/zigbee2mqtt/default.nix +++ b/makefu/2configs/ham/zigbee2mqtt/default.nix @@ -17,4 +17,5 @@ volumes = ["/var/lib/zigbee2mqtt:/app/data"]; }; state = [ "/var/lib/zigbee2mqtt/configuration.yaml" "/var/lib/zigbee2mqtt/state.json" ]; + systemd.services.docker-zigbee2mqtt.after = [ "home-assistant.service" "docker.service" "network-online.target" ]; } -- cgit v1.2.3 From 4ba18c6d2a442834e79b5526eff0aa2c5f8398e8 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 21 May 2020 11:03:32 +0200 Subject: ma omo,x.r: disable ipv6 until studio-link issue is resolved --- makefu/1systems/omo/config.nix | 24 ++++++++++++++---------- makefu/1systems/x/config.nix | 2 ++ makefu/2configs/legacy_only.nix | 8 ++++++++ 3 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 makefu/2configs/legacy_only.nix diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix index 37fb9128d..cfe0d0a3f 100644 --- a/makefu/1systems/omo/config.nix +++ b/makefu/1systems/omo/config.nix @@ -26,6 +26,10 @@ in { # # # + + + + { krebs.airdcpp.dcpp.shares = let @@ -125,16 +129,16 @@ in { zramSwap.enable = true; - krebs.Reaktor.reaktor-shack = { - nickname = "Reaktor|shack"; - workdir = "/var/lib/Reaktor/shack"; - channels = [ "#shackspace" ]; - plugins = with pkgs.ReaktorPlugins; - [ shack-correct - # stockholm-issue - sed-plugin - random-emoji ]; - }; + #krebs.Reaktor.reaktor-shack = { + # nickname = "Reaktor|shack"; + # workdir = "/var/lib/Reaktor/shack"; + # channels = [ "#shackspace" ]; + # plugins = with pkgs.ReaktorPlugins; + # [ shack-correct + # # stockholm-issue + # sed-plugin + # random-emoji ]; + #}; #krebs.Reaktor.reaktor-bgt = { # nickname = "Reaktor|bgt"; # workdir = "/var/lib/Reaktor/bgt"; diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index ea92e3485..4e6706b25 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -19,7 +19,9 @@ { programs.adb.enable = true; } + { systemd.services.docker.wantedBy = lib.mkForce []; } + # #{ # netboot_server = { diff --git a/makefu/2configs/legacy_only.nix b/makefu/2configs/legacy_only.nix new file mode 100644 index 000000000..3d40471ba --- /dev/null +++ b/makefu/2configs/legacy_only.nix @@ -0,0 +1,8 @@ +{ networking.enableIPv6 = false; + boot.kernel.sysctl = { + "net.ipv6.conf.all.disable_ipv6" = 1; + "net.ipv6.conf.default.disable_ipv6" = 1; + "net.ipv6.conf.lo.disable_ipv6" = 1; + }; + boot.kernelParams = [ "ipv6.disable=1" ]; +} -- cgit v1.2.3