enable ssh for stream user

cleanup default apps
nixda: disable companion
2021-12-25 18:56:50 +01:00 · 2021-12-25 18:56:29 +01:00 · 2021-12-19 17:21:43 +01:00
227 changed files with 569 additions and 16407 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -7,3 +7,10 @@ build-parsons:
  stage: build
  script:
    - nix-build -A deploy.parsons
+
+build-nixda:
+  tags:
+    - nix
+  stage: build
+  script:
+    - nix-build -A deploy.nixda
--- a/README.md
+++ b/README.md
@ -10,8 +10,6 @@ welcome to hacc nixfiles (haccfiles). this is the code describing our nix-based
 - `modules/`: home-grown modules for hacc-specific services
 - `nix/`: sources files, managed with niv
 - `pkgs/`: packages we built and don't want to upstream
- `hosts/`: configuration.nix per host
- `services/`: all services we run; imported in appropriate host config

 ## working with the haccfiles

@ -22,19 +20,6 @@ nix build -f . deploy.$hostname && ./result switch

 `$hostname` can be replaced with any hostname or group

-## I don't want to build this long dependency / want a cached version!
-
-If it's still available on parsons from a previous deploy, do:
-
-```shell
-nix copy --from ssh://parsons /nix/store/...
-```
-
-Note: don't just copy the .drv file (which Nix complains about if it can't
-build something), that's just the description of how to build it! If you
-don't know the actual outpath, look in the .drv file (should start with
-`Derive([("out","[the path you want]"...`)
-
 ## committing to haccfiles
 - Golden Rule: DO NOT COMMIT TO MAIN
  - exceptions apply, if you are not sure where to commit, don't commit to main
--- a/common/default.nix
+++ b/common/default.nix
@ -45,7 +45,7 @@ in {
  environment.systemPackages = with pkgs; [
    smartmontools lm_sensors htop tcpdump nload iftop
    bottom 
-    ripgrep vgrep
+    ripgrep
    git wget
    kitty.terminfo
    rsync pv progress
@ -70,7 +70,6 @@ in {
    s-tui stress
    ffmpeg-full
    bat 
-    niv
  ];

  security.acme.email = "info+acme@hacc.space";
--- a/common/users.nix
+++ b/common/users.nix
@ -48,13 +48,13 @@
      packages = with pkgs; [ ffmpeg ];
    };

-    moira = {
+    schweby = {
      uid = 1004;
      shell = pkgs.fish;
      isNormalUser = true;
      extraGroups = [ "wheel" "cdrom" ];
      openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJrcJRF71+XM5YZj+SaSiGcdVZ0IDxGBXIWssDtHiTtr moira_2022_06"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL6JWi0MBDz0Zy4zjauQv28xYmHyapb8D4zeesq91LLE schweby@txsbcct"
      ];
      hashedPassword = "$6$zkAsaVdmIduqZxez$GY9aBlYeP41F0it/VbbZzLLLRQhHAbDdFsa3e/1GS9McTuSimMHODg6HqNVEH1zSqD3afhK/0UHfqbtF5qpi90";
    };
--- a/hosts/nixda/configuration.nix
+++ b/hosts/nixda/configuration.nix
@ -24,8 +24,8 @@
  hardware.decklink.enable = true;

  networking.hostName = "nixda"; # Define your hostname.
-
-  environment.systemPackages = with pkgs; [ blackmagicDesktopVideo blender companion ];
+## environment.systemPackages = with pkgs; [ blackmagicDesktopVideo blender companion ];
+  environment.systemPackages = with pkgs; [ blackmagicDesktopVideo blender ];

  networking.wg-quick.interfaces.cornbox = {
    privateKeyFile = "/etc/wireguard/cornbox.key";
--- a/hosts/parsons/configuration.nix
+++ b/hosts/parsons/configuration.nix
@ -16,12 +16,12 @@
    ../../services/hedgedoc-i4f.nix
    ../../services/mail.nix
    ../../services/syncthing.nix
-    ../../services/gitea.nix
+    ../../services/gitlab.nix
    ../../services/nginx-pages.nix
+    ../../services/gitlab-runner.nix
    ../../services/lantifa.nix
    ../../services/vaultwarden.nix
-    ../../services/uffd.nix
-    # ../../services/workadventure.nix
+    ../../services/workadventure.nix

    ./lxc.nix
  ];
@ -79,7 +79,7 @@

  services.restic.backups.tardis = {
    passwordFile = "/persist/restic/system";
-    environmentFile = "/persist/restic/system.s3creds";
+    s3CredentialsFile = "/persist/restic/system.s3creds";
    paths = [
      "/home"
      "/persist"
--- a/modules/default.nix
+++ b/modules/default.nix
@ -5,7 +5,7 @@ in {
  imports = [
    ./nftnat
    ./decklink.nix
-    ./websites.nix
+    "${sources.nixpkgs-unstable}/nixos/modules/services/security/vaultwarden"
  ];

  # disabled since vaultwarden defines a dummy bitwarden_rs option that
--- a/modules/mattermost.nix
+++ b/modules/mattermost.nix
@ -6,9 +6,13 @@ let

  cfg = config.services.mattermost-patched;

+  defaultConfig = builtins.fromJSON (builtins.replaceStrings [ "\\u0026" ] [ "&" ]
+    (readFile "${pkgs.mattermost}/config/config.json")
+  );
+
  database = "postgres://${cfg.localDatabaseUser}:${cfg.localDatabasePassword}@localhost:5432/${cfg.localDatabaseName}?sslmode=disable&connect_timeout=10";

-  mattermostConf = foldl recursiveUpdate {}
+  mattermostConf = foldl recursiveUpdate defaultConfig
    [ { ServiceSettings.SiteURL = cfg.siteUrl;
        ServiceSettings.ListenAddress = cfg.listenAddress;
        TeamSettings.SiteName = cfg.siteName;
@ -223,7 +227,7 @@ in
          User = cfg.user;
          Group = cfg.group;
          ExecStart = "${pkgs.mattermost}/bin/mattermost" +
-            (if cfg.mutableConfig then " -c ${database}" else " -c ${cfg.statePath}/config/config.json");
+            (lib.optionalString (!cfg.mutableConfig) " -c ${database}");
          WorkingDirectory = "${cfg.statePath}";
          Restart = "always";
          RestartSec = "10";
--- a/modules/websites.nix
+++ b/modules/websites.nix
@ -1,53 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.hacc.websites;
-in
-
-{
-  options.hacc.websites = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
-    directory = mkOption {
-      type = types.path;
-      description = "all subdirectories of the given path are expected to contain a (static) website";
-    };
-    ignore = mkOption {
-      type = types.listOf types.str;
-      default = [];
-      description = "subdirectories that shouldn't be published";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    services.nginx = {
-      enable = true;
-      virtualHosts =
-        let
-          subdirs =
-            let dirAttrs = filterAttrs
-              (n: v: v == "directory" || lists.elem n cfg.ignore)
-              (builtins.readDir cfg.directory);
-            in mapAttrsToList (n: v: n) dirAttrs;
-
-          mkWebsite = subdir: {
-            name = subdir;
-            # the nginx virtualhost config (for all sites) goes in here
-            value = {
-              enableACME = true;
-              forceSSL = true;
-
-              # naive string interpolation is safe here since nix will always immediately
-              # resolve relative paths to absolute paths; it's not lazy about that.
-              locations."/".root =
-                (pkgs.callPackage "${cfg.directory}/${subdir}" {}).outPath;
-            };
-          };
-        in listToAttrs (map mkWebsite subdirs);
-    };
-  };
-}
--- a/nix/sources.json
+++ b/nix/sources.json
@ -2,19 +2,19 @@
    "haccmap": {
        "branch": "master",
        "repo": "https://gitlab.infra4future.de/hacc/haccspace-rc3-map",
-        "rev": "9490ebf656ef379e51cb518ec0038e15d6aeaac6",
+        "rev": "3b99ee7e5bb2f27044784d03572da77d39cb2427",
        "type": "git"
    },
    "home-manager": {
-        "branch": "release-21.11",
+        "branch": "release-21.05",
        "description": "Manage a user environment using Nix  [maintainer=@rycee] ",
        "homepage": "https://nix-community.github.io/home-manager/",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0",
-        "sha256": "1fi27zabvqlyc2ggg7wr01j813gs46rswg1i897h9hqkbgqsjkny",
+        "rev": "7329ffc6e911106494183557fc249180d5422929",
+        "sha256": "1liqvc6bhfypscbvq953j8izw806xn4vklh86zyqpkmsa5ac0yvp",
        "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/d93d56ab8c1c6aa575854a79b9d2f69d491db7d0.tar.gz",
+        "url": "https://github.com/nix-community/home-manager/archive/7329ffc6e911106494183557fc249180d5422929.tar.gz",
        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
    },
    "mattermost-server": {
@ -23,19 +23,25 @@
        "homepage": "https://mattermost.com",
        "owner": "mattermost",
        "repo": "mattermost-server",
-        "rev": "2ea14ef395fad8919b2f4137642a7f50b370ffba",
-        "sha256": "1k5zqnc4yqnad2cw1wpqk22mjra08jz9gf4v692kbrgx3x4d13kh",
+        "rev": "62d4d8166d85bbc47a2d9223e3e7b3b5bfb54d9d",
+        "sha256": "0ni10mv38qjyyrygs66ja3ayhn61rhbxxvvfr3rmkkn5mvpzyp92",
        "type": "tarball",
-        "url": "https://github.com/mattermost/mattermost-server/archive/refs/tags/v6.7.2.tar.gz",
+        "url": "https://github.com/mattermost/mattermost-server/archive/refs/tags/v6.1.0.tar.gz",
        "url_template": "https://github.com/<owner>/<repo>/archive/refs/tags/v<version>.tar.gz",
-        "version": "6.7.2"
+        "version": "6.1.0"
    },
    "mattermost-webapp": {
-        "sha256": "0pwjfklk0q28yza2iny0im5pq3x430jskvq6rvfq7ycx251s98hx",
+        "sha256": "1g47qgy9fg4jzgywpsbzkvjk24llgxyfqlzf1ghsaqgcwjvnm594",
        "type": "tarball",
-        "url": "https://releases.mattermost.com/6.7.2/mattermost-6.7.2-linux-amd64.tar.gz",
+        "url": "https://releases.mattermost.com/6.1.0/mattermost-6.1.0-linux-amd64.tar.gz",
        "url_template": "https://releases.mattermost.com/<version>/mattermost-<version>-linux-amd64.tar.gz",
-        "version": "6.7.2"
+        "version": "6.1.0"
+    },
+    "mumble-website": {
+        "branch": "master",
+        "repo": "https://gitlab.infra4future.de/hacc/infra4future/mumble.infra4future.de.git",
+        "rev": "3a70bf8aa1f4bb56524d36153b84cfb538c4f787",
+        "type": "git"
    },
    "niv": {
        "branch": "master",
@ -43,10 +49,10 @@
        "homepage": "https://github.com/nmattia/niv",
        "owner": "nmattia",
        "repo": "niv",
-        "rev": "82e5cd1ad3c387863f0545d7591512e76ab0fc41",
-        "sha256": "090l219mzc0gi33i3psgph6s2pwsc8qy4lyrqjdj4qzkvmaj65a7",
+        "rev": "5830a4dd348d77e39a0f3c4c762ff2663b602d4c",
+        "sha256": "1d3lsrqvci4qz2hwjrcnd8h5vfkg8aypq3sjd4g3izbc8frwz5sm",
        "type": "tarball",
-        "url": "https://github.com/nmattia/niv/archive/82e5cd1ad3c387863f0545d7591512e76ab0fc41.tar.gz",
+        "url": "https://github.com/nmattia/niv/archive/5830a4dd348d77e39a0f3c4c762ff2663b602d4c.tar.gz",
        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
    },
    "nix-hexchen": {
@ -60,25 +66,37 @@
        "url_template": "<repo>/-/archive/<rev>.tar.gz"
    },
    "nixos-mailserver": {
-        "branch": "nixos-21.11",
-        "ref": "nixos-21.11",
+        "branch": "nixos-21.05",
+        "ref": "nixos-21.05",
        "repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver",
-        "rev": "6e3a7b2ea6f0d68b82027b988aa25d3423787303",
-        "sha256": "1i56llz037x416bw698v8j6arvv622qc0vsycd20lx3yx8n77n44",
+        "rev": "5675b122a947b40e551438df6a623efad19fd2e7",
+        "sha256": "1fwhb7a5v9c98nzhf3dyqf3a5ianqh7k50zizj8v5nmj3blxw4pi",
        "type": "tarball",
-        "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/6e3a7b2ea6f0d68b82027b988aa25d3423787303.tar.gz",
+        "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/5675b122a947b40e551438df6a623efad19fd2e7.tar.gz",
        "url_template": "<repo>/-/archive/<rev>.tar.gz"
    },
    "nixpkgs": {
+        "branch": "nixos-21.05",
+        "description": "Nix Packages collection",
+        "homepage": "",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "3b422991781220853035dbe353ba8b7cb279b6b3",
+        "sha256": "0w4dmvjbvyqmn43b5r8anlynbm8bgmb79iqxrh9r04y0kpnbz5pz",
+        "type": "tarball",
+        "url": "https://github.com/nixos/nixpkgs/archive/3b422991781220853035dbe353ba8b7cb279b6b3.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "nixpkgs-new": {
        "branch": "nixos-21.11",
        "description": "Nix Packages collection",
        "homepage": "",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d",
-        "sha256": "04ffwp2gzq0hhz7siskw6qh9ys8ragp7285vi1zh8xjksxn1msc5",
+        "rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65",
+        "sha256": "1fx6nqz8x9biwlwsnh67z5qz0fmrdgr01yvmdw2cw9xjx8hyss3s",
        "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/eabc38219184cc3e04a974fe31857d8e0eac098d.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/1bd4bbd49bef217a3d1adea43498270d6e779d65.tar.gz",
        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
    },
    "nixpkgs-unstable": {
@ -87,10 +105,10 @@
        "homepage": "",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90",
-        "sha256": "0dq22dagzk76x2ws4dz88w018i6byamd6rnzqizx68bzimg6g7xn",
+        "rev": "581d2d6c9cd5c289002203581d8aa0861963a933",
+        "sha256": "1qpmqj075pppa6ihmkacf491lhq7rpxlcm8cm6h18raardsr3irr",
        "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/581d2d6c9cd5c289002203581d8aa0861963a933.tar.gz",
        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
    },
    "workadventure": {
--- a/nix/sources.nix
+++ b/nix/sources.nix
@ -31,28 +31,8 @@ let
          if spec ? branch then "refs/heads/${spec.branch}" else
            if spec ? tag then "refs/tags/${spec.tag}" else
              abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
-      submodules = if spec ? submodules then spec.submodules else false;
-      submoduleArg =
-        let
-          nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
-          emptyArgWithWarning =
-            if submodules == true
-            then
-              builtins.trace
-                (
-                  "The niv input \"${name}\" uses submodules "
-                  + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
-                  + "does not support them"
-                )
-                {}
-            else {};
-        in
-          if nixSupportsSubmodules
-          then { inherit submodules; }
-          else emptyArgWithWarning;
    in
-      builtins.fetchGit
-        ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
+      builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };

  fetch_local = spec: spec.path;

--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@ -4,13 +4,14 @@ let
  sources = import ../nix/sources.nix;
  pkgs = import sources.nixpkgs args;
  unstable = import sources.nixpkgs-unstable args;
+  new = import sources.nixpkgs-new args;

  callPackage = pkgs.lib.callPackageWith (pkgs // newpkgs);

  newpkgs = {
    alps = callPackage ./alps {};

-    companion = callPackage ./companion {};
+#    companion = callPackage ./companion {};
    libvips = callPackage ./libvips {};

    docker = pkgs.docker.overrideAttrs (super: {
@ -60,8 +61,6 @@ let
      '';
    };

-    uffd = callPackage ./uffd {};
-
    inherit (unstable) bottom vaultwarden vaultwarden-vault;
  };

--- a/pkgs/mattermost/default.nix
+++ b/pkgs/mattermost/default.nix
@ -12,9 +12,10 @@ let

    goPackagePath = "github.com/mattermost/mattermost-server";

-    ldflags = [
-        "-X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}"
-    ];
+    buildFlagsArray = ''
+      -ldflags=
+        -X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}
+    '';

  };

--- a/pkgs/uffd/default.nix
+++ b/pkgs/uffd/default.nix
@ -1,34 +0,0 @@
-{ stdenv, lib, python3Packages, fetchzip }:
-
-python3Packages.buildPythonPackage rec {
-  pname = "uffd";
-  version = "2.0.1";
-
-  src = fetchzip {
-    url = "https://git.cccv.de/uffd/uffd/-/archive/v${version}/uffd-v${version}.tar.gz";
-    hash = "sha256-KP4J1bw5u7MklaPu2SBFRNyGgkKOBOpft5MMH+em5M4=";
-  };
-
-  patches = [ ./gitea-magic.patch ./fix-setuppy.patch ./fix-userinfo.patch ];
-
-  propagatedBuildInputs = with python3Packages; [
-    flask
-    flask_sqlalchemy
-    flask_migrate
-    qrcode
-    fido2
-    oauthlib
-    flask-babel
-    argon2_cffi
-    itsdangerous
-    alembic
-    Mako
-  ];
-
-  postPatch = ''
-    sed -i -e 's/==[0-9.]\+//g' setup.py
-  '';
-
-  doCheck = false;
-  doInstallCheck = false;
-}
--- a/pkgs/uffd/fix-setuppy.patch
+++ b/pkgs/uffd/fix-setuppy.patch
@ -1,34 +0,0 @@
--- a/setup.py	2022-04-30 13:12:45.564651955 +0000
-+++ b/setup.py	2022-04-30 13:17:02.545809513 +0000
-@@ -41,31 +41,5 @@
- 		'Flask-Babel==0.11.2',
- 		'alembic==1.0.0',
- 		'argon2-cffi==18.3.0',
-
-		# The main dependencies on their own lead to version collisions and pip is
-		# not very good at resolving them, so we pin the versions from Debian Buster
-		# for all dependencies.
-		'certifi==2018.8.24',
-		#cffi==1.12.2'
-		'cffi # v1.12.2 no longer works with python3.9. Newer versions seem to work fine.',
-		'chardet==3.0.4',
-		'click==7.0',
-		'cryptography==2.6.1',
-		'idna==2.6',
-		'itsdangerous==0.24',
-		'Jinja2==2.10',
-		'MarkupSafe==1.1.0',
-		'oauthlib==2.1.0',
-		'pyasn1==0.4.2',
-		'pycparser==2.19',
-		'requests==2.21.0',
-		'requests-oauthlib==1.0.0',
-		'six==1.12.0',
-		'SQLAlchemy==1.2.18',
-		'urllib3==1.24.1',
-		'Werkzeug==0.14.1',
-		'python-dateutil==2.7.3',
-		#editor==1.0.3
-		'Mako==1.0.7',
- 	],
- )
--- a/pkgs/uffd/fix-userinfo.patch
+++ b/pkgs/uffd/fix-userinfo.patch
@ -1,10 +0,0 @@
--- a/uffd/oauth2/views.py	2022-04-30 20:39:53.825474990 +0000
-+++ b/uffd/oauth2/views.py	2022-04-30 20:40:12.632389377 +0000
-@@ -234,6 +234,7 @@
- 		id=user.unix_uid,
- 		name=user.displayname,
- 		nickname=user.loginname,
-+		username=user.loginname,
- 		email=user.mail,
- 		groups=[group.name for group in user.groups]
- 	)
--- a/pkgs/uffd/gitea-magic.patch
+++ b/pkgs/uffd/gitea-magic.patch
@ -1,32 +0,0 @@
-From e3c0995160a653ef6cd8784b255036585b273b82 Mon Sep 17 00:00:00 2001
-From: stuebinm <stuebinm@disroot.org>
-Date: Wed, 20 Jul 2022 18:02:15 +0200
-Subject: [PATCH] magic gitea patch
-
---
- uffd/oauth2/views.py | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/uffd/oauth2/views.py b/uffd/oauth2/views.py
-index d13fd42..94352be 100644
--- a/uffd/oauth2/views.py
-+++ b/uffd/oauth2/views.py
-@@ -230,6 +230,15 @@ def oauth_required(*scopes):
- @oauth_required('profile')
- def userinfo():
- 	user = request.oauth.user
-+	client = request.oauth.client_id
-+	if client == "gitea":
-+		return jsonify(
-+	    		id=user.unix_uid,
-+    			full_name=user.displayname,
-+	    		login=user.loginname,
-+			email=user.mail,
-+    			groups=[group.name for group in user.groups]
-+		)
- 	return jsonify(
- 		id=user.unix_uid,
- 		name=user.displayname,
-- 
-2.36.0
-
--- a/services/gitea.nix
+++ b/services/gitea.nix
@ -1,133 +0,0 @@
-{ config, lib, pkgs, profiles, modules, evalConfig, sources, ... }:
-
-{
-  containers.gitea = {
-    privateNetwork = true;
-    hostAddress = "192.168.100.1";
-    localAddress = "192.168.100.10";
-    autoStart = true;
-    bindMounts = {
-      "/persist" = {
-        hostPath = "/persist/containers/gitea";
-        isReadOnly = false;
-      };
-    };
-    path = (evalConfig {
-      hosts = { };
-      groups = { };
-    } ({ config, lib, pkgs, profiles, modules, sources, ... }: {
-      boot.isContainer = true;
-      networking.useDHCP = false;
-      users.users.root.hashedPassword = "";
-
-      imports = [ ((import sources.nix-hexchen) { }).profiles.nopersist ];
-
-      environment.systemPackages = [ pkgs.gitea ];
-
-      hexchen.bindmounts."/var/lib/gitea" = "/persist/gitea";
-
-      nixpkgs.config.allowUnfree = true;
-      networking.firewall.enable = false;
-      networking.defaultGateway = {
-        address = "192.168.100.1";
-        interface = "eth0";
-      };
-      services.coredns = {
-        enable = true;
-        config = ''
-          .:53 {
-            forward . 1.1.1.1
-          }
-        '';
-      };
-      services.gitea = {
-        enable = true;
-        appName = "0x0: git for all creatures";
-        rootUrl = "https://git.infra4future.de/";
-        httpAddress = "0.0.0.0";
-        httpPort = 3000;
-        lfs.enable = true;
-        disableRegistration = true;
-        database.type = "postgres";
-        cookieSecure = true;
-        log.level = "Info";
-        #  mailerPasswordFile =
-        #    "/var/lib/secrets/noreply"; # see below for access permissions
-        settings = {
-          #    mailer = {
-          #      ENABLED = true;
-          #      HOST = "0x0.rip:465";
-          #      FROM = "noreply@0x0.rip";
-          #      ENVELOPE_FROM = "noreply@0x0.rip";
-          #      USER = "noreply@0x0.rip";
-
-          #    };
-          repository = {
-            DEFAULT_PRIVATE = "public";
-            PREFERRED_LICENSES = "Unlicense";
-            DEFAULT_BRANCH = "main";
-          };
-          oauth2_client = {
-            ACCOUNT_LINKING = "auto";
-            ENABLE_AUTO_REGISTRATION = true;
-          };
-          "repository.pull-requests" = {
-            DEFAULT_MERGE_STYLE = "merge";
-            DEFAULT_MERGE_MESSAGE_ALL_AUTHORS = true;
-          };
-          "repository.upload".FILE_MAX_SIZE = 1024;
-          server = {
-            LANDING_PAGE = "explore";
-            OFFLINE_MODE = true;
-          };
-          security = { INSTALL_LOCK = true; };
-          other = {
-            SHOW_FOOTER_VERSION = false;
-            SHOW_FOOTER_TEMPLATE_LOAD_TIME = false;
-          };
-          cron = {
-            ENABLED = true;
-            NOTICE_ON_SUCCESS = true;
-          };
-          "cron.update_mirrors" = {
-            SCHEDULE = "@every 12h";
-            PULL_LIMIT = "-1";
-            PUSH_LIMIT = "-1";
-          };
-          "cron.git_gc_repos".ENABLED = true;
-          "cron.delete_old_actions".ENABLED = true;
-        };
-      };
-      services.postgresqlBackup = {
-        enable = true;
-        databases = [ "gitea" ];
-        startAt = "*-*-* 23:45:00";
-        location = "/persist/backups/postgres";
-      };
-      services.openssh = {
-        enable = true;
-        passwordAuthentication = false;
-        listenAddresses = [ {
-          addr = "192.168.100.10";
-          port = 22;
-        } ];
-        extraConfig = ''
-          AcceptEnv GIT_PROTOCOL
-        '';
-      };
-    })).config.system.build.toplevel;
-  };
-
-  services.nginx.virtualHosts."git.infra4future.de" = {
-    forceSSL = true;
-    enableACME = true;
-    locations."/" = {
-      proxyPass = "http://${config.containers.gitea.localAddress}:3000";
-    };
-  };
-  hexchen.nftables.nat.forwardPorts = [{
-    ports = [ 22 ];
-    destination = "${config.containers.gitea.localAddress}:22";
-    proto = "tcp";
-  }];
-}
--- a/services/gitlab-runner.nix
+++ b/services/gitlab-runner.nix
@ -0,0 +1,63 @@
+{config, pkgs, lib, ...}:
+
+{
+  services.gitlab-runner = {
+    enable = true;
+    concurrent = 4;
+    services = {
+      infra4future = {
+        buildsDir = "/persist/var/lib/gitlab-runner/builds";
+        dockerImage = "nixos/nix";
+        executor = "docker";
+        registrationConfigFile = "/persist/var/lib/gitlab-runner/gitlab-runner.env";
+      };
+      nix = {
+        limit = 1; # don't run multiple jobs
+        registrationConfigFile = "/persist/var/lib/gitlab-runner/gitlab-runner.env";
+        dockerImage = "alpine";
+        dockerVolumes = [
+          "/nix/store:/nix/store:ro"
+          "/nix/var/nix/db:/nix/var/nix/db:ro"
+          "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro"
+        ];
+        dockerDisableCache = true;
+        preBuildScript = pkgs.writeScript "setup-container" ''
+          mkdir -p -m 0755 /nix/var/log/nix/drvs
+          mkdir -p -m 0755 /nix/var/nix/gcroots
+          mkdir -p -m 0755 /nix/var/nix/profiles
+          mkdir -p -m 0755 /nix/var/nix/temproots
+          mkdir -p -m 0755 /nix/var/nix/userpool
+          mkdir -p -m 1777 /nix/var/nix/gcroots/per-user
+          mkdir -p -m 1777 /nix/var/nix/profiles/per-user
+          mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root
+          mkdir -p -m 0700 "$HOME/.nix-defexpr"
+          . ${pkgs.nix}/etc/profile.d/nix.sh
+          ${pkgs.nix}/bin/nix-env -i ${lib.concatStringsSep " " (with pkgs; [ nix cacert git openssh ])}
+          ${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixpkgs-unstable
+          ${pkgs.nix}/bin/nix-channel --update nixpkgs
+        '';
+        environmentVariables = {
+          ENV = "/etc/profile";
+          USER = "root";
+          NIX_REMOTE = "daemon";
+          PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin";
+          NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt";
+        };
+        tagList = [ "nix" ];
+      };
+    };
+  };
+
+  systemd.services.gitlab-runner.serviceConfig = {
+    DynamicUser = lib.mkForce false;
+    User = "gitlab-runner";
+  };
+
+  users.users.gitlab-runner = {
+    home = "/persist/var/lib/gitlab-runner";
+    extraGroups = [ "docker" ];
+    isSystemUser = true;
+  };
+
+  virtualisation.docker.storageDriver = "zfs";
+}
--- a/services/gitlab.nix
+++ b/services/gitlab.nix
@ -0,0 +1,168 @@
+{config, pkgs, lib, profiles, modules, evalConfig, sources, ...}:
+
+{
+  containers.gitlab = {
+    autoStart = true;
+    privateNetwork = true;
+    hostAddress = "192.168.100.1";
+    localAddress = "192.168.100.7";
+
+    bindMounts = {
+      "/persist" = {
+        hostPath = "/persist/containers/gitlab";
+        isReadOnly = false;
+      };
+    };
+
+    path = (evalConfig {hosts = {}; groups = {};} ({ config, lib, pkgs, profiles, modules, sources, ... }: {
+      boot.isContainer = true;
+      networking.useDHCP = false;
+      users.users.root.hashedPassword = "";
+
+      imports = [
+        ../modules/mattermost.nix
+        ((import sources.nix-hexchen) {}).profiles.nopersist
+      ];
+
+      nixpkgs.config.allowUnfree = true;
+      networking.firewall.enable = false;
+      networking.defaultGateway = {
+        address = "192.168.100.1";
+        interface = "eth0";
+      };
+
+      services.gitlab = {
+        enable = true;
+
+        databaseCreateLocally = true;
+
+        host = "gitlab.infra4future.de";
+        https = true;
+        port = 443;
+
+        statePath = "/persist/gitlab";
+        user = "git";
+        databaseUsername = "git";
+
+        initialRootPasswordFile = "/persist/secrets/gitlab-root";
+        secrets.secretFile = "/persist/secrets/gitlab-secret";
+        secrets.dbFile = "/persist/secrets/gitlab-db";
+        secrets.otpFile = "/persist/secrets/gitlab-otp";
+        secrets.jwsFile = "/persist/secrets/gitlab-jws";
+
+        smtp = {
+          enable = true;
+          address = "mail.hacc.space";
+          port = 587;
+          authentication = "plain";
+          domain = "gitlab.infra4future.de";
+          enableStartTLSAuto = true;
+          username = "noreply@infra4future.de";
+          passwordFile = "/persist/secrets/noreply-pass";
+        };
+
+        pagesExtraArgs = [ "-listen-proxy" "0.0.0.0:8090" ];
+        extraConfig = {
+          pages = {
+            enabled = true;
+            host = "4future.dev";
+            port = 443;
+            https = true;
+          };
+          omniauth = {
+            enabled = true;
+            auto_sign_in_with_provider = "openid_connect";
+            allow_single_sign_on = ["openid_connect"];
+            block_auto_created_users = false;
+            providers = [
+              {
+                name = "openid_connect";
+                label = "infra4future Login";
+                args = {
+                  name = "openid_connect";
+                  scope = ["openid" "profile" "email"];
+                  response_type = "code";
+                  issuer = "https://auth.infra4future.de/auth/realms/forfuture";
+                  discovery = true;
+                  client_auth_method = "query";
+                  uid_field = "username";
+                  client_options = {
+                    identifier = "gitlab";
+                    secret = { _secret = "/persist/secrets/oidc-clientsecret"; };
+                    redirect_uri = "https://gitlab.infra4future.de/users/auth/openid_connect/callback";
+                  };
+                };
+              }
+            ];
+          };
+        };
+      };
+
+      services.redis.enable = true;
+      services.postgresql.package = pkgs.postgresql_13;
+
+      services.nginx = {
+        enable = true;
+        recommendedGzipSettings = true;
+        recommendedOptimisation = true;
+        recommendedTlsSettings = true;
+        virtualHosts."gitlab.infra4future.de" = {
+          default = true;
+          locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
+          locations."/".extraConfig = ''
+            proxy_redirect off;
+          '';
+        };
+      };
+
+      services.openssh.enable = true;
+      services.openssh.passwordAuthentication = false;
+
+      users.users.git = {
+        isSystemUser = true;
+        group = "gitlab";
+        home = "/persist/gitlab/home";
+        uid = 165;
+      };
+
+      services.coredns = {
+        enable = true;
+        config = ''
+          .:53 {
+            forward . 1.1.1.1
+          }
+        '';
+      };
+    })).config.system.build.toplevel;
+  };
+
+  hexchen.nftables.nat.forwardPorts = [{
+    ports = [ 22 ];
+    destination = "${config.containers.gitlab.localAddress}:22";
+    proto = "tcp";
+  }];
+
+  services.nginx.virtualHosts."gitlab.infra4future.de" = {
+    locations."/".proxyPass = "http://${config.containers.gitlab.localAddress}:80";
+    locations."/".extraConfig = ''
+      proxy_set_header X-Nginx-Proxy true;
+      proxy_redirect off;
+    '';
+    enableACME = true;
+    forceSSL = true;
+  };
+
+  services.nginx.virtualHosts."4future.dev" = {
+    locations."/".proxyPass = "http://${config.containers.gitlab.localAddress}:8090";
+    serverName = "~^((.*)\.)?4future\.dev$";
+    useACMEHost = "4future.dev";
+    forceSSL = true;
+  };
+
+  security.acme.certs."4future.dev" = {
+    dnsProvider = "cloudflare";
+    credentialsFile = "/var/lib/acme/cloudflare.pass";
+    extraDomainNames = [ "*.4future.dev" ];
+    group = config.services.nginx.group;
+  };
+}
--- a/services/hedgedoc-hacc.nix
+++ b/services/hedgedoc-hacc.nix
@ -18,6 +18,7 @@
      users.users.root.hashedPassword = "";

      imports = [
+        ../modules/mattermost.nix
        ((import sources.nix-hexchen) {}).profiles.nopersist
      ];

@ -42,12 +43,7 @@
          allowFreeURL = true;
          allowGravatar = false;
          allowOrigin = [ "localhost" "pad.hacc.space" "fff-muc.de" ];
-          db = {
-            host = "/run/postgresql";
-            username = "codimd";
-            dialect = "postgres";
-            database = "codimd";
-          };
+          dbURL = "postgres://codimd:codimd@localhost:5432/codimd";
          defaultPermission = "limited";
          domain  = "pad.hacc.space";
          host = "0.0.0.0";
@ -55,18 +51,17 @@
          hsts.preload = false;
          email = false;
          oauth2 = {
-            authorizationURL = "https://login.infra4future.de/oauth2/authorize";
-            tokenURL = "https://login.infra4future.de/oauth2/token";
+            authorizationURL = "https://auth.infra4future.de/auth/realms/forfuture/protocol/openid-connect/auth";
+            tokenURL = "https://auth.infra4future.de/auth/realms/forfuture/protocol/openid-connect/token";
            clientID = "hedgedoc";
            clientSecret = "1a730af1-4d6e-4c1d-8f7e-72375c9b8d62";
          };
        };
      };
      systemd.services.hedgedoc.environment = {
-        "CMD_LOGLEVEL" = "warn";
-        "CMD_OAUTH2_USER_PROFILE_URL" = "https://login.infra4future.de/oauth2/userinfo";
-        "CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR" = "nickname";
-        "CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR" = "name";
+        "CMD_OAUTH2_USER_PROFILE_URL" = "https://auth.infra4future.de/auth/realms/forfuture/protocol/openid-connect/userinfo";
+        "CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR" = "name";
+        "CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR" = "display-name";
        "CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR" = "email";
        "CMD_OAUTH2_PROVIDERNAME" = "Infra4Future";
      };
@ -79,11 +74,6 @@
            "DATABASE codimd" = "ALL PRIVILEGES";
          };
        }];
