From 41d42abefe9a13ca9ae0f3d2d53825a73d0cf744 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 21 Apr 2020 21:18:27 +0200 Subject: ma gum.r: enable feed.euer --- makefu/1systems/gum/config.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'makefu/1systems') diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index 8603d7696..7f7330ea6 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -137,6 +137,7 @@ in { + -- cgit v1.3.1 From 4988384a3f4239e89a33fa434a622577fa2731a1 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 22 Apr 2020 21:29:56 +0200 Subject: ma x.r: giving up on virtualbox again --- makefu/1systems/x/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 4c479875e..169f32c16 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -71,7 +71,7 @@ # Virtualization # - + # #{ # networking.firewall.allowedTCPPorts = [ 8080 ]; # networking.nat = { -- cgit v1.3.1 From 3e6850f128edf0c75437c63ae654f1f524061720 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 22 Apr 2020 23:40:07 +0200 Subject: ma x.r: re-enable virtualbox, fix warning --- makefu/1systems/x/config.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 169f32c16..ea92e3485 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -71,7 +71,7 @@ # Virtualization # - # + #{ # networking.firewall.allowedTCPPorts = [ 8080 ]; # networking.nat = { @@ -162,7 +162,11 @@ krebs.tinc.retiolum.connectTo = [ "omo" "prism" "nextgum" "wbob" ]; # hard dependency because otherwise the device will not be unlocked - boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }]; + boot.initrd.luks.devices.luksroot = + { + device = "/dev/sda2"; + allowDiscards = true; + }; # avoid full boot dir boot.loader.grub.configurationLimit = 3; -- cgit v1.3.1 From d71182a1bb1894acab5b44ddce6df0c682dfe2f4 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 23 Apr 2020 10:23:25 +0200 Subject: ma gum.r: fix owncloud --- makefu/1systems/gum/config.nix | 1 - makefu/2configs/deployment/owncloud.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index 7f7330ea6..5639691e2 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -108,7 +108,6 @@ in { ## network # - diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix index 753fc963b..1cfda6fc5 100644 --- a/makefu/2configs/deployment/owncloud.nix +++ b/makefu/2configs/deployment/owncloud.nix @@ -15,7 +15,7 @@ with lib; let # TODO: copy-paste from lass/2/websites/util.nix - nextcloud = nextcloud18; + nextcloud = pkgs.nextcloud18; serveCloud = domains: let domain = head domains; -- cgit v1.3.1 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 (limited to 'makefu/1systems') 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.3.1 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 (limited to 'makefu/1systems') 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.3.1