-        authentication = ''
-          local all all trust
-          host  codimd  codimd  127.0.0.1/32  trust
-        '';
-        package = pkgs.postgresql_11;
      };
      services.postgresqlBackup = {
        enable = true;
--- a/services/hedgedoc-i4f.nix
+++ b/services/hedgedoc-i4f.nix
@ -18,6 +18,7 @@
      users.users.root.hashedPassword = "";

      imports = [
+        ../modules/mattermost.nix
        ((import sources.nix-hexchen) {}).profiles.nopersist
      ];

@ -42,11 +43,7 @@
          allowFreeURL = true;
          allowGravatar = false;
          allowOrigin = [ "localhost" "pad.infra4future.de" "fff-muc.de" ];
-          db = {
-            host = "/run/postgresql";
-            dialect = "postgres";
-            database = "hedgedoc";
-          };
+          dbURL = "postgres://hedgedoc:hedgedoc@localhost:5432/hedgedoc";
          defaultPermission = "freely";
          domain  = "pad.infra4future.de";
          host = "0.0.0.0";
@ -55,12 +52,8 @@
          email = false;
          };
        };
-      systemd.services.hedgedoc.environment = {
-        "CMD_LOGLEVEL" = "warn";
-      };
      services.postgresql = {
        enable = true;
-        package = pkgs.postgresql_11;
        authentication = ''
          local all       all                     trust
          host  hedgedoc  hedgedoc  127.0.0.1/32  trust
--- a/services/lantifa.nix
+++ b/services/lantifa.nix
@ -1,6 +1,8 @@
 { config, lib, pkgs, profiles, modules, evalConfig, ... }:

-{
+let
+  new = import (import ../nix/sources.nix).nixpkgs-new {};
+in {
  containers.lantifa = {
    autoStart = true;
    privateNetwork = true;
@ -35,12 +37,13 @@
      services.mediawiki = {
        enable = true;
        name = "LANtifa";
+        package = new.mediawiki;
        database.createLocally = true;
        passwordFile = "/var/lib/mediawiki/mediawiki-password";
        extraConfig = let
          wikidb = pkgs.fetchzip {
            url = "https://www.kennel17.co.uk/uploads/testwiki/e/e9/WikiDB.zip";
-            sha256 = "sha256-8pMNQwmGEsbIoSV1s4RL5Xqq4+f+GNOaCB8VlVnbweY=";
+            sha256 = "0pns9fk1ws54m7rgbfsrxqh6ayab16mmnvzba8m4malljgrbil8b";
          };
        in ''
          // Configure short URLs
@ -77,8 +80,8 @@
            sha256 = "1k0z44jfqsxzwy6jjz3yfibiq8wi845d5iwwh8j3yijn2854fj0i";
          };
          intersection = pkgs.fetchzip {  # This is the DynamicPageList extension
-            url = "https://extdist.wmflabs.org/dist/extensions/intersection-REL1_36-82eb087.tar.gz";
-            sha256 = "sha256-TD58DvJ4CFASP4rIc94jeB4SN4zktLe33xZtz/Qg2dk=";
+            url = "https://extdist.wmflabs.org/dist/extensions/intersection-REL1_36-4a70dbd.tar.gz";
+            sha256 = "0s70fqkf5ylpsxy1h3hljic8708j6099mz12b6k03hgwc582yywi";
          };
          PageForms = pkgs.fetchzip {
            url = "https://github.com/wikimedia/mediawiki-extensions-PageForms/archive/5.0.1.zip";
--- a/services/mail.nix
+++ b/services/mail.nix
@ -1,169 +1,151 @@
 { config, pkgs, lib, sources, ... }:

 {
-  imports = [ sources.nixos-mailserver.outPath ];
-
-  # reduce log spam
-  systemd.services.rspamd.serviceConfig.LogLevelMax =
-    3; # this is set to error because rspamd regularly complains about not enough learns
-  systemd.services.postfix.serviceConfig.LogLevelMax = 5; # = notice
-  systemd.services.dovecot2.serviceConfig.LogLevelMax = 5; # = notice
-
-  # stop postfix from dying if rspamd hiccups
-  systemd.services.postfix.unitConfig = {
-    Requires = lib.mkForce "dovecot2.service opendkim.service";
-  };
+  imports = [
+      sources.nixos-mailserver.outPath
+  ];

  mailserver = {
    mailDirectory = "/persist/mail";
    enable = true;
    fqdn = "mail.hacc.space";
-    monitoring = {
-      enable = true;
-      alertAddress = "admin@hacc.space";
-    };
-    domains = [
-      "hacc.space"
-      "muc.hacc.space"
-      "hacc.earth"
-      "4future.dev"
-      "4futu.re"
-      "infra4future.de"
-    ];
+    domains = [ "hacc.space" "muc.hacc.space" "hacc.earth" "4future.dev" "4futu.re" "infra4future.de" "discuss.infra4future.de" ];

    loginAccounts = {
-      "hexchen@hacc.space".hashedPassword =
-        "$6$x9skYtRp4dgxC$1y8gPC2BuVqG3kJVSMGgzZv0Bg1T9qxcnBWLIDbANy1d//SQ23Y7s3IMYcEPd1/l/MYWD9Y/Qse6HbT5w5Xwq/";
+        "hexchen@hacc.space".hashedPassword = "$6$x9skYtRp4dgxC$1y8gPC2BuVqG3kJVSMGgzZv0Bg1T9qxcnBWLIDbANy1d//SQ23Y7s3IMYcEPd1/l/MYWD9Y/Qse6HbT5w5Xwq/";
+        "hexchen@hacc.space".aliases = [ "postmaster@hacc.space" "abuse@hacc.space" "hexchen@infra4future.de" ];

-      "octycs@hacc.space".hashedPassword =
-        "$6$KceTivtJ$58jxhYF6ULfivNsb3Z0J7PnGea0Hs2wTWh3c9FrKRIAmuOD96u2IDgZRCn6P5NrXA0BL.n6HC2RS3r.4JnOmg.";
-      "octycs@hacc.space".aliases = [ "markus@hacc.space" ];
+        "octycs@hacc.space".hashedPassword = "$6$KceTivtJ$58jxhYF6ULfivNsb3Z0J7PnGea0Hs2wTWh3c9FrKRIAmuOD96u2IDgZRCn6P5NrXA0BL.n6HC2RS3r.4JnOmg.";
+        "octycs@hacc.space".aliases = [ "markus@hacc.space" ];

-      "raphael@hacc.space".hashedPassword =
-        "$6$QveHpwMcp9mkFVAU$EFuahOrJIxPg.c.WGFHtrP3.onwJYwvP7fiBHHGb9jhosewZ2tEUP.2D3uyDLhd9Cfny6Yp4jDk/Hkjk7/ME1/";
+        "raphael@hacc.space".hashedPassword = "$6$QveHpwMcp9mkFVAU$EFuahOrJIxPg.c.WGFHtrP3.onwJYwvP7fiBHHGb9jhosewZ2tEUP.2D3uyDLhd9Cfny6Yp4jDk/Hkjk7/ME1/";

-      "moira@hacc.space".hashedPassword =
-        "$6$BpYhwcZNrkLhVqK$6FMqA/vUkdV4GBlHLSqS5DRCb/CaLDNeIsBcZ8G30heytS/tJj2Ag7b1ovSltTA4PUfhee3pJrz1BkwkA93vN1";
+        "schweby@hacc.space".hashedPassword = "$6$BpYhwcZNrkLhVqK$6FMqA/vUkdV4GBlHLSqS5DRCb/CaLDNeIsBcZ8G30heytS/tJj2Ag7b1ovSltTA4PUfhee3pJrz1BkwkA93vN1";

-      "zauberberg@hacc.space".hashedPassword =
-        "$6$ISAaU8X6D$oGKe9WXDWrRpGzHUTdxrxdtg9zuGOlBMuDc82IZhegpsv1bqd550FhZZrI40IjZTA5Hy2MZ8j/0efpnQ4fOQH0";
-      "zauberberg@hacc.space".aliases = [ "lukas@hacc.space" ];
+        "zauberberg@hacc.space".hashedPassword = "$6$ISAaU8X6D$oGKe9WXDWrRpGzHUTdxrxdtg9zuGOlBMuDc82IZhegpsv1bqd550FhZZrI40IjZTA5Hy2MZ8j/0efpnQ4fOQH0";
+        "zauberberg@hacc.space".aliases = [ "lukas@hacc.space" ];

-      "stuebinm@hacc.space".hashedPassword =
-        "$6$mjrMQG5smqLRlm$WzmbiZnGlEXGT7hj/n2qz0nvVzGyZfMToCyLRi0wErfVEHI7y7jtWoHqIWnpcHAM29UocsIFFsUCb3XqQCwwB.";
+        "stuebinm@hacc.space".hashedPassword = "$6$mjrMQG5smqLRlm$WzmbiZnGlEXGT7hj/n2qz0nvVzGyZfMToCyLRi0wErfVEHI7y7jtWoHqIWnpcHAM29UocsIFFsUCb3XqQCwwB.";

-      "lenny@hacc.space".hashedPassword =
-        "$6$EZpv9XImv5F3$p2NSoo5gLxh6NnB3/C6wF8knRTuMHqDXYF3BEscaQuk7qok2Z13xKT/6mFvvSKKBnFCuYptgnfGswmoqIzm/1/";
-      "lenny@hacc.space".aliases = [ "rinderhacc@hacc.space" ];
+        "lenny@hacc.space".hashedPassword = "$6$EZpv9XImv5F3$p2NSoo5gLxh6NnB3/C6wF8knRTuMHqDXYF3BEscaQuk7qok2Z13xKT/6mFvvSKKBnFCuYptgnfGswmoqIzm/1/";
+        "lenny@hacc.space".aliases = [ "rinderhacc@hacc.space" ];

-      "finance@muc.hacc.space".hashedPassword =
-        "$6$R3GRmvXwqnMM6q.R$Y9mrUAmMnCScsM6pKjxo2a2XPM7lHrV8FIgK0PzhYvZbxWczo7.O4dk1onYeV1mRx/nXZfkZNjqNCruCn0S2m.";
+        "finance@muc.hacc.space".hashedPassword = "$6$R3GRmvXwqnMM6q.R$Y9mrUAmMnCScsM6pKjxo2a2XPM7lHrV8FIgK0PzhYvZbxWczo7.O4dk1onYeV1mRx/nXZfkZNjqNCruCn0S2m.";

-      "noreply@hacc.space" = {
-        hashedPassword =
-          "$6$YsqMoItITZUzI5wo$5Lejf8XBHRx4LW4VuZ9wJCiBbT4kOV/EZaCdWQ07eVIrkRTZwXWZ5zfsh.olXEFwvpNWN.DBnU.dQc.cC0/ra/";
-        sendOnly = true;
-      };
-
-      "noreply@infra4future.de" = {
-        hashedPassword =
-          "$6$uaD8bRcT1$gFqhFyu5RUsyUUOG5b.kN.JAJ1rVHvaYhpeRHoMvrERAMgBu1FHu2oDnjTsy.5NKoLc5xpI5uv4Gpy4YbmDmV.";
-        sendOnly = true;
-      };
+        # service accounts
+        "noreply@hacc.space".hashedPassword = "$6$YsqMoItITZUzI5wo$5Lejf8XBHRx4LW4VuZ9wJCiBbT4kOV/EZaCdWQ07eVIrkRTZwXWZ5zfsh.olXEFwvpNWN.DBnU.dQc.cC0/ra/";
+        "newsletter@hacc.space".hashedPassword = "$6$f0xKnQxBInd$zbVIi1lTKWauqW.c8sMNLHNwzn81oQrVOiIfJwPa98n9xWz/NkjuWLYuFpK.MSZwNwP7Yv/a/qaOb9v8qv/.N1";
+        "gitlab@infra4future.de".hashedPassword = "$6$8vvkYuxv$9xV5WktsqfgM3cWSxonjtaohm7oqvDC5qsgJCJBATwesjTRxd/QTLa7t7teK8Nzyl.Py26xz.NvYowCZQ4aBE1";
+        "noreply@infra4future.de".hashedPassword = "$6$uaD8bRcT1$gFqhFyu5RUsyUUOG5b.kN.JAJ1rVHvaYhpeRHoMvrERAMgBu1FHu2oDnjTsy.5NKoLc5xpI5uv4Gpy4YbmDmV.";
+        "discuss@infra4future.de".hashedPassword = "$6$8x8/OlMFjq1$S54jdBh7WjrdC6UtbYAHHzMJak7Ai/CjwmWBBbqh7yRHuZt.mfZrsfBNiL3JKBHE7seQ7JYRU99lJKCU6Aujg/";
    };

    extraVirtualAliases = {
-      # address = forward address;
+        # address = forward address;

-      # -- International --
-      # info/contact: main entrypoint, anyone can read or reply to this.
-      "info@hacc.space" = [
-        "hexchen@hacc.space"
-        "octycs@hacc.space"
-        "raphael@hacc.space"
-        "moira@hacc.space"
-        "zauberberg@hacc.space"
-        "stuebinm@hacc.space"
-        "lenny@hacc.space"
-      ];
+        # -- International --
+        # info/contact: main entrypoint, anyone can read or reply to this.
+        "info@hacc.space" = [
+            "hexchen@hacc.space"
+            "octycs@hacc.space"
+            "raphael@hacc.space"
+            "schweby@hacc.space"
+            "zauberberg@hacc.space"
+            "stuebinm@hacc.space"
+            "lenny@hacc.space"
+        ];
+        # admin: current people with access to the mail server and knowledge on how to use it
+        "admin@hacc.space" = [
+            "hexchen@hacc.space"
+            "schweby@hacc.space"
+            "zauberberg@hacc.space"
+        ];
+        # voc: hacc video operation center, various streaming-related things
+        "voc@hacc.space" = [
+            "hexchen@hacc.space"
+            "schweby@hacc.space"
+            "octycs@hacc.space"
+            "stuebinm@hacc.space"
+            "zauberberg@hacc.space"
+            "lenny@hacc.space"
+            "raphael@hacc.space"
+        ];

-      # admin: current people with access to the mail server and knowledge on how to use it™
-      "admin@hacc.space" =
-        [ "hexchen@hacc.space" "moira@hacc.space" "zauberberg@hacc.space" ];
+        # -- Regional: Germany --
+        # board of hacc e.V.
+        "vorstand@hacc.space" = [
+            "raphael@hacc.space"
+            "schweby@hacc.space"
+            "zauberberg@hacc.space"
+        ];
+        # members of hacc e.V.
+        "mitglieder@hacc.space" = [
+            "hexchen@hacc.space"
+            "raphael@hacc.space"
+            "schweby@hacc.space"
+            "zauberberg@hacc.space"
+            "lenny@hacc.space"
+            "octycs@hacc.space"
+            "stuebinm@hacc.space"
+        ];

-      # voc: hacc video operation center, various streaming-related things
-      "voc@hacc.space" = [
-        "hexchen@hacc.space"
-        "moira@hacc.space"
-        "octycs@hacc.space"
-        "stuebinm@hacc.space"
-        "zauberberg@hacc.space"
-        "lenny@hacc.space"
-        "raphael@hacc.space"
-      ];
+        # -- Regional: Munich --
+        "muc@hacc.space" = [
+            "hexchen@hacc.space"
+            "octycs@hacc.space"
+            "raphael@hacc.space"
+            "schweby@hacc.space"
+            "zauberberg@hacc.space"
+            "stuebinm@hacc.space"
+            "lenny@hacc.space"
+        ];

-      # -- Regional: Germany --
-      # board of hacc e.V.
-      "vorstand@hacc.space" =
-        [ "raphael@hacc.space" "moira@hacc.space" "zauberberg@hacc.space" ];
-
-      # members of hacc e.V.
-      "mitglieder@hacc.space" = [
-        "hexchen@hacc.space"
-        "raphael@hacc.space"
-        "moira@hacc.space"
-        "zauberberg@hacc.space"
-        "lenny@hacc.space"
-        "octycs@hacc.space"
-        "stuebinm@hacc.space"
-      ];
-
-      # -- Regional: Munich --
-      "muc@hacc.space" = [
-        "hexchen@hacc.space"
-        "octycs@hacc.space"
-        "raphael@hacc.space"
-        "moira@hacc.space"
-        "zauberberg@hacc.space"
-        "stuebinm@hacc.space"
-        "lenny@hacc.space"
-      ];
+        # -- c3 world operation centre --
+        "world@muc.hacc.space" = [
+            "hexchen@hacc.space"
+            "stuebinm@hacc.space"
+        ];
    };

    # Use Let's Encrypt certificates. Note that this needs to set up a stripped
    # down nginx and opens port 80.
    certificateScheme = 3;

-    # Only allow implict TLS
-    enableImap = false;
-    enablePop3 = false;
+    # Enable IMAP and POP3
+    enableImap = true;
+    enablePop3 = true;
+    enableImapSsl = true;
+    enablePop3Ssl = true;

    # Enable the ManageSieve protocol
    enableManageSieve = true;

+    # whether to scan inbound emails for viruses (note that this requires at least
+    # 1 Gb RAM for the server. Without virus scanning 256 MB RAM should be plenty)
+    virusScanning = false;
  };
-
-  services.postfix.submissionOptions.smtpd_sender_restrictions =
-    lib.mkForce "reject_non_fqdn_sender,reject_unknown_sender_domain,permit";
-  services.postfix.submissionsOptions.smtpd_sender_restrictions =
-    lib.mkForce "reject_non_fqdn_sender,reject_unknown_sender_domain,permit";
-
+  services.postfix.submissionOptions.smtpd_sender_restrictions = "reject_non_fqdn_sender,reject_unknown_sender_domain,permit";
+  services.postfix.submissionsOptions.smtpd_sender_restrictions = "reject_non_fqdn_sender,reject_unknown_sender_domain,permit";
  services.postfix.virtual = ''
-    postmaster@hacc.space admin@hacc.space
-    abuse@hacc.space admin@hacc.space
-    contact@hacc.space info@hacc.space
-    hello@hacc.space info@hacc.space
-    haccvoc@hacc.space voc@hacc.space
    @4future.dev @hacc.space
    @4futu.re @hacc.space
    @hacc.earth @hacc.space
-    @infra4future.de @hacc.space
+    @discuss.infra4future.de discuss@infra4future.de
+    admin@infra4future.de admin@hacc.space
+    noreply@infra4future.de admin@hacc.space
+    lukas@infra4future.de zauberberg@hacc.space
+    info@infra4future.de admin@hacc.space
+    postmaster@infra4future.de admin@hacc.space
+    voc@infra4future.de voc@hacc.space
+    haccvoc@infra4future.de voc@hacc.space
+    contact@hacc.space info@hacc.space
+    himmel@hacc.space admin@hacc.space
+    divoc-patches@muc.hacc.space world@muc.hacc.space
  '';

  systemd.services.alps = {
    enable = true;
-    script =
-      "${pkgs.alps}/bin/alps -theme alps imaps://mail.hacc.space:993 smtps://mail.hacc.space:465";
+    script = "${pkgs.alps}/bin/alps -theme alps imaps://mail.hacc.space:993 smtps://mail.hacc.space:465";
    serviceConfig.WorkingDirectory = "${pkgs.alps}/share/alps";
    serviceConfig.Restart = "always";
    requiredBy = [ "multi-user.target" ];
--- a/services/mattermost.nix
+++ b/services/mattermost.nix
@ -141,9 +141,9 @@ in {
            Enable = true;
            Id = "mattermost";
            Scope = "";
-            AuthEndpoint = "https://login.infra4future.de/oauth2/authorize";
-            TokenEndpoint = "https://login.infra4future.de/oauth2/token";
-            UserApiEndpoint = "https://login.infra4future.de/oauth2/userinfo";
+            AuthEndpoint = "https://auth.infra4future.de/auth/realms/forfuture/protocol/openid-connect/auth";
+            TokenEndpoint = "https://auth.infra4future.de/auth/realms/forfuture/protocol/openid-connect/token";
+            UserApiEndpoint = "https://auth.infra4future.de/auth/realms/forfuture/protocol/openid-connect/userinfo";
          };
          # for some reason, these don't appear to be working; the startup
          # process complaines and sets these back to en
@ -202,7 +202,6 @@ in {

      services.postgresql = {
        enable = lib.mkForce true; # mattermost sets this to false. wtf.
-        package = pkgs.postgresql_11;
        ensureDatabases = [ "mattermost" ];
        ensureUsers = [ {
          name = "mattermost";
--- a/services/murmur.nix
+++ b/services/murmur.nix
@ -1,5 +1,18 @@
 { config, lib, pkgs, sources, ... }:

+let
+  mumblesite = pkgs.stdenv.mkDerivation {
+    name = "mumble.hacc.space-website";
+    src = sources.mumble-website.outPath.outPath;
+    buildPhase = ''
+      ${pkgs.jekyll.outPath}/bin/jekyll build
+    '';
+    installPhase = ''
+      mkdir -p $out
+      cp -r _site/* $out
+    '';
+  };
+in
 {
  hexchen.bindmounts."/var/lib/murmur" = "/persist/var/lib/murmur";

@ -15,9 +28,17 @@
  networking.firewall.allowedTCPPorts = [ config.services.murmur.port ];
  networking.firewall.allowedUDPPorts = [ config.services.murmur.port ];

-  # the mumble cert has its own group so that both nginx and murmur can read it
-  users.groups.mumblecert = {};
-  security.acme.certs."mumble.hacc.space".group = "mumblecert";
-  users.users.nginx.extraGroups = [ "mumblecert" ];
-  users.users.murmur.extraGroups = [ "mumblecert" ];
+  services.nginx.virtualHosts =
+    let  vhost = {
+      forceSSL = true;
+      enableACME = true;
+      root = mumblesite.outPath;
+    };
+  in {
+    "mumble.infra4future.de" = vhost;
+    "mumble.hacc.space" = vhost;
+  };
+
+  # set ACLs so that the murmur user can read the certificates
+  security.acme.certs."mumble.hacc.space".postRun = "${pkgs.acl}/bin/setfacl -Rm u:murmur:rX /var/lib/acme/mumble.hacc.space";
 }
--- a/services/nextcloud/default.nix
+++ b/services/nextcloud/default.nix
@ -36,7 +36,7 @@

        # must be set manually; may not be incremented by more than one at
        # a time, otherwise nextcloud WILL break
-        package = pkgs.nextcloud24;
+        package = pkgs.nextcloud21;

        home = "/persist/nextcloud";
        https = true;
@ -52,6 +52,8 @@
          defaultapp = "apporder";
        };

+        caching.redis = true;
+
        # multiple pools may be doable using services.phpfpm.pools,
        # but i have not tried this yet. The nextcloud module defines a
        # pool "nextcloud"
@ -66,15 +68,40 @@

        extraOptions = {
          instanceid = "ocxlphb7fbju";
+          redis = {
+            host = "/run/redis/redis.sock";
+            port = 0;
+            dbindex = 0;
+            password = "secret";
+            timeout = 1.5;
+          };
          datadirectory = "/persist/data/ncdata";
+          mail_smtpmode = "smtp";
+          mail_smtpsecure = "ssl";
+          mail_sendmailmode = "smtp";
+          mail_from_address = "noreply";
+          mail_domain = "infra4future.de";
+          mail_smtpauthtype = "PLAIN";
+          mail_smtpauth = 1;
+          mail_smtphost = "mail.hacc.space";
+          mail_smtpport = 465;
+          mail_smtpname = "noreply@infra4future.de";
          loglevel = 0;
          "overwrite.cli.url" = "https://cloud.infra4future.de";
        };
+
+        # passwordsalt, secret, and mail_smtppassword go in here
+        secretFile = "/persist/secrets.json";
+
+      };
+
+      services.redis = {
+        enable = true;
+        unixSocket = "/var/run/redis/redis.sock";
      };

      services.postgresql = {
        enable = true;
-        package = pkgs.postgresql_11;
        ensureDatabases = [ "nextcloud" ];
        ensureUsers = [
          { # by default, postgres has unix sockets enabled, and allows a
@ -109,7 +136,6 @@
    extraConfig = ''
      proxy_buffering off;
      client_max_body_size 0;
-      add_header Cache-Control "no-store, no-cache, must-revalidate";
    '';
  };

--- a/services/nginx-pages.nix
+++ b/services/nginx-pages.nix
@ -1,9 +1,40 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:

+with lib;
+let
+  domains = [ "www.infra4future.de" "hacc.earth" "www.hacc.earth" "muc.hacc.earth" "help.studentsforfuture.info" ];
+in {

-{
-  hacc.websites = {
-    enable = true;
-    directory = ../websites;
+  services.nginx.virtualHosts =
+    listToAttrs (map (host: nameValuePair host {
+      useACMEHost = "infra4future.de";
+      forceSSL = true;
+      locations."/".proxyPass = "http://${config.containers.gitlab.localAddress}:8090";
+    }) domains) // {
+      "infra4future.de" = {
+        enableACME = true;
+        forceSSL = true;
+        locations."/".proxyPass = "http://${config.containers.gitlab.localAddress}:8090";
+      };
+      "muc.hacc.earth" = {
+        enableACME = true;
+        forceSSL = true;
+        locations."/".extraConfig = ''
+          proxy_pass "http://${config.containers.gitlab.localAddress}:8090/infra4future/muc.hacc.earth/";
+          proxy_set_header Host 'hacc.4future.dev';
+        '';
+      };
+      "help.studentsforfuture.info" = {
+        enableACME = true;
+        forceSSL = true;
+        locations."/".extraConfig = ''
+          proxy_pass "http://${config.containers.gitlab.localAddress}:8090/pcs-docs/";
+          proxy_set_header Host 'studentsforfuture.4future.dev';
+        '';
+      };
+    };
+
+  security.acme.certs."infra4future.de" = {
+    extraDomainNames = domains;
  };
 }
--- a/services/syncthing.nix
+++ b/services/syncthing.nix
@ -6,34 +6,50 @@
    openDefaultPorts = true;
    configDir = "/persist/var/lib/syncthing/";
    dataDir = "/persist/data/syncthing/";
-    devices = {
-      raphael-laptop = {
-        addresses = []; # empty = dynamic
-        id = "72B3T74-NOMJV3X-EVJXTJF-5GGAEZB-ZDKBHXQ-VQNRYEU-YCPA2JP-L6NGAAG";
-      };
-      # zauberberg
-      conway = {
-        addresses = []; # empty = dynamic
-        id = "HV7IU2N-Q4W3A7F-BSASR43-OB575SM-47FY2UW-7N5GMFM-PX3LWRN-HXBXMQF";
-      };
-    };
-
-    folders = {
-      "/persist/data/syncthing/hacc/" = {
-        id = "qt2ly-xvvvs";
-        devices = [ "conway" "raphael-laptop"];
-        type = "receiveonly";
-        versioning = {
-          type = "simple";
-          params.keep = "10";
+    declarative = {
+      devices = {
+        # schweby
+        txsbcct = {
+          addresses = []; # empty = dynamic
+          id = "AQHOPTO-X3LWJXZ-2SPLSEW-MCVMX3R-VSLPPYE-NIOTDMW-QOYRSDZ-2LR7RAD";
+        };
+        octycs = {
+          addresses = []; # empty = dynamic
+          id = "KIJVGWZ-GRXPAUX-ZOTZDLS-KUKANCC-A2IBZRM-BT3RZK7-5M43O6R-OZD5IQE";
+        };
+        stuebinm-desktop = {
+          addresses = []; # empty = dynamic
+          id = "CWZTKG7-F45LE2O-TIT6IBC-RQD6MLH-K5ECUGJ-LOHJXF3-I2F4R6I-JVMRLAJ";
+        };
+        raphael-laptop = {
+          addresses = []; # empty = dynamic
+          id = "72B3T74-NOMJV3X-EVJXTJF-5GGAEZB-ZDKBHXQ-VQNRYEU-YCPA2JP-L6NGAAG";
+        };
+        # zauberberg
+        conway = {
+          addresses = []; # empty = dynamic
+          id = "HV7IU2N-Q4W3A7F-BSASR43-OB575SM-47FY2UW-7N5GMFM-PX3LWRN-HXBXMQF";
+        };
+        # hexchen
+        storah = {
+          addresses = [ "tcp://46.4.62.95:22000" "quic://46.4.62.95:22000" ];
+          id = "SGHQ2JA-7FJ6CKM-N3I54R4-UOJC5KO-7W22O62-YLTF26F-S7DLZG4-ZLP7HAM";
        };
      };
-      "/persist/data/syncthing/hacc_eV_vorstand/" = {
-        id = "twwt7-fxrsr";
-        devices = [ "conway" "raphael-laptop"];
-#        type = "receiveencrypted"; # no yet implemented
+
+      folders = {
+        "/persist/data/syncthing/hacc/" = {
+          id = "qt2ly-xvvvs";
+          devices = [ "txsbcct" "octycs" "stuebinm-desktop" "conway" "raphael-laptop" "storah" ];
+          type = "receiveonly";
+          versioning = {
+            type = "simple";
+            params.keep = "10";
+          };
+        };
      };
+
    };
-    overrideFolders = false; # enables workaround for recieveencrypted
+
  };
 }
--- a/services/uffd.nix
+++ b/services/uffd.nix
@ -1,84 +0,0 @@
-{ config, lib, pkgs, profiles, modules, evalConfig, sources, ... }:
-
-let
-  uffd = pkgs.uffd;
-in {
-  containers.uffd = {
-    privateNetwork = true;
-    hostAddress = "192.168.100.1";
-    localAddress = "192.168.100.9";
-    autoStart = true;
-    bindMounts = {
-      "/persist" = {
-        hostPath = "/persist/containers/uffd";
-        isReadOnly = false;
-      };
-    };
-    path = (evalConfig {hosts = {}; groups = {};} ({ config, lib, pkgs, profiles, modules, sources, ... }: {
-      boot.isContainer = true;
-      networking.useDHCP = false;
-      users.users.root.hashedPassword = "";
-
-      imports = [
-        ((import sources.nix-hexchen) {}).profiles.nopersist
-      ];
-
-      nixpkgs.config.allowUnfree = true;
-      networking.firewall.enable = false;
-      networking.defaultGateway = {
-        address = "192.168.100.1";
-        interface = "eth0";
-      };
-      services.coredns = {
-        enable = true;
-        config = ''
-        .:53 {
-          forward . 1.1.1.1
-        }
-        '';
-      };
-
-      services.uwsgi = {
-        enable = true;
-        plugins = [ "python3" ];
-        instance = {
-          type = "normal";
-          pythonPackages = self: with self; [ uffd ];
-          module = "uffd:create_app()";
-          # socket = "${config.services.uwsgi.runDir}/uwsgi.sock";
-          http = ":8080";
-          env = [
-            "CONFIG_PATH=/persist/uffd/uffd.conf"
-          ];
-          hook-pre-app = "exec:FLASK_APP=${uffd}/lib/python3.9/site-packages/uffd flask db upgrade";
-        };
-      };
-    })).config.system.build.toplevel;
-  };
-  services.nginx.virtualHosts."login.infra4future.de" = {
-    enableACME = true;
-    forceSSL = true;
-    locations = {
-      "/".proxyPass = "http://${config.containers.uffd.localAddress}:8080";
-      "/static".root = "${uffd}/lib/python3.9/site-packages/uffd";
-      "/static/hacc.png".return = "302 https://infra4future.de/assets/img/logo_vernetzung.png";
-      "/static/infra4future.svg".return = "302 https://infra4future.de/assets/img/infra4future.svg";
-      "/static/hedgedoc.svg".return = "302 https://infra4future.de/assets/img/icons/hedgedoc.svg";
-      "/static/mattermost.svg".return = "302 https://infra4future.de/assets/img/icons/mattermost.svg";
-      "/static/nextcloud.svg".return = "302 https://infra4future.de/assets/img/icons/nextcloud.svg";
-      "/static/hot_shit.svg".return = "302 https://infra4future.de/assets/img/icons/hot_shit.svg";
-    };
-  };
-
-  systemd.services.auamost = {
-    enable = true;
-
-    description = "mattermost aua gruppensync";
-    wantedBy = [ "multi-user.target" ];
-    after = [ "network.target" ];
-    serviceConfig.Type = "simple";
-    path = [ pkgs.curl pkgs.jq ];
-    script = "${pkgs.fish}/bin/fish /persist/magic/mattermost-groupsync.fish";
-    startAt = "*:0/15";
-  };
-}
--- a/services/workadventure.nix
+++ b/services/workadventure.nix
@ -37,12 +37,17 @@ in
    locations."/" = {
      proxyPass = "http://192.168.150.3";
      proxyWebsockets = true;
+      extraConfig = ''
+        allow 23.88.116.81;
+        allow 2a01:4f8:c17:86ba::1;
+        deny all;
+      '';
    };
    enableACME = true;
    forceSSL = true;
  };

-  containers.wa-void = {
+  containers.wa-truelove = {

    autoStart = true;
    privateNetwork = true;
@ -60,18 +65,16 @@ in
        ((import sources.nix-hexchen) {}).profiles.nopersist
      ];

-      services.workadventure."void" = {
+      services.workadventure."truelove" = {

        packageset = (import wapkgs {inherit pkgs;}).workadventure-xce;

        nginx = {
          default = true;
-          domain = "https://void.hacc.space";
-          maps.path = "${sources.haccmap.outPath}/";
-          maps.serve = true;
+          domain = "https://true-love.world.hacc.space";
        };

-        frontend.startRoomUrl = "/_/global/void.hacc.space/maps/main.json";
+        frontend.startRoomUrl = "/_/global/localhost/maps/main.json";
        commonConfig = {
          webrtc.stun.url = "stun:void.hacc.space:3478";
          webrtc.turn = {
--- a/websites/hacc.earth/License.md
+++ b/websites/hacc.earth/License.md
@ -1,25 +0,0 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>
-
--- a/websites/hacc.earth/assets/ShareTech-Regular.ttf
+++ b/websites/hacc.earth/assets/ShareTech-Regular.ttf
--- a/websites/hacc.earth/assets/favicon.png
+++ b/websites/hacc.earth/assets/favicon.png
--- a/websites/hacc.earth/assets/favicon_color.png
+++ b/websites/hacc.earth/assets/favicon_color.png
--- a/websites/hacc.earth/assets/globe_cut_mid.jpg
+++ b/websites/hacc.earth/assets/globe_cut_mid.jpg
--- a/websites/hacc.earth/assets/haccvoc.svg
+++ b/websites/hacc.earth/assets/haccvoc.svg
--- a/websites/hacc.earth/assets/infra4future.svg
+++ b/websites/hacc.earth/assets/infra4future.svg
--- a/websites/hacc.earth/assets/logo_header.svg
+++ b/websites/hacc.earth/assets/logo_header.svg
--- a/websites/hacc.earth/assets/logo_header_shadow.svg
+++ b/websites/hacc.earth/assets/logo_header_shadow.svg
--- a/websites/hacc.earth/default.nix
+++ b/websites/hacc.earth/default.nix
@ -1,16 +0,0 @@
-{ stdenvNoCC }:
-
-stdenvNoCC.mkDerivation {
-  name = "hacc.earth-static";
-
-  src = ./.;
-
-  phases = [ "buildPhase" ];
-  buildPhase = ''
-    cd $src
-    mkdir -p $out
-    cp -r * $out
-    rm $out/default.nix
-  '';
-
-}
--- a/websites/hacc.earth/index.html
+++ b/websites/hacc.earth/index.html
@ -1,460 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>hacc &ndash; hackers against climate change</title>
-        
-        <link rel="icon" type="image/png" href="assets/favicon.png">
-        <style>
-            @font-face {
-                font-family: 'share-tech';
-                src: url('assets/ShareTech-Regular.ttf') format('truetype');
-                /*font-weight: normal;
-                font-style: normal;*/
-            }
-            
-            html {
-                overflow: hidden;
-                height: 100%;
-            }
-        
-            body {
-                background-color: #000;
-                color: #fff;
-                font-family: share-tech;
-                margin: 0;
-                
-                perspective: 1px;
-                -webkit-perspective: 1px;
-                -webkit-transform-style: preserve-3d;
-                transform-style: preserve-3d;
-                overflow-y: auto;
-                overflow-x: hidden;
-                height: 100%;
-            }
-            
-            #globe {
-                position: absolute;
-                top: 0;
-                right: 0;
-                left: 0;
-                
-                transform: translateZ(-1px) scale(2);
-                z-index:-1;
-            }
-            #globe > img {
-                height: 100vh;
-                /*position: absolute;
-                right: 0;
-                top: 0;*/
-                float: right;
-                /*width: 30%;*/
-            }
-            
-            #bg {
-                position: absolute;
-                top: 40%;
-                right: 0;
-                left: 0;
-                height: 60%;
-                
-                transform: translateZ(.25px);
-                z-index:-1;
-                
-                background: transparent;
-                background: linear-gradient(0deg, rgba(0,0,0,1) 0%, rgba(0,0,0,0) 100%);
-            }
-            
-            #bg::after {
-                background: #000;
-                height: 1000px;
-                width: 100%;
-                bottom: -1000px;
-                position: absolute;
-                content: "";
-            }
-            
-            .content {
-                position: relative;
-                top: 100px;
-                margin-left: 150px;
-                margin-right: 150px;
-                
-                overflow: hidden;
-                
-                -webkit-transform: translateZ(0px);
-            }
-            
-            footer.content {
-                top: 50px;
-                color: #cccccc;
-                font-size: 14px;
-            }
-            
-            footer a {
-                color: #cccccc;
-            }
-            
-            .logo {
-                position: relative;
-                width: 100%;
-            }
-            .logo > img {
-                width: 300px;
-                max-width: 100%;
-            }
-            
-            h1 {
-                font-size: 42px;
-                font-weight: 600;
-                display: inline;
-
-                /*margin-bottom: 0;*/
-                background: rgb(59,115,185);
-                background: linear-gradient(90deg, rgb(59, 115, 185) 0%, rgb(229, 35, 33) 100%);
-                background-clip: border-box;
-                color: transparent;
-                -webkit-background-clip: text;
-                background-clip: text;
-            }
-            
-            p, li {
-                font-size: 26px;
-                max-width: 900px;
-            }
-            
-            a {
-                text-decoration: none;
-                color: #3b73b9;
-                transition: color .1s linear;
-            }
-            a:hover {
-                /*color: #e52321;*/
-                color: #4e9af9;
-            }
-            
-            ul {
-                margin-top: 0;
-            }
-
-            .langswitch {
-              //position: -webkit-sticky; /* Safari */
-              //position: sticky;
-              font-size: 30px;
-              max-width: 100px;
-              margin: auto;
-              margin-right: 0px;
-              top: 50px;
-              /*left: 900px;*/
-              /*right: 10px;*/ /*sticky somehow doesn't like right*/
-              text-shadow: 2px 2px 5px black;
-              z-index: 100;
-            }
-            
-            .welcome {
-                margin-top: 25vh;
-                width: 60%;
-            }
-            
-            .whatwedo {
-                margin-top: 150px;
-            }
-            
-            .section {
-                margin-top: 100px;
-            }
-            
-            .activities {
-                width: 100%;
-                margin-top: 80px;
-            }
-            
-            .activities > div {
-                width: 44%;
-                display: inline-grid;
-                margin-left: 5%;
-            }
-            
-            .activities .logo-container {
-                width: 100%;
-                text-align: center;
-            }
-            
-            .activities .logo-container img {
-                height: 70px;
-                max-width: 100%;
-            }
-            
-            .blink {
-                animation: 1s steps(2) 0s infinite running blink;
-            }
-            @keyframes blink {
-                from { visibility: hidden; }
-                to { visibility: visible; }
-            }
-            
-            @media only screen and (max-width: 1000px) {
-                .content {
-                    margin-left: 50px;
-                    margin-right: 50px;
-                }
-                
-                .activities > div {
-                    width: 90%;
-                    display: block;
-                }
-                
-                .activities > div:first-child {
-                    margin-bottom: 70px;
-                }
-            }
-            
-            @media only screen and (max-width: 650px) {
-                .logo {
-                    text-align: center;
-                }
-                
-                .welcome {
-                    width: 100%;
-                    margin-top: 55vh;
-                }
-                
-                .content {
-                    margin-left: 20px;
-                    margin-right: 20px;
-                }
-                
-                p, li {
-                    font-size: 22px;
-                }
-            }
-            
-            @media only screen and (min-width: 768px) {
-              .langswitch {
-                position: -webkit-sticky; /* Safari */
-                position: sticky;
-                font-size: 30px;
-                margin: auto;
-                margin-right: 50px;
-                top: 50px;
-              }
-            }
-
-        </style>
-    </head>
-    <body>
-        <div id="globe"><img src="assets/globe_cut_mid.jpg" alt="Die Erde vom Weltall aus gesehen." /></div>
-        <div id="bg"></div>
-        <!--<div class="langswitch"><u><a href="/index.html" style="color: #ffffff">en</a></u>/<a href="/index_de.html" style="color: #ffffff">de</a></div>-->
-        <main class="content" style="z-index: 100">
-            <div class="logo"><img src="assets/logo_header_shadow.svg" alt="hacc. hackers against climate change." /></div>
-            
-            <a name="welcometohacc"></a>
-            <div class="welcome">
-                <h1>Welcome to hacc<span class="blink">_</span></h1>
-                <p>
-                “Hackers Against Climate Change" originated as a series of <a href="https://events.ccc.de/congress/2018/wiki/index.php/Session%3AHackers_Against_Climate_Change">self-organized sessions at 35c3</a>. Working groups, spin offs and local chapters formed afterwards and were present at all major CCC events. Join the groups or start your own!</p>
-                <p>More info <a href="#aboutpage">about this page</a> at the bottom.
-                </p>
-            </div>
-
-            <a name="contact"></a>
-            <div class="section">
-                <h1>Get in contact<span class="blink"></span></h1>
-<p>
-    <ul>
-    <li>
-        <a href="https://muc.hacc.earth">hacc e.V.</a>, local chapter Munich<sup><a href="#history">*</a></sup>
-        <ul>
-        <li>
-            <a href="https://web.libera.chat/#hacc">#hacc</a> on irc.libera.chat or as matrix bridge <a href="https://matrix.to/#/#hacc:libera.chat">#hacc:libera.chat</a>
-        </li>
-        <li>
-            <a href="https://web.libera.chat/#hacc-muc">#hacc-muc</a> on irc.libera.chat or as matrix bridge <a href="https://matrix.to/#/#hacc-muc:libera.chat">#hacc-muc:libera.chat</a>
-        </li>
-        <li>
-            <a href="https://chaos.social/@hacc">@hacc@chaos.social</a>
-        </li>
-        <li>
-            <a href="https://mumble.hacc.space/">mumble.hacc.space</a>
-        </li>
-        <li>
-            info@hacc.earth
-        </li>
-        </ul>
-    </li>
-    <li>
-        <a href="https://totalism.org/hacc">CHT hackbase</a>, local chapter Canary Island<sup><a href="#history">*</a></sup>
-        <ul>
-        <li>
-            <a href="https://matrix.to/#/#hacc:matrix.org">#hacc:matrix.org</a>
-        </li>
-        </ul>
-    </li>
-    <li>    
-    <a href="https://hacc.uber.space/mailman/listinfo">hacc mailinglists</a>
-    </li>
-</ul>
-</p>
-<!--                
-                <a name="activities"></a>
-                <div class="activities">
-                    <div>
-                        <a name="haccvoc"></a>
-                        <div class="logo-container">
-                            <a href="https://hacc.earth#haccvoc"><img src="assets/haccvoc.svg" alt="hacc.voc"></a>
-                        </div>
-                        <p>
-                            If you have an event and need someone
-                            to film or livestream it, maybe we have
-                            time and can help you!
-                            All our recordings and livestreams can be found on <a href="https://hacc.media/">hacc.media</a>; if we stream something live, you'll find us at
-                            <a href="https://live.hacc.media/">live.hacc.media</a>.
-                        </p>    
-                        <ul>
-                            <li><a href="https://vedge-kongress.de/">v-edge Congress 2020</a> in Munich</li>
-                            <li>Filmed and live streamed several stage discussions and press conferences of other * for future groups (see <a href="https://hacc.media/search?tagsOneOf=fff">hacc.media</a>)</li>
-                            <li>Livestreams from demonstrations for climate justice</a></li>
-                            <li>Our own <a href="https://hacc.media/videos/watch/playlist/e90713e1-44a7-4f8e-9d1d-dd6551587d2f?playlistPosition=1">stage</a> at the Remote Chaos Experience (rc3) 2020</li>
-                            <li>Streaming infrastructure for the second and third editions of the <a href="https://studentsforfuture.info/public-climate-school/">Public Climate School</a> by Students for Future</li>
-                        </ul>
-                    </div>
-                    <div>
-                        <a name="infra4future"></a>
-                        <div class="logo-container">
-                            <a href="https://infra4future.de"><img src="assets/infra4future.svg" alt="infra4future"></a>
-                        </div>
-                        <p>
-                            We provide and administrate server infrastructure
-                            for other climate justice groups.
-                        </p>    
-                        <ul>
-                            <li>cloud storage, chats, and forums</li>
-                            <li><a href="https://mumble.hacc.space">mumble.hacc.space</a>: a voice-chat allowing groups to stay in contact while we can’t physically meet</li>
-                            <li>if you need any, look around on the website linked above, write us, or just <a href="https://cloud.infra4future.de/">create an account</a>!</li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-->        
-            <a name="participate"></a>
-            <div class="section">
-                <h1>Ways to Participate<span class="blink"></span></h1>
-<p>
-                <ul>
-                    <!--<li>Regular open international call usually every 10th and 25th of a month at 18:00 UTC via <a href="https://meet.ffmuc.net/hacc.int">Jitsi</a> organized by the hacc e.V..</li>-->
-                    <li>Regular meetings of the <a href="https://muc.hacc.earth">hacc e.V.</a>, usually every 1st and 3rd Wednesday 7:30 p.m. at <a href="https://muc.ccc.de/">muCCC</a>. At the moment we meet online on <a href="https://mumble.hacc.space/">mumble.hacc.space</a>.</li>
-                    <li>Meetings of <a href="https://hacc.uber.space/HACC/Europe/DE/NRW/Siegen">Klimanotstandbündnis in Siegen</a>. See hacc group page.</li>
-                    <li>
-                        Propose changes to the hacc e.V. infrastructure. You can open an issue or open a merge request <a href="https://git.infra4future.de/hacc/haccfiles">on the nixfiles</a> which control a growing part of our infrastructure. Or just ask us via one of hacc e.V. channels above.
-                    </li>
-<li>
-Add you or your project to the <a href="https://e2h.totalism.org/e2h.php?_=hacc-directory#---_PROJECTS">hacc directory</a>
-</li>
-<li>
-Use the <a href="https://hacc.wiki">wiki</a> and add your project!
-</li>
-                </ul>
-</p>                
-            </div>
-
-            <a name="chapters"></a>
-            <div class="section">
-                <h1>Local chapters<span class="blink"></span></h1>
-                <p>
-                    <ul>
-                        <li><a href="https://totalism.org/hacc">CHT hackbase</a> on the Canary Islands, Spain<sup><a href="#history">*</a></sup></li>
-                            <li><a href="https://muc.hacc.earth">hackers against climate change e.V.</a>, Munich, Germany<sup><a href="#history">*</a></sup></li>
-                        <li><a href="https://hacc.uber.space/HACC/Europe/DE/NRW/Siegen">Klimanotstandbündnis in Siegen</a>, Germany</li>
-                    </ul>
-                </p>
-            </div>
-
-            <a name="groups"></a>
-            <div class="section">
-                <h1>Spin offs &amp; working groups<span class="blink"></span></h1>
-                <p>
-                    There are different spin-offs of the movement originating from the <a href="https://events.ccc.de/congress/2018/wiki/index.php/Session:Hackers_Against_Climate_Change">original hacc sessions</a> and events like the <a href="https://events.ccc.de/camp/2019/wiki/Main_Page">CCCamp2019</a> or working groups associated to hacc.
-                </p>
-                <ul>
-                    <li><a href="https://hacc.uber.space/c3sus">c3sus</a>, making Chaos events more sustainable</li>
-                    <li><a href="https://altpwr.net/">Eventgrid</a>, developing a green power network for Camps</li>
-<li><a href="https://infra4future.de">infra4future</a>, offering infrastructure and communcation platforms</li>
-<li><a href="https://hacc.media/">hacc-voc</a>, doing streams and recordings</li>
-<li><a href="https://hacc.uber.space/GreenFediverse">GreenFeediverse</a>, providing a list about servers and their renewable energy consumption status</li>
-</ul>
-                <p>
-                    Further project ideas can be found or added in the <a href="https://hacc.wiki">wiki</a> and the <a href="https://e2h.totalism.org/e2h.php?_=hacc-directory#---_PROJECTS">hacc directory</a>.
-                </p>
-    
-        <a name="similar"></a>
-            <div class="section">
-                <h1>Similar groups<span class="blink"></span></h1>
-                <p>
-                <ul>
-                    <li><a href="https://bits-und-baeume.org/regionalzweige/de">Bits &amp; Bäume</a>, with multiple local chapters</li>
-                    <li><a href="https://developersforfuture.org">Developers for Future</a></li>
-                </ul>
-</p>
-            </div>
-
-            <a name="weinthepress"></a>
-            <div class="section">
-                <h1>We in the press<span class="blink"></span></h1>
-
-                <p>
-                <ul>
-                    <li>Short interview with c3sus and hacc activists in the <a href="https://denkangebot.org">Denkangebot Podacst</a> episode <a href="https://www.denkangebot.org/allgemein/da008-urlaub-auf-dem-hackercamp/">"Urlaub auf dem Hackercamp"</a>, unfortunately in German only</li>
-                    <li>
-                        Le Monde decided to give us, our posters, and Mate, a <a href="https://www.lemonde.fr/pixels/article/2019/12/30/a-leipzig-hackers-et-militants-pour-le-climat-font-front-commun_6024362_4408996.html">shoutout</a> in their article about the <a href="https://events.ccc.de/congress/2019/wiki/index.php/Main_Page">36c3</a>!
-                    </li>
-                </ul>
-                </p>
-            </div>
-
-            <a name="history"></a>
-            <div class="section">
-                <h1>History of hacc<span class="blink"></span></h1>
-                <p>
-                “Hackers Against Climate Change" originated as a series of <a href="https://events.ccc.de/congress/2018/wiki/index.php/Session%3AHackers_Against_Climate_Change">self-organized sessions at 35c3</a>. In the aftermath members of those sessions started spin offs as mentioned above and local chapters in Siegen, Munich and on the Canary Islands.
-</p>
-<p>
-The local chapter in Siegen initiated the first hacc sessions at 35c3 and afterwards was mainly involved in local activities.
-<p>
-The local chapter CHT hackbase cohosted the 35c3 sessions, hosted the session at 36c3 and cohosted the divoc r2r sessions.
-</p>
-<p>
-Inspired by the activities in Siegen, the Munich chapter started their bi-weekly meetings in May 2019. With the approval to use the name by the initiator of the first sessions on May 13th 2020 we eventually founded the German non-profit organization "<a href="https://muc.hacc.earth">hackers against climate change e.V.</a>" on December 9th 2020. Two members of us were part of the 35c3 sessions. Since then we were active at the CCCamp 2019, 36c3, rC3 and divoc r2r.<br>
-</p>
-<p>
-Unfortunately conflicts led to a split between the local chapter Munich and CHT hackbase in July 2021.
-</p>
-
-        <a name="aboutpage"></a>
-            <div class="section">
-                <h1>About this page<span class="blink"></span></h1>
-                <p>
-The hacc e.V. runs this page (<a href="https://hacc.earth">hacc.earth</a>) but not necessarily the linked projects. You can find more about our activities and involvements on our <a href="https://muc.hacc.earth">own page</a>.<br>
-Also the source of the page can be found <a href="https://git.infra4future.de/hacc/haccfiles/src/branch/main/websites/hacc.earth">here</a>. As with the hacc e.V. infrastructure in general you are invited to make change requests or just <a href="#contac">contact</a> us to ask for changes.
-</p>
-<p>
-The hacc logo was designed by <a href="https://creativesforfuture.de/">Creatives for Future</a>.
-</p>
-
-            </div>
-
-            
-            <div class="section"></div>
-        </main>
-        <footer class="content" style="z-index: 200">
-            <div>
-                <a href="https://git.infra4future.de/hacc/haccfiles/src/branch/main/websites/hacc.earth">Source of hacc.earth</a> &bull;
-                <a href="#contact">Contact</a> &bull;
-                <a href="https://infra4future.de/impressum.html">Imprint</a>
-            </div>
-        </footer>
-    </body>
-</html>
--- a/websites/hacc.earth/index_de.html
+++ b/websites/hacc.earth/index_de.html
@ -1,385 +0,0 @@
-<!DOCTYPE html>
-<html lang="de">
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>hacc &ndash; hackers against climate change</title>
-        
-        <link rel="icon" type="image/png" href="assets/favicon.png">
-        <style>
-            @font-face {
-                font-family: 'share-tech';
-                src: url('assets/ShareTech-Regular.ttf') format('truetype');
-                /*font-weight: normal;
-                font-style: normal;*/
-            }
-            
-            html {
-                overflow: hidden;
-                height: 100%;
-            }
-        
-            body {
-                background-color: #000;
-                color: #fff;
-                font-family: share-tech;
-                margin: 0;
-                
-                perspective: 1px;
-                -webkit-perspective: 1px;
-                -webkit-transform-style: preserve-3d;
-                transform-style: preserve-3d;
-                overflow-y: auto;
-                overflow-x: hidden;
-                height: 100%;
-            }
-            
-            #globe {
-                position: absolute;
-                top: 0;
-                right: 0;
-                left: 0;
-                
-                transform: translateZ(-1px) scale(2);
-                z-index:-1;
-            }
-            #globe > img {
-                height: 100vh;
-                /*position: absolute;
-                right: 0;
-                top: 0;*/
-                float: right;
-                /*width: 30%;*/
-            }
-            
-            #bg {
-                position: absolute;
-                top: 40%;
-                right: 0;
-                left: 0;
-                height: 60%;
-                
-                transform: translateZ(.25px);
-                z-index:-1;
-                
-                background: transparent;
-                background: linear-gradient(0deg, rgba(0,0,0,1) 0%, rgba(0,0,0,0) 100%);
-            }
-            
-            #bg::after {
-                background: #000;
-                height: 1000px;
-                width: 100%;
-                bottom: -1000px;
-                position: absolute;
-                content: "";
-            }
-            
-            .content {
-                position: relative;
-                top: 100px;
-                margin-left: 150px;
-                margin-right: 150px;
-                
-                overflow: hidden;
-                
-                -webkit-transform: translateZ(0px);
-            }
-            
-            footer.content {
-                top: 50px;
-                color: #707070;
-                font-size: 14px;
-            }
-            
-            footer a {
-                color: #cccccc;
-            }
-            
-            .logo {
-                position: relative;
-                width: 100%;
-            }
-            .logo > img {
-                width: 300px;
-                max-width: 100%;
-            }
-            
-            h1 {
-                font-size: 42px;
-                font-weight: 600;
-                display: inline;
-
-                /*margin-bottom: 0;*/
-                background: rgb(59,115,185);
-                background: linear-gradient(90deg, rgb(59, 115, 185) 0%, rgb(229, 35, 33) 100%);
-                background-clip: border-box;
-                color: transparent;
-                -webkit-background-clip: text;
-                background-clip: text;
-            }
-            
-            p, li {
-                font-size: 26px;
-                max-width: 900px;
-            }
-            
-            a {
-                text-decoration: none;
-                color: #3b73b9;
-                transition: color .1s linear;
-            }
-            a:hover {
-                /*color: #e52321;*/
-                color: #4e9af9;
-            }
-            
-            ul {
-                margin-top: 0;
-            }
-
-            .langswitch {
-              //position: -webkit-sticky; /* Safari */
-              //position: sticky;
-              font-size: 30px;
-              max-width: 100px;
-              margin: auto;
-              margin-right: 0px;
-              top: 50px;
-              /*left: 900px;*/
-              /*right: 10px;*/ /*sticky somehow doesn't like right*/
-              text-shadow: 2px 2px 5px black;
-              z-index: 100;
-            }
-            
-            .welcome {
-                margin-top: 25vh;
-                width: 60%;
-            }
-            
-            .whatwedo {
-                margin-top: 150px;
-            }
-            
-            .section {
-                margin-top: 100px;
-            }
-            
-            .activities {
-                width: 100%;
-                margin-top: 80px;
-            }
-            
-            .activities > div {
-                width: 44%;
-                display: inline-grid;
-                margin-left: 5%;
-            }
-            
-            .activities .logo-container {
-                width: 100%;
-                text-align: center;
-            }
-            
-            .activities .logo-container img {
-                height: 70px;
-                max-width: 100%;
-            }
-            
-            .blink {
-                animation: 1s steps(2) 0s infinite running blink;
-            }
-            @keyframes blink {
-                from { visibility: hidden; }
-                to { visibility: visible; }
-            }
-            
-            @media only screen and (max-width: 1000px) {
-                .content {
-                    margin-left: 50px;
-                    margin-right: 50px;
-                }
-                
-                .activities > div {
-                    width: 90%;
-                    display: block;
-                }
-                
-                .activities > div:first-child {
-                    margin-bottom: 70px;
-                }
-            }
-            
-            @media only screen and (max-width: 650px) {
-                .logo {
-                    text-align: center;
-                }
-                
-                .welcome {
-                    width: 100%;
-                    margin-top: 55vh;
-                }
-                
-                .content {
-                    margin-left: 20px;
-                    margin-right: 20px;
-                }
-                
-                p, li {
-                    font-size: 22px;
-                }
-            }
-            
-            @media only screen and (min-width: 768px) {
-              .langswitch {
-                position: -webkit-sticky; /* Safari */
-                position: sticky;
-                font-size: 30px;
-                margin: auto;
-                margin-right: 50px;
-                top: 50px;
-              }
-            }
-
-        </style>
-    </head>
-    <body>
-        <div id="globe"><img src="assets/globe_cut_mid.jpg" alt="The Earth, seen from space."/></div>
-        <div id="bg"></div>
-        <div class="langswitch"><a href="/index.html" style="color: #ffffff">en</a>/<u><a href="/index_de.html" style="color: #ffffff">de</a></u></div>
-        <main class="content" style="z-index: 100">
-            <div class="logo"><img src="assets/logo_header_shadow.svg" alt="hacc. hackers against climate change."/></div>
-            
-            <a name="welcometohacc"></a>
-            <div class="welcome">
-                <h1>Willkommen bei hacc<span class="blink">_</span></h1>
-                <p>
-                “Hackers Against Climate Change” entstammt einer Serie von <a href="https://events.ccc.de/congress/2018/wiki/index.php/Session:Hackers_Against_Climate_Change">Self-Organized Sessions beim 35c3</a>. Seit dem haben wir mit anderen Klimaschutzgruppen zusammengearbeitet, diese mit technischem Wissen unterstützt, sowie in der Hacker Community auf die Klimakrise aufmerksam gemacht.</p>
-                <p>
-                Zögere nicht mit uns in <a href="#contact">Kontakt</a> zu treten, über verschiedene Kanäle oder bei lokalen <a href="#meetups">Treffen</a>. Treffe uns bei Chaos-Events oder starte Deine eigene lokale Gruppe!
-                </p>
-            </div>
-
-            <a name="whatwedo"></a>
-            <div class="whatwedo">
-                <h1>Was wir machen<span class="blink"></span></h1>
-                <p>
-                hacc ist eine Gemeinschaft von Lebewesen die sich zur Aufgabe gemacht haben, im Sinne der <a href="https://www.ccc.de/de/hackerethik">Hackerethik</a> des Chaos Computer Clubs die Klimaschutzbewegung mitzugestalten. Zur Zeit sind unsere bedeutensten Projekte <a href="#haccvoc">hacc.voc</a> und <a href="#infra4future">infra4future</a> (siehe unten).<br>Ein weiteres Projekt ist <a href="https://hacc.uber.space/HACC_CSV">hacc.csv</a>. Dabei steht csv für collaboration, science, visualization und data. Es gibt zwei <a href="https://hacc.uber.space/HACC_Local_Groups">lokale Gruppen</a> in Deutschland, in München und
-                Siegen.
-                </p>
-                
-                <a name="activities"></a>
-                <div class="activities">
-                    <div>
-                        <a name="haccvoc"></a>
-                        <div class="logo-container">
-                            <a href="https://haccvoc.de"><img src="assets/haccvoc.svg" alt="hacc.voc"></a>
-                        </div>
-                        <p>
-                            Du hast ein Event hast brauchst wen um es zu filmen
-                            oder live zu streamen? Vielleicht habe wir Zeit und können
-                            dir helfen! <br>
-                            Alle unsere Aufnahmen landen auf <a href="https://hacc.media">hacc.media</a>;
-                            unsere Livestreams sind auf <a href="https://live.hacc.media">live.hacc.media</a>.
-                        </p>    
-                        <ul>
-                            <li><a href="https://vedge-kongress.de/">v-edge Congress 2020</a> in München</li>
-                            <li>Livestreams und Aufzeichnungen einiger Podiumsdiskussionen und Pressekonferenzen von anderen * for future-Orgas (siehe <a href="https://hacc.media/search?tagsOneOf=fff">hacc.media</a>)</li>
-                            <li>Unsere eigene <a href="https://hacc.media/videos/watch/playlist/e90713e1-44a7-4f8e-9d1d-dd6551587d2f?playlistPosition=1">Stage</a> auf der Remote Chaos Experience (rc3) 2020</li>
-                            <li>Die Streaming-Infrastruktur für die zweite und dritte Auflage der <a href="https://studentsforfuture.info/public-climate-school/">Public Climate School</a> der Students for Future</li>
-                        </ul>
-                    </div>
-                    <div>
-                        <a name="infra4future"></a>
-                        <div class="logo-container">
-                            <a href="https://infra4future.de"><img src="assets/infra4future.svg" alt="infra4future"></a>
-                        </div>
-                        <p>
-                            Wir betreiben und administrieren Server-Infrastruktur und stellen diese Klimaschutzgruppen zur Verfügung.
-                        </p>    
-                            <ul>
-                                <li>Cloud-Speicher, Chats und Foren</li>
-                                <li><a href="https://mumble.hacc.space">mumble.hacc.space</a>: ein Sprach-Chat für Gruppen, die ohne physische Treffen in Kontakt bleiben wollen</li>
-                                <li>Wenn Du einen der Dienste benötigst, schau Dich auf der oben verlinkten Seite um, schreib uns oder <a href="https://cloud.infra4future.de/">erstell Dir ein Account</a>!</li>
-                            </ul>
-                        
-                    </div>
-                </div>
-            </div>
-            
-            <a name="meetups"></a>
-            <div class="section">
-                <h1>Mitmachen<span class="blink"></span></h1>
-                <ul>
-                    <li>Regelmäßiger internationaler Call, jeden 10. und 25. im Monat um  18:00 UTC via <a href="https://meet.ffmuc.net/hacc.int">Jitsi</a>.</li>
-                    <li>Regelmäßige Treffen von <a href="https://hacc.uber.space/HACC/Europe/DE/BY/Munich">hacc in München</a>, normalerweise jeden ersten und dritten Mittwoch im Monat um  19:00 Uhr beim <a href="https://muc.ccc.de/">muCCC</a>. Im Moment treffen wir uns Online auf <a href="https://mumble.hacc.space/">mumble.hacc.space</a>.</li>
-                    <li>Regelmäßige Treffen des <a href="https://hacc.uber.space/HACC/Europe/DE/NRW/Siegen">Klimanotstandbündnis in Siegen</a>. Jeden zweiten Sonntag, siehe hacc-Seite.</li>
-                    <li>
-                        Wenn du Vorschläge für Änderungen an unserer Infrastruktur hast, leg bitte einen Issue oder erstelle einen Merge Request <a href="https://git.infra4future.de/hacc/haccfiles">auf die nixfiles</a>, über die wir einen (größer werdenden) Teil unserer Server verwalten.
-                    </li>
-                </ul>
-                
-            </div>
-
-            <a name="contact"></a>
-            <div class="section">
-                <h1>Kontakt<span class="blink"></span></h1>
-                <p>
-                    Du kannst uns über verschiedne Kanäle erreichen und mitmachen:
-                </p>
-                    <ul>
-                        <li>contact-at-hacc.earth</li>
-                        <li>Im Fediverse auf <a href="https://chaos.social/@hacc">chaos.social</a></li>
-                        <li><a href="https://hacc.wiki">hacc.wiki</a></li>
-                        <li><a href="https://infra4future.de">infra4future.de</a></li>
-                        <li><a href="https://matrix.to/#/#hacc:libera.chat">#hacc:libera.chat</a></li>
-                        <li><a href="https://web.libera.chat/#hacc">#hacc auf irc.libera.chat</a></li>
-                        <li><a href="https://mumble.hacc.space">mumble.hacc.space</a></li>
-                        <li><a href="https://hacc.uber.space/mailman/listinfo">hacc-Mailinglisten</a></li>
-                    </ul>
-                
-            </div>
-
-            <a name="othergroups"></a>
-            <div class="section">
-                <h1>Spin offs &amp; Ähnlich Gruppen<span class="blink"></span></h1>
-                <p>
-                Es gibt verschiedene Spin-Offs, die aus der Bewegung der den <a href="https://events.ccc.de/congress/2018/wiki/index.php/Session:Hackers_Against_Climate_Change">ersten hacc-Sessions</a> auf dem 35c3 und Events wie dem <a href="https://events.ccc.de/camp/2019/wiki/Main_Page">CCCamp2019</a> entstanden sind:
-                </p>
-                <ul>
-                    <li><a href="https://hacc.uber.space/c3sus">c3sus</a>, Chaos-Events nachhaltig gestalten</li>
-                    <li><a href="https://altpwr.net/">Eventgrid</a>, Entwicklung eines lokalen Stromnetzes, für Outdoor-Events wie dem Camp</li>
-                </ul>
-                
-                <p>
-                    Weitere Projektideen gibt es im <a href="https://hacc.wiki">wiki</a>.
-                </p>
-                <h2>Ähnliche Gruppen</h2>
-                <ul>
-                    <li><a href="https://bits-und-baeume.org/regionalzweige/de">Bits &amp; Bäume</a> in Dresden, Berlin, Hannover, Dortmund, Köln und Osnabrück</li>
-                    <li><a href="https://hackersforfuture.de">Hackers for Future</a> in Regensburg (zur Zeit pausierend)</li>
-                    <li><a href="https://developersforfuture.org">Developers for Future</a></li>
-                    <li><a href="https://totalism.org">CHT Hackbase</a> auf den Kanarischen Inseln</li>
-                </ul>
-            </div>
-
-            <a name="weinthepress"></a>
-            <div class="section">
-                <h1>In der Presse<span class="blink"></span></h1>
-                <p>
-                Le Monde hat sich aus unbekannten Gründen entschlossen, uns und unsere Poster (und Mate) in einem <a href="https://www.lemonde.fr/pixels/article/2019/12/30/a-leipzig-hackers-et-militants-pour-le-climat-font-front-commun_6024362_4408996.html">Artikel</a> zum <a href="https://events.ccc.de/congress/2019/wiki/index.php/Main_Page">36c3</a> zu erwähnen!
-                </p>
-            </div>
-            
-            <div class="section"></div>
-        </main>
-        <footer class="content" style="z-index: 200">
-            <div>
-                <a href="#contact">Kontakt</a> &bull;
-                <a href="https://infra4future.de/impressum.html">Impressum</a>
-            </div>
-        </footer>
-    </body>
-</html>
--- a/websites/help.studentsforfuture.info/.DS_Store
+++ b/websites/help.studentsforfuture.info/.DS_Store
--- a/websites/help.studentsforfuture.info/.gitignore
+++ b/websites/help.studentsforfuture.info/.gitignore
@ -1,2 +0,0 @@
-.jekyll-cache
-_site
--- a/websites/help.studentsforfuture.info/.nojekyll
+++ b/websites/help.studentsforfuture.info/.nojekyll
--- a/websites/help.studentsforfuture.info/README.md
+++ b/websites/help.studentsforfuture.info/README.md
@ -1,31 +0,0 @@
-# SFF Technik Wiki
-
-?> Gerade wird noch herumgebastelt, deswegen ist einiges unvollständig.
-
-Hier sammeln wir technische Leitfäden, wie ihr euch mit den bei SFF verwendeten Tools
-zurechtfindet, und wie ihr digitale Events abhalten & gestalten könnt.
-Hauptsächlich geht es hier um die [PCS](https://studentsforfuture.info/public-climate-school),
-aber manches ist vielleicht auch so nützlich.
-
-**Für ungeklärte Fragen, Ergänzungswünsche oder Feedback wendet euch einfach an den [PCS Tech Support auf Telegram](https://t.me/joinchat/PezzhhOoxeVRGvoxMoi4Sg).**
-
-**Überblick:**
- **[Webseite](website/website.md)**: Hier findet ihr Leitfäden für unsere bundesweite Webseite.
- **[Tools](tools/tools.md)**: Hier findet ihr Leitfäden zu einigen Tools zur Organisation, für Social Media, Events, Online-Meetings und Live-Interaktion.
- **[Streams](streams/streams)**: Hier erfahrt ihr, wie ihr Veranstaltungen streamen könnt. Außerdem findet ihr hier die technische Stream Dokumentation zu den digitalen PCS.
- **[Online-Events](event/online-event.md)**: Hier findet ihr Ressourcen, die euch bei digitalen Events vielleicht helfen können.
-
-**FAQ:**  
-
- [Wie kommt mein Format in den Stream? Wie läuft das ab?](/faq?id=wie-kommt-mein-format-in-den-stream-wie-läuft-das-ab)
- [Wir haben keinen Streaming-Account. Könnt ihr uns etwas zur Verfügung stellen?](/faq?id=wir-haben-keinen-streaming-account-könnt-ihr-uns-etwas-zur-verfügung-stellen)
- [Woher bekomme ich Ortsgruppen Zugang zur Website?](/faq?id=woher-bekomme-ich-ortsgruppen-zugang-zur-website)
- [Wie kann ich mit Trollen im meinem Online-Event umgehen?](/faq?id=wie-kann-ich-mit-trollen-im-meinem-online-event-umgehen)
- [Wie kann ich mein Online-Event barrierefrei gestalten?](/faq?id=wie-kann-ich-mein-online-event-barrierefrei-gestalten)
-
---
-
-<a href="https://www.youtube.com/watch?v=wn5AE98T8sE"><img src="img/faq/pcs_walkthrough_thumbnail.png" ></a>
-
-[Hier](https://www.youtube.com/watch?v=wn5AE98T8sE) findest du ein YouTube-Video, in dem wir die aktuellen Tools der PCS-Organisation erklären.
-
--- a/websites/help.studentsforfuture.info/_404.md
+++ b/websites/help.studentsforfuture.info/_404.md
@ -1,8 +0,0 @@
-# Seite nicht gefunden :(
-
-Falls du auf einen Link geklickt hast, ist der Link vermutlich veraltet.  
-Bitte melde dich beim
-[PCS Tech Support auf Telegram](https://t.me/joinchat/PezzhhOoxeVRGvoxMoi4Sg), damit
-das behoben werden kann.
-
-[Zur Startseite](/)
--- a/websites/help.studentsforfuture.info/_glossary.md
+++ b/websites/help.studentsforfuture.info/_glossary.md
@ -1,4 +0,0 @@
-##### PCS
-Public Climate School
-
-
--- a/websites/help.studentsforfuture.info/_sidebar.md
+++ b/websites/help.studentsforfuture.info/_sidebar.md
@ -1,36 +0,0 @@
- [Start](README.md)
- [FAQ](faq.md)
- [Webseite](website/website.md)
-  - [Events eintragen](website/events-eintragen.md)
-  - [OG-Homepage einrichten](website/og-homepage.md)
- [Tools](tools/tools.md)
-  - [Tools zur Organisation](tools/orga.md)
-    - [Plattform-N](tools/plattform-n.md)
-    - [Rocket.Chat](tools/rocket-chat.md)
-    - [Meistertask](tools/meistertask.md)
-    - [Dieses Wiki](tools/technik-wiki.md)
-  - [Tools für Social Media](tools/socialmedia.md)
-    - [Profilbildgenerator](tools/profilbildgenerator.md)
-    - [Sharepics mit Canva](tools/canva.md)
-  - [Tools fürs Eventmanagement](tools/events.md)
-    - [Eventkalender](tools/eventkalender.md)
-    - [Attending.io](tools/attending.md)
-  - [Tools für Video-Konferenzen](tools/video-conference.md)
-    - [Zoom](tools/zoom.md)
-    - [BigBlueButton](tools/bbb.md)
-    - [JitSi](tools/jitsi.md)
-  - [Tools für Live-Interaktion](tools/live-interaktion.md)
-    - [Tweedback](tools/tweedback.md) 
- [Streams](streams/streams.md)
-  - [Stream: Zoom zu YouTube](streams/einfach.md)
-  - [Stream: Zoom zu PCS-Server (RTMP)](streams/streamzoomrtpm.md)
-  - [Streams mit OBS](streams/obs.md)
-  - [Troubleshooting](streams/troubleshooting.md)
-  - [Ergänzungen / Optimierungen](streams/optimierungen.md)
-  - [Technische Dok. digitale PCS](streams/pcs-doc.md)
-    - [Überblick PCS 2.0](streams/pcs2.md)
-    - [Überblick PCS 3.0](streams/pcs3.md)
- [Online-Events](events/online-events.md)
-  - [Moderation](events/moderation.md)
-  - [Datenschutz](events/datenschutz.md)
-  - [Beispiel PCS Einverständniserklärung](events/einverstaendniserklaerung.md)
--- a/websites/help.studentsforfuture.info/default.nix
+++ b/websites/help.studentsforfuture.info/default.nix
@ -1,16 +0,0 @@
-{ stdenvNoCC }:
-
-stdenvNoCC.mkDerivation {
-  name = "muc.hacc.earth-static";
-
-  src = ./.;
-
-  phases = [ "buildPhase" ];
-  buildPhase = ''
-    cd $src
-    mkdir -p $out
-    cp -r * $out
-    rm $out/default.nix
-  '';
-
-}
--- a/websites/help.studentsforfuture.info/einverstaendniserklaerung.pdf
+++ b/websites/help.studentsforfuture.info/einverstaendniserklaerung.pdf
--- a/websites/help.studentsforfuture.info/events/datenschutz.md
+++ b/websites/help.studentsforfuture.info/events/datenschutz.md
@ -1,17 +0,0 @@
-# Leitfaden: PCS 2020 zum Thema Datenschutz     
-
-Dadurch, dass die PCS 2020 online stattfindet müssen wir uns auch Gedanken über Datenschutz machen. Dieser Leitfaden kann nicht jeden Fall abdecken und es handelt sich hier nur um Empfehlungen. 
-
-
-
-## Normaler Vortrag 
-
-Sollte der Vortrag wie eine Vorlesung in diesen Zeiten üblich über eine Konferenzplattform stattfinden jedoch ansonsten nicht weiter gestreamed  oder aufgezeichnet werden, reicht meistens ein einfacher Hinweis auf die Datenschutzrichtlinien der Plattform. Dieser sollte vor betreten der Plattform platziert sein. Zum Beispiel an der Stelle an der ihr die Links zu der Vorlesung bewirbt. 
-
-## Aufgezeichneter oder gestreamter Vortrag
-
-Für einen Vortrag der noch anderweitig zugänglich gemacht werden soll müssen noch weitere Vorkehrung getroffen werden. Alle Menschen die in einem solchen Vortrag zu sehen sind müssen **vor der Verarbeitung ihrer Daten** zugestimmt haben. Zuschauer könnt ihr Beispielsweise mündlich darüber aufklären, dass sie in einem Livestream zu sehen sein werden oder was mit der Aufnahme passiert. Außerdem empfiehlt es sich auch an anderer Stelle darauf hinzuweisen. Beispielsweise kann auf der gleichen Folie auf der zur Interaktion aufgerufen wird, auch der Hinweis stehen, dass eine solche aufgezeichnet wird. Wichtig ist das es nicht die Möglichkeit gibt, dass unfreiwillig oder unwissentlich persönliche Daten (z.B. Äußerungen, Namen etc) verarbeitet/veröffentlicht werden. Um sicher zu gehen könnt  empfiehlt sich zu diesem Zweck auch von jedem Teilnehmenden eine Einverständniserklärung unterschreiben zu lassen. Eine weitere Möglichkeit ist es Fragerunden am Ende des Vortrages nicht mit aufzuzeichnen. Bedenkt außerdem auch, dass auch Menschen die erst später der Konferenz beitreten informiert werden müssen. Zum Beispiel im Chat. 
-
-Die Dozierenden solltet ihr außerdem **vorher** darum bitten euch eine Einverständnis Erklärung auszufüllen. 
-
-Beispiele für Einverständniserklärungen findet ihr [hier](events/einverstaendniserklaerung.md).
--- a/websites/help.studentsforfuture.info/events/einverstaendniserklaerung.md
+++ b/websites/help.studentsforfuture.info/events/einverstaendniserklaerung.md
@ -1,68 +0,0 @@
-# Beispiel PCS Einverständniserklärung
-
-Wenn ihr Veranstaltungen aufzeichnen und veröffentlichen wollt, braucht ihr vermutlich
-eine Einverständniserklärung. Hier findet ihr Beispiele für die PCS, die ihr für euch
-anpassen könnt (insb. alles was <mark>markiert</mark> ist).
-Trotzdem der Disclaimer: **Die Einverständniserklärungen hier sind nur zur Orientierung und ohne Gewährleistung!**
-
-## Deutsch
-
-#### Als PDF:
-Eine Beispieleinverständniserklärung von der PCS 2020 findet ihr <a target="_blank" rel="noopener noreferrer" title="Einverständniserklärung (PDF)" href="einverstaendniserklaerung.pdf">hier</a>.
-
-#### In Textform:
-
-_**Einverständniserklärung zur Aufzeichnung von Vorlesungen / Vorträgen im Rahmen der Public Climate School vom <mark>17.-21.05.2021</mark>.**_
-
-*Ich erkläre mich damit einverstanden, dass von mir Audio-/Videoaufnahmen gemacht 
-werden, die im Rahmen der vom <mark>17.-21.05.2021</mark> stattfindenden Public 
-Climate School online veröffentlicht werden.*
-
-*Ich versichere, dass innerhalb dieser Aufzeichnungen keine Rechte Dritter verletzt 
-werden.*
-
-*Ich erkläre, dass ich alle Materialien, die ich in meiner Vorlesung/meinem Vortrag benutze, 
-selbst erstellt habe, bzw. bei der Verwendung fremder Materialien (Texte aus Büchern, 
-Zeitschriften, Bilder, Graphiken, Filmausschnitte, Musiktitel, etc.) diese auf das 
-Urheberrecht nach §60a geprüft habe und diese veröffentlicht werden können.*
-
-*Ich stelle die <mark>Students for Future Stadt</mark> von allen Ansprüchen Dritter frei, die sich 
-wegen möglicher Urheberrechtsverstöße an die <mark>Students for Future Stadt</mark> wenden.*
-
-*Ich verpflichte mich außerdem, den Betreiber des genutzten online Servers unverzüglich 
-zu informieren, wenn Dritte Ansprüche auf Grund der ihnen zustehenden Urheber- bzw. 
-Nutzungsrechte in Bezug auf die oben bezeichnete Aufzeichnung geltend machen.*
-
-*Ich erkläre, dass meine Vorlesung/mein Vortrag und damit die Audio-/Videoaufnahmen 
-und bereitgestellte Foliensätze frei von diskriminierenden Inhalten sind, seien sie 
-rassistisch, sexistisch, antisemitisch, trans\*feindlich, homophob oder anderweitig 
-diskriminierend.*
-
-*Name, Vorname:  
-Titel des Vortrags:  
-Datum des Vortrags:  
-Datum, Unterschrift:*
-
-
-## Englisch
-
-#### In Textform:
-
-_**Declaration of consent for the recording of lectures in context of the Public Climate School from <mark>May 17 – 21 2021</mark>**_
-
-*I hereby agree that audio/video recordings may be made of me, that might be published online in the context of the Public Climate School taking place from <mark>17.-21.05.2021</mark>.*
-
-*I assure that no rights of third parties are violated within these recordings.*
-
-*I declare that I have created all materials I use in my lecture myself, or when using foreign materials (texts from books, magazines, pictures, graphics, film clips, music titles, etc.) I have checked them for copyright according to §60a UrhG and they can be published.*
-
-*I indemnify the <mark>Students for Future Stadt</mark> from all claims of third parties who contact the <mark>Students for Future Stadt</mark> regarding possible copyright infringements.*
-
-*I also undertake to inform the operator of the online server used immediately if third parties assert claims based on the copyrights or rights of use to which they are entitled with regard to the above-mentioned recording.*
-
-*I declare that my lectures and therefore my audio-/video recordings and slides are free of discriminating contents such as racist, sexist, antisemitic, trans\*hostile, homophobic or otherwise discriminating.*
-
-*Full name:  
-Title of lecture:  
-Date of lecture:  
-Date, Signature:*
--- a/websites/help.studentsforfuture.info/events/moderation.md
+++ b/websites/help.studentsforfuture.info/events/moderation.md
@ -1,3 +0,0 @@
-# Moderation
-
-...
--- a/websites/help.studentsforfuture.info/events/online-events.md
+++ b/websites/help.studentsforfuture.info/events/online-events.md
@ -1,32 +0,0 @@
-# Online-Events
-
-Hier versuchen wir euch eine Sammlung nützlicher Guides für die Durchführung von
-Online Veranstaltungen bereitzustellen.
-
-Typischerweise sind vor jedem Online-Event folgende Fragen zu klären:
- **Wie können Menschen teilnehmen?**  
-  Meist entweder direkte Teilnahme im Online Meeting, z.B. über Zoom,
-  oder ein Stream, z.B. über YouTube.
-  
-  Das hängt von einigen Faktoren ab, u.a. wie viele Teilnehmer:innen erwartet werden,
-  wie interaktiv das Event sein soll, und wie geschlossen der Raum, in dem es stattfindet.
-  Für Workshops eignen sich Meetings, für Podiumsdiskussion sind vermutlich Streams
-  die bessere Wahl. Vorträge lassen sich auf beide Arten gut umsetzen. Hier ist vermutlich
-  die Teilnehmer:innenzahl und Öffentlichkeit ausschlaggebend.
-
-  Theoretisch geht auch eine Kombination: Die Teilnehmer:innen können dem Meeting direkt
-  beitreten, während es gleichzeitig gestreamt wird. In diesem Fall müsstet ihr aber
-  sicherstellen, dass keine Person das Meeting stören kann und dass keine persönlichen
-  Daten im Stream landen können. Außerdem könnten Zuschauer:innen auf YouTube dann z.B.
-  nicht erfahren, wenn Fragen im Zoom Chat gestellt werden.
- **Wer kann teilnehemen / braucht es evtl. eine Anmeldung?**  
-  Es ist bei allen Optionen möglich, die Teilnahme so einzuschränken, dass nur Menschen
-  mit den richtigen Zugangsdaten oder dem richtigen Link teilnehemen können.
-  Um diese zu verteilen könnt ihr zum Beispiel eine Anmeldung machen.
- **Wie sieht die Interaktion mit den Teilnehmer:innen aus?**  
-  Fast alle Tools haben einen Chat, den ihr natürlich verwenden könnt, der aber auch schnell
-  unübersichtlich werden kann. Es kann sich daher lohnen, ein eigenes Tool für die Live-Interaktion
-  zu verwenden. Mehr dazu findet ihr auf der [zugehörigen Seite bei den Tools](tools/live-interaktion.md).
- **Soll die Veranstaltung aufgezeichnet werden?**  
-  Wenn ja, braucht ihr vermutlich eine [Einverständniserklärung](events/datenschutz.md).
-
--- a/websites/help.studentsforfuture.info/faq.md
+++ b/websites/help.studentsforfuture.info/faq.md
@ -1,109 +0,0 @@
-# **F**requently **A**sked **Q**uestions:
-
-?> Das FAQ ist noch von der letzten PCS, das heißt insb. die Links werden sich vermutlich noch ändern.
-
-## Wie kommt mein Format in den Stream? Wie läuft das ab?
-Das hängt davon ab, was für ein Format es ist bzw. welches Tool ihr verwendet:
- **Voraufgezeichnete Videos:** 
-  
-  könnt ihr uns einfach über einen Cloud Link (z.B. hier: https://fffutu.re/pcs-lecture-upload)
-  oder einen Link zu einem (ungelisteten) YouTube Video schicken. Bitte gebt uns das Video noch vor Beginn der PCS.
-  
- **Zoom-Veranstaltungen**: 
-  
-  hier hängt es davon ab, ob ihr das Meeting selbst erstellt habt oder der/die Dozierende.
-  Nur die Person, die das Meeting erstellt hat kann das Livestreaming aktivieren. Wie das geht steht [hier](zoom.md).
-  Ihr bekommt dazu so bald wie möglich die genauen Einstellungen, die ihr da eingeben müsst.
-  Bitte prüft schon im vornherein, ob ihr das in den Einstellungen findet (also ob es bei euch aktiviert ist).
-  
- **JitSi**: 
-  
-  Für JitSi im Livestream verwenden wir voraussichtlich eine eigene Instanz. Das bedeutet ihr bekommt von uns so bald wie möglich einen Link zu dem JitSi Raum. Dort könnt ihr dann mit zwei Klicks den Stream starten.
-  Mehr Infos dazu kommen so bald wie möglich. Bitte gebt uns unbedingt vorher bekannt, falls mehr als 6 Personen an diesem Meeting teilnehmen werden.
-  
- **BigBlueButton**: 
-
-  Es tut uns Leid, aber bisher haben wir uns noch nicht mit einem Leitfaden für BigBlueButton beschäftigen können. Deshalb möchten wir euch diesen ausführlichen Leitfaden von HACC (Hackers Against Climate Crisis) wärmstens empfehlen: [Recording a talk with Big Blue Button and obs studio](https://hacc.uber.space/Recording_a_talk_with_Big_Blue_Button_and_obs_studio)
-  
-  <a href="https://www.youtube.com/watch?v=dmryPtz-_ME&feature=youtu.be"><img src="img/faq/tutorial_thumbnail.png"></a>
-
-## Wie kann ich als Dolmer*in teilnehmen?
-
- **Den Stream empfangen**
-  1. Über Zoom:
-
-     Sie sitzen mit in dem Zoom Meeting, indem der Vortrag abgehalten wird.
-
-  2. Über VLC:
-
-     Sie empfangen den Stream ohne große Verzögerung auf ihren PC.
-
-     <a href="https://www.youtube.com/watch?v=UBJodCpsUI8">Hier finden Sie die Aufzeichnung des entsprechenden Technik-Briefings.</a>
-
- **Übersetzung einsprechen**
-
-  Dafür müssen Sie dem entsprechenden Mumble Channel beitreten. Den Link erhalten Sie von uns. Als Gebärdensprachendolmetscher*in müssen Sie nur dem richtigen Zoom Meeting beitreten und nichts weiter tun. <a href="https://www.youtube.com/watch?v=UBJodCpsUI8">Hier finden Sie eine Aufgabe des Übersetzerinnen-Briefings.</a>
-
-
-
-## Wir haben keinen Streaming-Account. Könnt ihr uns etwas zur Verfügung stellen?
-
- **Streaming Accounts eurer Uni:**
-  
-  werden möglicherweise auch euch als Studenten zur Verfügung gestellt. Viele Universitäten haben zahlreiche Zoom Lizenzen erworben, oder betreiben BigBlueButton Instanzen. Informiert euch also, ob ihr auf diese Weise an einen Account kommt.
-  
- **Streaming Accounts vom Technik Team:**
-  
-  können wir euch zur Verfügung stellen, wenn ihr keine andere Möglichkeit mehr habt. Zurzeit wäre uns es möglich sowohl Zoom, als auch BigBlueButton Instanzen zu stellen. Wir würden die Anzahl der von uns gestellten Instanzen aber gerne in Grenzen halten. Meldet euch dafür im [PCS-Techsupport](https://fffutu.re/pcs-techsupport) auf Telegram.
-
-## Woher bekomme ich Ortsgruppen Zugang zur Website?
-
-Richtig, jede Ortsgruppe kann sich auf der Website von [Students for Future Germany](studentsforfuture.info) einloggen.
-
-**Wenn ihr keine Zugangsdaten (mehr) habt** meldet euch per Telegram im [PCS-Techsupport](https://fffutu.re/pcs-techsupport)
-
-Wie ihr anschließend eure Kontaktinformationen aktualisiert, eine eigene OG-Homepage erstellt, oder einen Eventkalender anlegt steht [hier](webseite.md).
-
-## Wie kann ich mit Trollen im meinem Online-Event umgehen?
-
-Das wichtigste zuerst: **Don't Feed the Troll!** Negativ auf dein Event einzuwirken ist oft das Ziel von Troll-Angriffen.
-
-Versuche dich deshalb von destruktiven Menschen
-
-  nicht ablenken zu lassen, 
- nicht emotional zu reagieren, 
- und sie nicht in den Fokus zu rücken. 
-
-Verweise als Moderation im Zweifel darauf, nach dem Event weiterzudiskutieren und nicht währenddessen. 
-
-Ansonsten kannst du natürlich technische Hilfsmittel verwenden, wie
-
- einen Zoom-Warteraum
- Menschen kicken/bannen
- die Video/Sprachfunktion für Menschen ausschalten.
-
-Im [Zoom-Leitfaden](zoom.md) findest du dazu einige nützliche Funktionen.
-
-
-
-**Bitte beachte**, dass wir keine Expert*innen im Umgang mit Trollen sind. Wenn ihr ausführliche Informationen sucht, können wir euch folgende Artikel empfehlen:
-
- [Ratgeber: Konstruktiv auf Internet-Trolle reagieren (Klimafakten.de)](https://www.klimafakten.de/meldung/ratgeber-konstruktiv-auf-internet-trolle-reagieren)
-
- [Beware of ‘ZoomBombing’: screensharing filth to video calls (TheCrunch.com)](https://techcrunch.com/2020/03/17/zoombombing/?guccounter=1)
-
-
-
-## Wie kann ich mein Online-Event barrierefrei gestalten?
-
-Beim Stichwort Barrierefreiheit kennen wir Möglichkeiten, um folgendes einzubauen:
-
- **Live-Untertitel** (braucht Menschen die live Mitschreiben, [Tutorial auf zoom.us](https://support.zoom.us/hc/en-us/articles/207279736))
- **Gebärdesprachendolmetscher*in** (braucht Mensch mit diesem Skill)
-
-Wenn ihr mit Zoom arbeitet wäre beides umsetzbar. Sofern das Teil des Livestreams sein soll, würden wir dann eurem Meeting beitreten und die Untertitel oder den\*die Dolmetscher\*in mit OBS mitschneiden.
-
-**Bitte sagt uns [hier auf Telegram](https://fffutu.re/pcs-techsupport) sobald wie möglich Bescheid, falls ihr das plant!**
-
-
-
--- a/websites/help.studentsforfuture.info/fonts/Jost-Italic-VariableFont_wght.ttf
+++ b/websites/help.studentsforfuture.info/fonts/Jost-Italic-VariableFont_wght.ttf
--- a/websites/help.studentsforfuture.info/fonts/Jost-VariableFont_wght.ttf
+++ b/websites/help.studentsforfuture.info/fonts/Jost-VariableFont_wght.ttf
--- a/websites/help.studentsforfuture.info/img/.DS_Store
+++ b/websites/help.studentsforfuture.info/img/.DS_Store
--- a/websites/help.studentsforfuture.info/img/events/attending_io.png
+++ b/websites/help.studentsforfuture.info/img/events/attending_io.png
--- a/websites/help.studentsforfuture.info/img/faq/.DS_Store
+++ b/websites/help.studentsforfuture.info/img/faq/.DS_Store
--- a/websites/help.studentsforfuture.info/img/faq/audiosetup.jpg
+++ b/websites/help.studentsforfuture.info/img/faq/audiosetup.jpg
--- a/websites/help.studentsforfuture.info/img/faq/get_stream.jpg
+++ b/websites/help.studentsforfuture.info/img/faq/get_stream.jpg
--- a/websites/help.studentsforfuture.info/img/faq/get_stream.png
+++ b/websites/help.studentsforfuture.info/img/faq/get_stream.png
--- a/websites/help.studentsforfuture.info/img/faq/pcs_walkthrough_thumbnail.png
+++ b/websites/help.studentsforfuture.info/img/faq/pcs_walkthrough_thumbnail.png
--- a/websites/help.studentsforfuture.info/img/faq/tutorial_thumbnail.png
+++ b/websites/help.studentsforfuture.info/img/faq/tutorial_thumbnail.png
--- a/websites/help.studentsforfuture.info/img/favicon.png
+++ b/websites/help.studentsforfuture.info/img/favicon.png
--- a/websites/help.studentsforfuture.info/img/orga/meistertask.png
+++ b/websites/help.studentsforfuture.info/img/orga/meistertask.png
--- a/websites/help.studentsforfuture.info/img/orga/plattform_n-login.base.png
+++ b/websites/help.studentsforfuture.info/img/orga/plattform_n-login.base.png
--- a/websites/help.studentsforfuture.info/img/orga/plattform_n-login.png
+++ b/websites/help.studentsforfuture.info/img/orga/plattform_n-login.png
--- a/websites/help.studentsforfuture.info/img/orga/plattform_n-registrieren-1.png
+++ b/websites/help.studentsforfuture.info/img/orga/plattform_n-registrieren-1.png
--- a/websites/help.studentsforfuture.info/img/orga/plattform_n-registrieren-2.png
+++ b/websites/help.studentsforfuture.info/img/orga/plattform_n-registrieren-2.png
--- a/websites/help.studentsforfuture.info/img/orga/plattform_n-registrieren-3.png
+++ b/websites/help.studentsforfuture.info/img/orga/plattform_n-registrieren-3.png
--- a/websites/help.studentsforfuture.info/img/orga/plattform_n-registrieren-4.png
+++ b/websites/help.studentsforfuture.info/img/orga/plattform_n-registrieren-4.png
--- a/websites/help.studentsforfuture.info/img/orga/plattform_n-registrieren-5.png
+++ b/websites/help.studentsforfuture.info/img/orga/plattform_n-registrieren-5.png
--- a/websites/help.studentsforfuture.info/img/orga/plattform_n-sff.png
+++ b/websites/help.studentsforfuture.info/img/orga/plattform_n-sff.png
--- a/websites/help.studentsforfuture.info/img/orga/plattform_n-start.png
+++ b/websites/help.studentsforfuture.info/img/orga/plattform_n-start.png
--- a/websites/help.studentsforfuture.info/img/orga/plattform_n-uebersicht.edit.png
+++ b/websites/help.studentsforfuture.info/img/orga/plattform_n-uebersicht.edit.png
--- a/websites/help.studentsforfuture.info/img/orga/plattform_n-uebersicht.png
+++ b/websites/help.studentsforfuture.info/img/orga/plattform_n-uebersicht.png
--- a/websites/help.studentsforfuture.info/img/orga/rocket_chat-app_login.png
+++ b/websites/help.studentsforfuture.info/img/orga/rocket_chat-app_login.png
--- a/websites/help.studentsforfuture.info/img/orga/rocket_chat-download.png
+++ b/websites/help.studentsforfuture.info/img/orga/rocket_chat-download.png
--- a/websites/help.studentsforfuture.info/img/orga/rocket_chat-login.png
+++ b/websites/help.studentsforfuture.info/img/orga/rocket_chat-login.png
--- a/websites/help.studentsforfuture.info/img/orga/rocket_chat-main.png
+++ b/websites/help.studentsforfuture.info/img/orga/rocket_chat-main.png
--- a/websites/help.studentsforfuture.info/img/orga/rocket_chat-pcs.png
+++ b/websites/help.studentsforfuture.info/img/orga/rocket_chat-pcs.png
--- a/websites/help.studentsforfuture.info/img/orga/rocket_chat-pcs_ags.png
+++ b/websites/help.studentsforfuture.info/img/orga/rocket_chat-pcs_ags.png
--- a/websites/help.studentsforfuture.info/img/socialmedia/PCS_SS20_de.svg
+++ b/websites/help.studentsforfuture.info/img/socialmedia/PCS_SS20_de.svg
--- a/websites/help.studentsforfuture.info/img/socialmedia/sharepic-instagram.png
+++ b/websites/help.studentsforfuture.info/img/socialmedia/sharepic-instagram.png
--- a/websites/help.studentsforfuture.info/img/streams/pcs3-graph.svg
+++ b/websites/help.studentsforfuture.info/img/streams/pcs3-graph.svg
@ -1,255 +0,0 @@
-<svg width="730pt" height="1122pt" viewBox="0.00 0.00 730.27 1121.60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1117.6)">
-<title>schema</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1117.6 726.2697,-1117.6 726.2697,4 -4,4"></polygon>
-<g id="clust2" class="cluster">
-<title>cluster_nginx1</title>
-<polygon fill="none" stroke="#000000" stroke-dasharray="1,5" points="12.8601,-623.2 12.8601,-700 508.8601,-700 508.8601,-623.2 12.8601,-623.2"></polygon>
-<text text-anchor="middle" x="64.2118" y="-683.4" font-family="Times,serif" font-size="14.00" fill="#000000">NGINX RTMP</text>
-</g>
-<g id="clust5" class="cluster">
-<title>cluster_nginx2</title>
-<polygon fill="none" stroke="#000000" stroke-dasharray="1,5" points="308.8601,-922.4 308.8601,-999.2 534.8601,-999.2 534.8601,-922.4 308.8601,-922.4"></polygon>
-<text text-anchor="middle" x="483.5084" y="-930.6" font-family="Times,serif" font-size="14.00" fill="#000000">NGINX RTMP</text>
-</g>
-<!-- ffmpeg1 -->
-<g id="node1" class="node">
-<title>ffmpeg1</title>
-<polygon fill="none" stroke="#1c86ee" points="512.1081,-528 435.6121,-528 435.6121,-492 512.1081,-492 512.1081,-528"></polygon>
-<text text-anchor="middle" x="473.8601" y="-505.8" font-family="Times,serif" font-size="14.00" fill="#000000">ffmpeg [1]</text>
-</g>
-<!-- /audio -->
-<g id="node12" class="node">
-<title>/audio</title>
-<polygon fill="none" stroke="#1c86ee" points="500.8601,-667.2 446.8601,-667.2 446.8601,-631.2 500.8601,-631.2 500.8601,-667.2"></polygon>
-<text text-anchor="middle" x="473.8601" y="-645" font-family="Times,serif" font-size="14.00" fill="#000000">/audio</text>
-</g>
-<!-- ffmpeg1&#45;&gt;/audio -->
-<g id="edge11" class="edge">
-<title>ffmpeg1-&gt;/audio</title>
-<path fill="none" stroke="#8b0a50" stroke-dasharray="5,2" d="M473.8601,-528.198C473.8601,-551.7493 473.8601,-593.0421 473.8601,-620.7533"></path>
-<polygon fill="#8b0a50" stroke="#8b0a50" points="470.3602,-620.9975 473.8601,-630.9976 477.3602,-620.9976 470.3602,-620.9975"></polygon>
-<text text-anchor="start" x="473.8601" y="-600.6" font-family="Times,serif" font-size="14.00" fill="#000000">  RTMP (FLV),</text>
-<text text-anchor="start" x="473.8601" y="-583.8" font-family="Times,serif" font-size="14.00" fill="#000000">  7.1, aac,</text>
-<text text-anchor="start" x="473.8601" y="-567" font-family="Times,serif" font-size="14.00" fill="#000000">  Sprache 1 -&gt; 5. Channel (BL)</text>
-<text text-anchor="start" x="473.8601" y="-550.2" font-family="Times,serif" font-size="14.00" fill="#000000">  Sprache 2 -&gt; 7. Channel (SL)</text>
-</g>
-<!-- ffmpeg2 -->
-<g id="node2" class="node">
-<title>ffmpeg2</title>
-<polygon fill="none" stroke="#1c86ee" points="240.1081,-667.2 163.6121,-667.2 163.6121,-631.2 240.1081,-631.2 240.1081,-667.2"></polygon>
-<text text-anchor="middle" x="201.8601" y="-645" font-family="Times,serif" font-size="14.00" fill="#000000">ffmpeg [2]</text>
-</g>
-<!-- /output -->
-<g id="node11" class="node">
-<title>/output</title>
-<polygon fill="none" stroke="#1c86ee" points="375.5329,-667.2 320.1873,-667.2 320.1873,-631.2 375.5329,-631.2 375.5329,-667.2"></polygon>
-<text text-anchor="middle" x="347.8601" y="-645" font-family="Times,serif" font-size="14.00" fill="#000000">/output</text>
-</g>
-<!-- ffmpeg2&#45;&gt;/output -->
-<g id="edge4" class="edge">
-<title>ffmpeg2-&gt;/output</title>
-<path fill="none" stroke="#8b0a50" d="M240.2199,-649.2C261.7112,-649.2 288.4172,-649.2 309.8513,-649.2"></path>
-<polygon fill="#8b0a50" stroke="#8b0a50" points="309.9042,-652.7001 319.9041,-649.2 309.9041,-645.7001 309.9042,-652.7001"></polygon>
-<text text-anchor="middle" x="280.0041" y="-633.6" font-family="Times,serif" font-size="14.00" fill="#000000">7.1 mit</text>
-<text text-anchor="middle" x="280.0041" y="-616.8" font-family="Times,serif" font-size="14.00" fill="#000000">links-&gt;FL</text>
-<text text-anchor="middle" x="280.0041" y="-600" font-family="Times,serif" font-size="14.00" fill="#000000">rechts-&gt;FR</text>
-</g>
-<!-- ffmpeg3 -->
-<g id="node3" class="node">
-<title>ffmpeg3</title>
-<polygon fill="none" stroke="#1c86ee" points="527.1081,-991.2 450.6121,-991.2 450.6121,-955.2 527.1081,-955.2 527.1081,-991.2"></polygon>
-<text text-anchor="middle" x="488.8601" y="-969" font-family="Times,serif" font-size="14.00" fill="#000000">ffmpeg [3]</text>
-</g>
-<!-- YouTube DE Stream -->
-<g id="node15" class="node">
-<title>YouTube DE Stream</title>
-<polygon fill="none" stroke="#000000" points="480.0468,-1113.6 345.6734,-1113.6 345.6734,-1077.6 480.0468,-1077.6 480.0468,-1113.6"></polygon>
-<text text-anchor="middle" x="412.8601" y="-1091.4" font-family="Times,serif" font-size="14.00" fill="#000000">YouTube DE Stream</text>
-</g>
-<!-- ffmpeg3&#45;&gt;YouTube DE Stream -->
-<g id="edge17" class="edge">
-<title>ffmpeg3-&gt;YouTube DE Stream</title>
-<path fill="none" stroke="#00688b" d="M477.646,-991.2605C464.9609,-1011.6904 444.173,-1045.1697 429.5736,-1068.6825"></path>
-<polygon fill="#00688b" stroke="#00688b" points="426.4218,-1067.1235 424.1202,-1077.4654 432.3687,-1070.8161 426.4218,-1067.1235"></polygon>
-<text text-anchor="end" x="434.2104" y="-1037.9009" font-family="Times,serif" font-size="14.00" fill="#000000">Stereo</text>
-<text text-anchor="end" x="434.2104" y="-1021.1009" font-family="Times,serif" font-size="14.00" fill="#000000">mit Originalsound</text>
-</g>
-<!-- YouTube EN Stream -->
-<g id="node16" class="node">
-<title>YouTube EN Stream</title>
-<polygon fill="none" stroke="#000000" points="632.0468,-1113.6 497.6734,-1113.6 497.6734,-1077.6 632.0468,-1077.6 632.0468,-1113.6"></polygon>
-<text text-anchor="middle" x="564.8601" y="-1091.4" font-family="Times,serif" font-size="14.00" fill="#000000">YouTube EN Stream</text>
-</g>
-<!-- ffmpeg3&#45;&gt;YouTube EN Stream -->
-<g id="edge18" class="edge">
-<title>ffmpeg3-&gt;YouTube EN Stream</title>
-<path fill="none" stroke="#00688b" d="M500.0742,-991.2605C512.7593,-1011.6904 533.5472,-1045.1697 548.1466,-1068.6825"></path>
-<polygon fill="#00688b" stroke="#00688b" points="545.3515,-1070.8161 553.6,-1077.4654 551.2984,-1067.1235 545.3515,-1070.8161"></polygon>
-<text text-anchor="start" x="541.8601" y="-1047" font-family="Times,serif" font-size="14.00" fill="#000000">  Stereo</text>
-<text text-anchor="start" x="541.8601" y="-1030.2" font-family="Times,serif" font-size="14.00" fill="#000000">  mit Sprache 1 links und rechts,</text>
-<text text-anchor="start" x="541.8601" y="-1013.4" font-family="Times,serif" font-size="14.00" fill="#000000">  sowie Original leise unterlegt</text>
-</g>
-<!-- Zoom Session -->
-<g id="node4" class="node">
-<title>Zoom Session</title>
-<polygon fill="none" stroke="#000000" points="95.5807,-36 .1395,-36 .1395,0 95.5807,0 95.5807,-36"></polygon>
-<text text-anchor="middle" x="47.8601" y="-13.8" font-family="Times,serif" font-size="14.00" fill="#000000">Zoom Session</text>
-</g>
-<!-- /input -->
-<g id="node10" class="node">
-<title>/input</title>
-<polygon fill="none" stroke="#1c86ee" points="74.8601,-667.2 20.8601,-667.2 20.8601,-631.2 74.8601,-631.2 74.8601,-667.2"></polygon>
-<text text-anchor="middle" x="47.8601" y="-645" font-family="Times,serif" font-size="14.00" fill="#000000">/input</text>
-</g>
-<!-- Zoom Session&#45;&gt;/input -->
-<g id="edge2" class="edge">
-<title>Zoom Session-&gt;/input</title>
-<path fill="none" stroke="#696969" d="M47.8601,-36.0279C47.8601,-53.9689 47.8601,-82.2875 47.8601,-106.8 47.8601,-106.8 47.8601,-106.8 47.8601,-510 47.8601,-548.4023 47.8601,-592.764 47.8601,-620.8903"></path>
-<polygon fill="#696969" stroke="#696969" points="44.3602,-621.1808 47.8601,-631.1808 51.3602,-621.1809 44.3602,-621.1808"></polygon>
-<text text-anchor="start" x="47.8601" y="-304.2" font-family="Times,serif" font-size="14.00" fill="#000000">  RTMP,</text>
-<text text-anchor="start" x="47.8601" y="-287.4" font-family="Times,serif" font-size="14.00" fill="#000000">  Video 720p,</text>
-<text text-anchor="start" x="47.8601" y="-270.6" font-family="Times,serif" font-size="14.00" fill="#000000">  Audio Mono</text>
-</g>
-<!-- Übersetzer*in -->
-<g id="node5" class="node">
-<title>Übersetzer*in</title>
-<ellipse fill="none" stroke="#000000" cx="473.8601" cy="-18" rx="63.701" ry="18"></ellipse>
-<text text-anchor="middle" x="473.8601" y="-13.8" font-family="Times,serif" font-size="14.00" fill="#000000">Übersetzer*in</text>
-</g>
-<!-- Mumble Web (Browser) -->
-<g id="node6" class="node">
-<title>Mumble Web (Browser)</title>
-<polygon fill="none" stroke="#228b22" points="550.475,-124.8 397.2452,-124.8 397.2452,-88.8 550.475,-88.8 550.475,-124.8"></polygon>
-<text text-anchor="middle" x="473.8601" y="-102.6" font-family="Times,serif" font-size="14.00" fill="#000000">Mumble Web (Browser)</text>
-</g>
-<!-- Übersetzer*in&#45;&gt;Mumble Web (Browser) -->
-<g id="edge6" class="edge">
-<title>Übersetzer*in-&gt;Mumble Web (Browser)</title>
-<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M473.8601,-36.3994C473.8601,-48.5051 473.8601,-64.5924 473.8601,-78.3326"></path>
-<polygon fill="#000000" stroke="#000000" points="470.3602,-78.7279 473.8601,-88.728 477.3602,-78.728 470.3602,-78.7279"></polygon>
-<text text-anchor="middle" x="503.6059" y="-58.2" font-family="Times,serif" font-size="14.00" fill="#000000">  spricht in</text>
-</g>
-<!-- mumble&#45;web&#45;proxy -->
-<g id="node7" class="node">
-<title>mumble-web-proxy</title>
-<g id="a_node7"><a xlink:href="https://github.com/Johni0702/mumble-web-proxy" xlink:title="mumble-web-proxy">
-<polygon fill="none" stroke="#228b22" points="537.5496,-213.6 410.1706,-213.6 410.1706,-177.6 537.5496,-177.6 537.5496,-213.6"></polygon>
-<text text-anchor="middle" x="473.8601" y="-191.4" font-family="Times,serif" font-size="14.00" fill="#000000">mumble-web-proxy</text>
-</a>
-</g>
-</g>
-<!-- Mumble Web (Browser)&#45;&gt;mumble&#45;web&#45;proxy -->
-<g id="edge7" class="edge">
-<title>Mumble Web (Browser)-&gt;mumble-web-proxy</title>
-<path fill="none" stroke="#696969" stroke-dasharray="5,2" d="M473.8601,-125.1994C473.8601,-137.3051 473.8601,-153.3924 473.8601,-167.1326"></path>
-<polygon fill="#696969" stroke="#696969" points="470.3602,-167.5279 473.8601,-177.528 477.3602,-167.528 470.3602,-167.5279"></polygon>
-<text text-anchor="middle" x="540.4007" y="-147" font-family="Times,serif" font-size="14.00" fill="#000000">  WebSocket+WebRTC</text>
-</g>
-<!-- Mumble channel -->
-<g id="node8" class="node">
-<title>Mumble channel</title>
-<polygon fill="none" stroke="#228b22" points="529.3359,-309.6 418.3843,-309.6 418.3843,-273.6 529.3359,-273.6 529.3359,-309.6"></polygon>
-<text text-anchor="middle" x="473.8601" y="-287.4" font-family="Times,serif" font-size="14.00" fill="#000000">Mumble channel</text>
-</g>
-<!-- mumble&#45;web&#45;proxy&#45;&gt;Mumble channel -->
-<g id="edge8" class="edge">
-<title>mumble-web-proxy-&gt;Mumble channel</title>
-<path fill="none" stroke="#696969" stroke-dasharray="5,2" d="M473.8601,-213.6569C473.8601,-227.5138 473.8601,-246.9139 473.8601,-262.8925"></path>
-<polygon fill="#696969" stroke="#696969" points="470.3602,-263.2977 473.8601,-273.2977 477.3602,-263.2977 470.3602,-263.2977"></polygon>
-<text text-anchor="middle" x="572.985" y="-235.8" font-family="Times,serif" font-size="14.00" fill="#000000">  Leitet Sprache über UDP weiter</text>
-</g>
-<!-- c3lingo&#45;mumble (Bot) -->
-<g id="node9" class="node">
-<title>c3lingo-mumble (Bot)</title>
-<g id="a_node9"><a xlink:href="https://github.com/c3lingo/c3lingo-mumble" xlink:title="c3lingo-mumble (Bot)">
-<polygon fill="none" stroke="#1c86ee" points="544.4519,-405.6 403.2683,-405.6 403.2683,-369.6 544.4519,-369.6 544.4519,-405.6"></polygon>
-<text text-anchor="middle" x="473.8601" y="-383.4" font-family="Times,serif" font-size="14.00" fill="#000000">c3lingo-mumble (Bot)</text>
-</a>
-</g>
-</g>
-<!-- Mumble channel&#45;&gt;c3lingo&#45;mumble (Bot) -->
-<g id="edge9" class="edge">
-<title>Mumble channel-&gt;c3lingo-mumble (Bot)</title>
-<path fill="none" stroke="#696969" stroke-dasharray="5,2" d="M473.8601,-309.6569C473.8601,-323.5138 473.8601,-342.9139 473.8601,-358.8925"></path>
-<polygon fill="#696969" stroke="#696969" points="470.3602,-359.2977 473.8601,-369.2977 477.3602,-359.2977 470.3602,-359.2977"></polygon>
-<text text-anchor="middle" x="565.4152" y="-339" font-family="Times,serif" font-size="14.00" fill="#000000">  Empfängt Sprache über UDP</text>
-</g>
-<!-- c3lingo&#45;mumble (Bot)&#45;&gt;ffmpeg1 -->
-<g id="edge10" class="edge">
-<title>c3lingo-mumble (Bot)-&gt;ffmpeg1</title>
-<path fill="none" stroke="#696969" stroke-dasharray="5,2" d="M473.8601,-405.6605C473.8601,-425.7288 473.8601,-458.3887 473.8601,-481.8248"></path>
-<polygon fill="#696969" stroke="#696969" points="470.3602,-481.8653 473.8601,-491.8654 477.3602,-481.8654 470.3602,-481.8653"></polygon>
-<text text-anchor="start" x="473.8601" y="-461.4" font-family="Times,serif" font-size="14.00" fill="#000000">  über stdin/stdout</text>
-<text text-anchor="start" x="473.8601" y="-444.6" font-family="Times,serif" font-size="14.00" fill="#000000">  16 bit PCM</text>
-<text text-anchor="start" x="473.8601" y="-427.8" font-family="Times,serif" font-size="14.00" fill="#000000">  48ks/s, Mono</text>
-</g>
-<!-- /input&#45;&gt;ffmpeg2 -->
-<g id="edge3" class="edge">
-<title>/input-&gt;ffmpeg2</title>
-<path fill="none" stroke="#696969" d="M75.0377,-649.2C96.7631,-649.2 127.7618,-649.2 153.6736,-649.2"></path>
-<polygon fill="#696969" stroke="#696969" points="153.69,-652.7001 163.6899,-649.2 153.6899,-645.7001 153.69,-652.7001"></polygon>
-<text text-anchor="middle" x="119.2982" y="-633.6" font-family="Times,serif" font-size="14.00" fill="#000000">Mono/</text>
-<text text-anchor="middle" x="119.2982" y="-616.8" font-family="Times,serif" font-size="14.00" fill="#000000">(ggf. Stereo)</text>
-</g>
-<!-- /input&#45;&gt;Übersetzer*in -->
-<g id="edge5" class="edge">
-<title>/input-&gt;Übersetzer*in</title>
-<path fill="none" stroke="#000000" d="M56.1851,-630.8025C90.062,-557.1615 223.5988,-278.4871 387.8601,-88.8 403.5268,-70.7083 424.143,-53.5635 441.2625,-40.6776"></path>
-<polygon fill="#000000" stroke="#000000" points="443.382,-43.4634 449.3488,-34.7085 439.2247,-37.8316 443.382,-43.4634"></polygon>
-<text text-anchor="middle" x="305.0151" y="-287.4" font-family="Times,serif" font-size="14.00" fill="#000000">Sieht über VLC</text>
-</g>
-<!-- OBS -->
-<g id="node14" class="node">
-<title>OBS</title>
-<polygon fill="none" stroke="#b22222" points="374.8601,-778.8 320.8601,-778.8 320.8601,-742.8 374.8601,-742.8 374.8601,-778.8"></polygon>
-<text text-anchor="middle" x="347.8601" y="-756.6" font-family="Times,serif" font-size="14.00" fill="#000000">OBS</text>
-</g>
-<!-- /input&#45;&gt;OBS -->
-<g id="edge13" class="edge">
-<title>/input-&gt;OBS</title>
-<path fill="none" stroke="#696969" d="M75.1112,-663.4221C96.4651,-674.2505 127.1063,-689.1003 154.8601,-700 208.1026,-720.9098 271.6939,-739.8171 310.9304,-750.8102"></path>
-<polygon fill="#696969" stroke="#696969" points="310.0283,-754.1921 320.6004,-753.4973 311.9025,-747.4477 310.0283,-754.1921"></polygon>
-<text text-anchor="middle" x="265.2325" y="-712.2" font-family="Times,serif" font-size="14.00" fill="#000000">[4], ggf. Stereo</text>
-</g>
-<!-- /output&#45;&gt;/audio -->
-<!-- /output&#45;&gt;OBS -->
-<g id="edge14" class="edge">
-<title>/output-&gt;OBS</title>
-<path fill="none" stroke="#8b0a50" d="M347.8601,-667.6285C347.8601,-685.261 347.8601,-712.1076 347.8601,-732.4609"></path>
-<polygon fill="#8b0a50" stroke="#8b0a50" points="344.3602,-732.7144 347.8601,-742.7144 351.3602,-732.7145 344.3602,-732.7144"></polygon>
-<text text-anchor="middle" x="359.5207" y="-712.2" font-family="Times,serif" font-size="14.00" fill="#000000">  [4]</text>
-</g>
-<!-- /audio&#45;&gt;OBS -->
-<g id="edge12" class="edge">
-<title>/audio-&gt;OBS</title>
-<path fill="none" stroke="#8b0a50" stroke-dasharray="5,2" d="M453.3356,-667.3788C432.2848,-686.0239 399.3909,-715.1585 375.9371,-735.9318"></path>
-<polygon fill="#8b0a50" stroke="#8b0a50" points="373.5411,-733.3785 368.3758,-742.6289 378.1824,-738.6186 373.5411,-733.3785"></polygon>
-</g>
-<!-- /split_in -->
-<g id="node13" class="node">
-<title>/split_in</title>
-<polygon fill="none" stroke="#1c86ee" points="378.7578,-991.2 316.9624,-991.2 316.9624,-955.2 378.7578,-955.2 378.7578,-991.2"></polygon>
-<text text-anchor="middle" x="347.8601" y="-969" font-family="Times,serif" font-size="14.00" fill="#000000">/split_in</text>
-</g>
-<!-- /split_in&#45;&gt;ffmpeg3 -->
-<g id="edge16" class="edge">
-<title>/split_in-&gt;ffmpeg3</title>
-<path fill="none" stroke="#8b0a50" d="M378.9792,-973.2C399.5126,-973.2 420.046,-973.2 440.5793,-973.2"></path>
-<polygon fill="#8b0a50" stroke="#8b0a50" points="440.6594,-976.7001 450.6593,-973.2 440.6593,-969.7001 440.6594,-976.7001"></polygon>
-</g>
-<!-- OBS&#45;&gt;/split_in -->
-<g id="edge15" class="edge">
-<title>OBS-&gt;/split_in</title>
-<path fill="none" stroke="#8b0a50" d="M347.8601,-778.9091C347.8601,-815.9808 347.8601,-900.7482 347.8601,-945.0524"></path>
-<polygon fill="#8b0a50" stroke="#8b0a50" points="344.3602,-945.1367 347.8601,-955.1367 351.3602,-945.1368 344.3602,-945.1367"></polygon>
-<text text-anchor="start" x="347.8601" y="-901.8" font-family="Times,serif" font-size="14.00" fill="#000000">  RTMP,</text>
-<text text-anchor="start" x="347.8601" y="-885" font-family="Times,serif" font-size="14.00" fill="#000000">  Video 1080p30,</text>
-<text text-anchor="start" x="347.8601" y="-868.2" font-family="Times,serif" font-size="14.00" fill="#000000">  Audio mit 7.1, wobei</text>
-<text text-anchor="start" x="347.8601" y="-851.4" font-family="Times,serif" font-size="14.00" fill="#000000">  FL(0)=Original links,</text>
-<text text-anchor="start" x="347.8601" y="-834.6" font-family="Times,serif" font-size="14.00" fill="#000000">  FR(1)=Original rechts</text>
-<text text-anchor="start" x="347.8601" y="-817.8" font-family="Times,serif" font-size="14.00" fill="#000000">  BL(4)=Sprache 1 (mono)</text>
-<text text-anchor="start" x="347.8601" y="-801" font-family="Times,serif" font-size="14.00" fill="#000000">  SL(6)=Sprache 2 (mono)</text>
-</g>
-</g>
-</svg>
--- a/websites/help.studentsforfuture.info/img/streams/pcs3-legend.svg
+++ b/websites/help.studentsforfuture.info/img/streams/pcs3-legend.svg
@ -1,70 +0,0 @@
-<svg width="633pt" height="117pt" viewBox="0.00 0.00 633.15 117.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 113)">
-<title>legend</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-113 629.1487,-113 629.1487,4 -4,4"></polygon>
-<!-- Server Rosenbaum (von Lukas) -->
-<g id="node1" class="node">
-<title>Server Rosenbaum (von Lukas)</title>
-<polygon fill="none" stroke="#1c86ee" points="233.1673,-109 39.8327,-109 39.8327,-73 233.1673,-73 233.1673,-109"></polygon>
-<text text-anchor="middle" x="136.5" y="-86.8" font-family="Times,serif" font-size="14.00" fill="#000000">Server Rosenbaum (von Lukas)</text>
-</g>
-<!-- 2 -->
-<!-- Server Rosenbaum (von Lukas)&#45;&gt;2 -->
-<!-- Server Libocedrus (von Lukas/HACC) -->
-<g id="node2" class="node">
-<title>Server Libocedrus (von Lukas/HACC)</title>
-<polygon fill="none" stroke="#b22222" points="484.3208,-109 250.6792,-109 250.6792,-73 484.3208,-73 484.3208,-109"></polygon>
-<text text-anchor="middle" x="367.5" y="-86.8" font-family="Times,serif" font-size="14.00" fill="#000000">Server Libocedrus (von Lukas/HACC)</text>
-</g>
-<!-- Server von Markus -->
-<g id="node3" class="node">
-<title>Server von Markus</title>
-<polygon fill="none" stroke="#228b22" points="625.2978,-109 501.7022,-109 501.7022,-73 625.2978,-73 625.2978,-109"></polygon>
-<text text-anchor="middle" x="563.5" y="-86.8" font-family="Times,serif" font-size="14.00" fill="#000000">Server von Markus</text>
-</g>
-<!-- 1 -->
-<!-- 1&#45;&gt;2 -->
-<g id="edge2" class="edge">
-<title>1-&gt;2</title>
-<path fill="none" stroke="#000000" d="M23.0356,-18C43.872,-18 88.0917,-18 114.7579,-18"></path>
-<polygon fill="#000000" stroke="#000000" points="114.9923,-21.5001 124.9922,-18 114.9922,-14.5001 114.9923,-21.5001"></polygon>
-<text text-anchor="middle" x="74" y="-25.2" font-family="Times,serif" font-size="14.00" fill="#000000">Video + Audio</text>
-</g>
-<!-- 3 -->
-<!-- 4 -->
-<!-- 3&#45;&gt;4 -->
-<g id="edge3" class="edge">
-<title>3-&gt;4</title>
-<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M189.1267,-18C205.0407,-18 233.9033,-18 253.8578,-18"></path>
-<polygon fill="#000000" stroke="#000000" points="253.8884,-21.5001 263.8884,-18 253.8884,-14.5001 253.8884,-21.5001"></polygon>
-<text text-anchor="middle" x="226.5" y="-25.2" font-family="Times,serif" font-size="14.00" fill="#000000">nur Audio</text>
-</g>
-<!-- 5 -->
-<!-- 6 -->
-<!-- 5&#45;&gt;6 -->
-<g id="edge4" class="edge">
-<title>5-&gt;6</title>
-<path fill="none" stroke="#696969" d="M328.0625,-18C338.86,-18 355.2592,-18 368.5417,-18"></path>
-<polygon fill="#696969" stroke="#696969" points="368.7745,-21.5001 378.7745,-18 368.7744,-14.5001 368.7745,-21.5001"></polygon>
-<text text-anchor="middle" x="353.5" y="-25.2" font-family="Times,serif" font-size="14.00" fill="#000000">Mono</text>
-</g>
-<!-- 7 -->
-<!-- 8 -->
-<!-- 7&#45;&gt;8 -->
-<g id="edge5" class="edge">
-<title>7-&gt;8</title>
-<path fill="none" stroke="#00688b" d="M443.1946,-18C454.6808,-18 472.4861,-18 486.6055,-18"></path>
-<polygon fill="#00688b" stroke="#00688b" points="486.9476,-21.5001 496.9476,-18 486.9476,-14.5001 486.9476,-21.5001"></polygon>
-<text text-anchor="middle" x="470" y="-25.2" font-family="Times,serif" font-size="14.00" fill="#000000">Stereo</text>
-</g>
-<!-- 9 -->
-<!-- 0 -->
-<!-- 9&#45;&gt;0 -->
-<g id="edge6" class="edge">
-<title>9-&gt;0</title>
-<path fill="none" stroke="#8b0a50" d="M561.1565,-18C568.4293,-18 578.0197,-18 586.6661,-18"></path>
-<polygon fill="#8b0a50" stroke="#8b0a50" points="586.8677,-21.5001 596.8677,-18 586.8677,-14.5001 586.8677,-21.5001"></polygon>
-<text text-anchor="middle" x="579" y="-25.2" font-family="Times,serif" font-size="14.00" fill="#000000">7.1</text>
-</g>
-</g>
-</svg>
--- a/websites/help.studentsforfuture.info/img/streams/schema-pcs2.png
+++ b/websites/help.studentsforfuture.info/img/streams/schema-pcs2.png
--- a/websites/help.studentsforfuture.info/img/streams/youtube-stream-1.png
+++ b/websites/help.studentsforfuture.info/img/streams/youtube-stream-1.png
--- a/websites/help.studentsforfuture.info/img/streams/youtube-stream-10.png
+++ b/websites/help.studentsforfuture.info/img/streams/youtube-stream-10.png
--- a/websites/help.studentsforfuture.info/img/streams/youtube-stream-11.png
+++ b/websites/help.studentsforfuture.info/img/streams/youtube-stream-11.png
--- a/websites/help.studentsforfuture.info/img/streams/youtube-stream-2.png
+++ b/websites/help.studentsforfuture.info/img/streams/youtube-stream-2.png
--- a/websites/help.studentsforfuture.info/img/streams/youtube-stream-3.png
+++ b/websites/help.studentsforfuture.info/img/streams/youtube-stream-3.png
--- a/websites/help.studentsforfuture.info/img/streams/youtube-stream-4.png
+++ b/websites/help.studentsforfuture.info/img/streams/youtube-stream-4.png
--- a/websites/help.studentsforfuture.info/img/streams/youtube-stream-5.png
+++ b/websites/help.studentsforfuture.info/img/streams/youtube-stream-5.png
--- a/websites/help.studentsforfuture.info/img/streams/youtube-stream-6.png
+++ b/websites/help.studentsforfuture.info/img/streams/youtube-stream-6.png
--- a/websites/help.studentsforfuture.info/img/streams/youtube-stream-7.png
+++ b/websites/help.studentsforfuture.info/img/streams/youtube-stream-7.png
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
schweby	3b5b213fde	enable ssh for stream user	2021-12-25 18:56:50 +01:00
schweby	a196a482cd	cleanup default apps	2021-12-25 18:56:29 +01:00
schweby	c954df75a5	nixda: disable companion	2021-12-19 17:21:43 +01:00