mail: force explicit TLS on SMTP too

also switch away from legacy ports

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 AAAAC3NzaC1lZDI1NTE5AAAAIKqj9RRfthjBl4+y4YH7aWetx5qs2KOE2B0oOw3pjRrQ schweby 2022-05-22"
       ];
       hashedPassword = "$6$zkAsaVdmIduqZxez$GY9aBlYeP41F0it/VbbZzLLLRQhHAbDdFsa3e/1GS9McTuSimMHODg6HqNVEH1zSqD3afhK/0UHfqbtF5qpi90";
     };

hosts/parsons/configuration.nix

@@ -16,8 +16,9 @@
     ../../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

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;

nix/sources.json

@@ -23,19 +23,19 @@
         "homepage": "https://mattermost.com",
         "owner": "mattermost",
         "repo": "mattermost-server",
-        "rev": "2ea14ef395fad8919b2f4137642a7f50b370ffba",
+        "rev": "71cdd9e486399f20039eaf147cb12dbcbff002a6",
-        "sha256": "1k5zqnc4yqnad2cw1wpqk22mjra08jz9gf4v692kbrgx3x4d13kh",
+        "sha256": "1hgcclf7g18kma9vfbiwgxzpzw26qmckmi0g5wympqc9dbc3y25v",
         "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.7.0.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/refs/tags/v<version>.tar.gz",
-        "version": "6.7.2"
+        "version": "6.7.0"
     },
     "mattermost-webapp": {
-        "sha256": "0pwjfklk0q28yza2iny0im5pq3x430jskvq6rvfq7ycx251s98hx",
+        "sha256": "15lj6xid2fizcp046h1kv3mls0p166zk04n3jw2zddm1kymndplp",
         "type": "tarball",
-        "url": "https://releases.mattermost.com/6.7.2/mattermost-6.7.2-linux-amd64.tar.gz",
+        "url": "https://releases.mattermost.com/6.7.0/mattermost-6.7.0-linux-amd64.tar.gz",
         "url_template": "https://releases.mattermost.com/<version>/mattermost-<version>-linux-amd64.tar.gz",
-        "version": "6.7.2"
+        "version": "6.7.0"
     },
     "niv": {
         "branch": "master",
@@ -75,10 +75,10 @@
         "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d",
+        "rev": "4dbec24ea806d348dd8f8e8e80051bbda708726a",
-        "sha256": "04ffwp2gzq0hhz7siskw6qh9ys8ragp7285vi1zh8xjksxn1msc5",
+        "sha256": "0jjg6cr6jg16fy368p49vpq4al86084jhls135jqqvnf778q43cf",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/eabc38219184cc3e04a974fe31857d8e0eac098d.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/4dbec24ea806d348dd8f8e8e80051bbda708726a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-unstable": {
@@ -87,10 +87,10 @@
         "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90",
+        "rev": "e0169d7a9d324afebf5679551407756c77af8930",
-        "sha256": "0dq22dagzk76x2ws4dz88w018i6byamd6rnzqizx68bzimg6g7xn",
+        "sha256": "1nr7ih856ca2vl0blim4bz2yxz6cg7jfsx4z096hg0qa5i04zg95",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/e0169d7a9d324afebf5679551407756c77af8930.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "workadventure": {

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
+      builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };
-        ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
 
   fetch_local = spec: spec.path;
 

pkgs/uffd/default.nix

@@ -5,11 +5,12 @@ python3Packages.buildPythonPackage rec {
   version = "2.0.1";
 
   src = fetchzip {
-    url = "https://git.cccv.de/uffd/uffd/-/archive/v${version}/uffd-v${version}.tar.gz";
+    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 ];
+  patches = [ ./fix-setuppy.patch ./fix-userinfo.patch ];
 
   propagatedBuildInputs = with python3Packages; [
     flask

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
-

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";
-  }];
-}

services/gitlab-runner.nix

@@ -0,0 +1,64 @@
+{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;
+    group = "nogroup";
+  };
+
+  virtualisation.docker.storageDriver = "zfs";
+}

services/gitlab.nix

@@ -0,0 +1,165 @@
+{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 = 465;
+          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 = "oauth2_generic";
+            allow_single_sign_on = ["oauth2_generic"];
+            block_auto_created_users = false;
+            providers = [
+              {
+                name = "oauth2_generic";
+                label = "infra4future Login";
+                app_id = "gitlab";
+                app_secret = { _secret = "/persist/secrets/oidc-clientsecret"; };
+                args = {
+                  client_options = {
+                    site = "https://login.infra4future.de";
+                    user_info_url = "/oauth2/userinfo";
+                    authorize_url = "/oauth2/authorize";
+                    token_url = "/oauth2/token";
+                  };
+                  strategy_class ="OmniAuth::Strategies::OAuth2Generic";
+                };
+              }
+            ];
+          };
+        };
+      };
+
+      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;
+  };
+}

services/lantifa.nix

@@ -40,7 +40,7 @@
         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 +77,8 @@
             sha256 = "1k0z44jfqsxzwy6jjz3yfibiq8wi845d5iwwh8j3yijn2854fj0i";
           };
           intersection = pkgs.fetchzip {  # This is the DynamicPageList extension
-            url = "https://extdist.wmflabs.org/dist/extensions/intersection-REL1_36-82eb087.tar.gz";
+            url = "https://extdist.wmflabs.org/dist/extensions/intersection-REL1_36-4a70dbd.tar.gz";
-            sha256 = "sha256-TD58DvJ4CFASP4rIc94jeB4SN4zktLe33xZtz/Qg2dk=";
+            sha256 = "0s70fqkf5ylpsxy1h3hljic8708j6099mz12b6k03hgwc582yywi";
           };
           PageForms = pkgs.fetchzip {
             url = "https://github.com/wikimedia/mediawiki-extensions-PageForms/archive/5.0.1.zip";

services/mail.nix

@@ -42,7 +42,7 @@
       "raphael@hacc.space".hashedPassword =
         "$6$QveHpwMcp9mkFVAU$EFuahOrJIxPg.c.WGFHtrP3.onwJYwvP7fiBHHGb9jhosewZ2tEUP.2D3uyDLhd9Cfny6Yp4jDk/Hkjk7/ME1/";
 
-      "moira@hacc.space".hashedPassword =
+      "schweby@hacc.space".hashedPassword =
         "$6$BpYhwcZNrkLhVqK$6FMqA/vUkdV4GBlHLSqS5DRCb/CaLDNeIsBcZ8G30heytS/tJj2Ag7b1ovSltTA4PUfhee3pJrz1BkwkA93vN1";
 
       "zauberberg@hacc.space".hashedPassword =
@@ -62,12 +62,7 @@
       "noreply@hacc.space" = {
         hashedPassword =
           "$6$YsqMoItITZUzI5wo$5Lejf8XBHRx4LW4VuZ9wJCiBbT4kOV/EZaCdWQ07eVIrkRTZwXWZ5zfsh.olXEFwvpNWN.DBnU.dQc.cC0/ra/";
-        sendOnly = true;
+        aliases = [ "noreply@*" ];
-      };
-
-      "noreply@infra4future.de" = {
-        hashedPassword =
-          "$6$uaD8bRcT1$gFqhFyu5RUsyUUOG5b.kN.JAJ1rVHvaYhpeRHoMvrERAMgBu1FHu2oDnjTsy.5NKoLc5xpI5uv4Gpy4YbmDmV.";
         sendOnly = true;
       };
     };
@@ -81,7 +76,7 @@
         "hexchen@hacc.space"
         "octycs@hacc.space"
         "raphael@hacc.space"
-        "moira@hacc.space"
+        "schweby@hacc.space"
         "zauberberg@hacc.space"
         "stuebinm@hacc.space"
         "lenny@hacc.space"
@@ -89,12 +84,12 @@
 
       # 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" ];
+        [ "hexchen@hacc.space" "schweby@hacc.space" "zauberberg@hacc.space" ];
 
       # voc: hacc video operation center, various streaming-related things
       "voc@hacc.space" = [
         "hexchen@hacc.space"
-        "moira@hacc.space"
+        "schweby@hacc.space"
         "octycs@hacc.space"
         "stuebinm@hacc.space"
         "zauberberg@hacc.space"
@@ -105,13 +100,13 @@
       # -- Regional: Germany --
       # board of hacc e.V.
       "vorstand@hacc.space" =
-        [ "raphael@hacc.space" "moira@hacc.space" "zauberberg@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"
-        "moira@hacc.space"
+        "schweby@hacc.space"
         "zauberberg@hacc.space"
         "lenny@hacc.space"
         "octycs@hacc.space"
@@ -123,7 +118,7 @@
         "hexchen@hacc.space"
         "octycs@hacc.space"
         "raphael@hacc.space"
-        "moira@hacc.space"
+        "schweby@hacc.space"
         "zauberberg@hacc.space"
         "stuebinm@hacc.space"
         "lenny@hacc.space"
@@ -137,6 +132,7 @@
     # Only allow implict TLS
     enableImap = false;
     enablePop3 = false;
+    enableSubmission = false;
 
     # Enable the ManageSieve protocol
     enableManageSieve = true;
@@ -149,15 +145,14 @@
     lib.mkForce "reject_non_fqdn_sender,reject_unknown_sender_domain,permit";
 
   services.postfix.virtual = ''
-    postmaster@hacc.space admin@hacc.space
+    postmaster@* admin@hacc.space
-    abuse@hacc.space admin@hacc.space
+    absue@* admin@hacc.space
-    contact@hacc.space info@hacc.space
+    contact@* 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
+    haccvoc@* voc@hacc.space
   '';
 
   systemd.services.alps = {

services/syncthing.nix

@@ -7,6 +7,10 @@
     configDir = "/persist/var/lib/syncthing/";
     dataDir = "/persist/data/syncthing/";
     devices = {
+      schweby = {
+        addresses = []; # empty = dynamic
+        id = "YF7DNNS-B63GERK-YFQ7G7Q-2DG7557-VIWFOTK-R3JOS63-T76POBQ-F6MO6AH";
+      };
       raphael-laptop = {
         addresses = []; # empty = dynamic
         id = "72B3T74-NOMJV3X-EVJXTJF-5GGAEZB-ZDKBHXQ-VQNRYEU-YCPA2JP-L6NGAAG";
@@ -21,7 +25,7 @@
     folders = {
       "/persist/data/syncthing/hacc/" = {
         id = "qt2ly-xvvvs";
-        devices = [ "conway" "raphael-laptop"];
+        devices = [ "schweby" "conway" "raphael-laptop"];
         type = "receiveonly";
         versioning = {
           type = "simple";
@@ -30,7 +34,7 @@
       };
       "/persist/data/syncthing/hacc_eV_vorstand/" = {
         id = "twwt7-fxrsr";
-        devices = [ "conway" "raphael-laptop"];
+        devices = [ "schweby" "conway" "raphael-laptop"];
 #        type = "receiveencrypted"; # no yet implemented
       };
     };

services/vaultwarden.nix

@@ -23,7 +23,7 @@
       SMTP_HOST="mail.hacc.space";
       SMTP_FROM="vaultwarden@hacc.space";
       SMTP_FROM_NAME="haccwarden";
-      SMTP_PORT=587;
+      SMTP_PORT=465;
       SMTP_USERNAME="noreply@infra4future.de";
 
     };

websites/hacc.earth/index.html

@@ -349,7 +349,7 @@
                     <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.
+                        Propose changes to the hacc e.V. infrastructure. You can open an issue on our <a href="https://gitlab.infra4future.de/hacc/infra/meta">meta discussion repository</a> or (if you are familiar with Nix) open a merge request <a href="https://gitlab.infra4future.de/hacc/infra/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>
@@ -438,7 +438,7 @@ Unfortunately conflicts led to a split between the local chapter Munich and CHT
                 <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.
+Also the source of the page can be found <a href="https://gitlab.infra4future.de/hacc/infra4future/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>.
@@ -451,7 +451,7 @@ The hacc logo was designed by <a href="https://creativesforfuture.de/">Creatives
         </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="https://gitlab.infra4future.de/hacc/infra4future/hacc.earth">Source of hacc.earth</a> &bull;
                 <a href="#contact">Contact</a> &bull;
                 <a href="https://infra4future.de/impressum.html">Imprint</a>
             </div>

websites/hacc.earth/index_de.html

@@ -317,7 +317,8 @@
                     <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.
+                        Wenn du Vorschläge für Änderungen an unserer Infrastruktur hast, leg bitte einen Issue <a href="https://gitlab.infra4future.de/hacc/infra/meta">in unserem Meta-Diskussions-Repo</a> an,
+                        oder (falls du Nix kennst) erstelle einen Merge Request <a href="https://gitlab.infra4future.de/hacc/infra/haccfiles">auf die nixfiles</a>, über die wir einen (größer werdenden) Teil unserer Server verwalten.
                     </li>
                 </ul>
                 

websites/infra4future.de/index.md

@@ -23,47 +23,34 @@ Die Nutzung ist für alle offen! Einfach bei dem Login-Screen auf Registrieren k
 {% include a-name.html name="services" %}
 # Dienste
 
-Sobald ihr einen Account für infra4future habt, könnt ihr euch mit diesem zu allen diesen Diensten einloggen ohne euch für jeden nochmal extra registrieren zu müssen. Eine vollständige Liste an für euch nutzbaren Diensten findet ihr unter [login.infra4future.de](https://login.infra4future.de). Dort könnt ihr außerdem euren Account verwalten und z.B. das Passwort, Mailadresse, oder Anzeigenamen ändern.
+Bisher haben wir auf diesem Server schon einige Dienste installiert, darunter:
-
-Aktuell betreiben wir:
 
  - [Nextcloud](https://cloud.infra4future.de), mit dem ihr Dateien mit eurer Gruppe oder allen Teilen könnt, sowie einige Erweiterungen:
    - *Deck* und *Tasks* zum Verwalten (und Überblick-Behalten) über all die Projekte, die mensch so startet
    - ein Kalender
-   - Onlyoffice — erlaubt euch, übliche Office-Dokumente direkt online zu bearbeiten
+   - Collabora — erlaubt euch, übliche Office-Dokumente direkt online zu bearbeiten
+   - ein Kochbuch, denn Essen ist wichtig für den Widerstand! 🍲
  - [Mattermost](https://mattermost.infra4future.de), eine Plattform zur Echtzeitkommunikation, ähnlich zu Slack.
- - [Mumble](https://mumble.hacc.space), für Audiokonferenzen.
+ - [Discourse](https://discuss.infra4future.de), ein Forum für asynchrone Kommunikation
- - [Hedgedoc](https://pad.infra4future.de), für schnelle, kollaborative Notizen.
+ - [Mumble](https://mumble.hacc.space), für Telefonkonferenzen.
- - [Gitea](https://git.infra4future.de), eine Hostingplattform für git-Repositories, zum gemeinschaftlichen auf-Software-einhacken.
+ - [LimeSurvey](https://survey.infra4future.de), ein Tool zum Erstellen und Durchführen von Umfragen
+ - [GitLab](https://gitlab.infra4future.de) und [GitLab Pages](https://gitlab.infra4future.de/help/user/project/pages/index.md), eine Hostingplattform für git-Repositories, zum gemeinschaftlichen auf-Software-einhacken (und Webseiten hosten).
+ - [hacc.media](https://hacc.media), unsere Videoplattform für Vorträge und ähnliches mit Klimabezug (schreibt uns eine Mail, falls ihr eure Aufnahmen dort auch sehen wollt)
+
+Sobald ihr einen Account für infra4future habt, könnt ihr euch mit diesem zu allen diesen Diensten einloggen ohne euch für jeden nochmal extra registrieren zu müssen.
 
 Falls das eure Bedürfnisse noch nicht abdeckt oder ihr andere coole Software haben die ihr gerne benutzen würdet, meldet euch bei uns — wir können nichts versprechen, aber wenn möglich fügen wir gerne auch noch weitere Dienste dazu.
 
+{% include banner.html quote="It is our predicament that we live in a finite world, and yet we behave as if it were infinite." author="Naomi Klein" %}
 
 
+
+{% include a-name.html name="faq" %}
 # Frequently Asked Questions
 
 
-{% include faq.html question="Wo kann ich meinen Account bearbeiten?"
+{% include faq.html question="Wo kann ich meinen Account bearbeiten?" answer="Deine persönlichen Details kannst du global auf https://auth.infra4future.de/auth/realms/forfuture/account" %}
-  answer="Dein Passwort, deine Mailadresse und deinen Anzeigenamen kannst du
+{% include faq.html question="Ich suche einen Dienst für Videotelefonie" answer="Wir haben unseren Jitsi Dienst aufgrund des hohen Wartungsaufwands eingestellt. Wir können aber [meet.ffmuc.net](https://meet.ffmuc.net/) oder [senfcall.de](https://www.senfcall.de/) empfehlen!" %}
-  auf [login.infra4future.de](https://login.infra4future.de) bearbeiten." %}
+
-{% include faq.html question="Wie füge ich Menschen zu meiner Gruppe hinzu?"
-  answer="Da alle Accounts zentral über 
-  [login.infra4future.de](https://login.infra4future.de) verwaltet werden,
-  werden auch die Zugehörigkeiten zu einzelnen Gruppen dort verwaltet.
-  
-  Natürlich gibt es auch Gruppen bzw. Teams in Mattermost und Nextcloud; diese
-  werden möglichst automatisch auf einem Stand mit login.infra4future.de gehalten.
-  Leider gilt das nicht anders herum — fügt also bitte neue Leute nicht direkt
-  in Mattermost zu eurem Team hinzu, sondern auf login.infra4future.de oder schickt
-  ihnen einen Einladungslink. Andernfalls kann es sein, dass sie automatisch
-  wieder entfernt werden.
-  " %}
-{% include faq.html question="Wie erstelle ich Einladungslinks für meine Gruppe?"
-  answer="Wenn du Teil der Moderation deines Teams bist, kannst du Einladungslinks
-  unter [login.infra4future.de/invite](https://login.infra4future.de/invite) 
-  erstellen. Diese können sowohl benutzt werden, um neue Accounts zu erstellen,
-  als auch, um mit einem bereits existierenden Account einer weiteren Gruppe 
-  beizutreten.
-  " %}
 
 

websites/infra4future.de/nutzungsbedingungen.md

@@ -16,7 +16,7 @@ title: Infra4future
  
 1. Geltungsbereich der Nutzungsbedingungen
 
-	(1)	Diese Nutzungsbedingungen gelten für das Online-Angebot Infra4future, das im Internet unter cloud.infra4future.de, talk.infra4future.de, mattermost.infra4future.de, login.infra4future.de, git.infra4future.de, 4future.dev und discuss.infra4future.de abrufbar ist. Hierbei handelt es sich um eine Plattform, auf der Nutzer Profile anlegen können.
+	(1)	Diese Nutzungsbedingungen gelten für das Online-Angebot Infra4future, das im Internet unter cloud.infra4future.de, talk.infra4future.de, mattermost.infra4future.de, auth.infra4future.de, social.infra4future.de, gitlab.infra4future.de, survey.infra4future.de, live.infra4future.de, 4future.dev und discuss.infra4future.de abrufbar ist. Hierbei handelt es sich um eine Plattform, auf der Nutzer Profile anlegen können.
 
 	(2)	Sie können die derzeit gültigen Nutzungsbedingungen unter infra4future.de/nutzungsbedingungen.html abrufen und ausdrucken.
 

websites/muc.hacc.earth/index.html

@@ -300,11 +300,14 @@ Of course we also did and do support multiple events and groups in Munich and Ge
                 <ul>
                     <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>Regular matinanence of the <a href="https://muc.hacc.earth">hacc e.V.</a> infrastrucutre, usually the Wednesday after the regular meeting sometime in the evening. Normally coordinated on <a href="https://mumble.hacc.space/">mumble.hacc.space</a>.</li>
-                    <li>Help us running the hacc e.V. infrastructure like <a href="https://infra4future.de">infra4future.de</a>. You can open an issue or create 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>Help us running the hacc e.V. infrastructure like <a href="https://infra4future.de">infra4future.de</a>. You can open an issue on our <a href="https://gitlab.infra4future.de/hacc/infra/meta">meta discussion repository</a> or (if you are familiar with Nix) open a merge request <a href="https://gitlab.infra4future.de/hacc/infra/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>
 Interested in streaming and recording? Get in <a href="#contact">contact with hacc-voc</a>
 </li>
+                    <li>
+                        <a href="https://hacc.4future.dev/infra4future/blog-zola">The hacc blog</a> can always use input. It's based on <a href="https://getzola.org">zola</a>. The source of our blog is <a href="https://gitlab.infra4future.de/hacc/infra4future/blog-zola">here</a>.
+                    </li>
 <li>
 Use the <a href="https://hacc.wiki">wiki</a> and add your project!
 </li>
@@ -399,12 +402,12 @@ registered at the local court Munich VR 208921
                         <ul>
                             <li>raphael or rw</li>
                             <li>zauberberg</li>
-                            <li>moira</li>
+                            <li>schweby</li>
-			</ul>
+                        </ul
                     </li>
-                    <li><a href="https://git.infra4future.de/hacc/satzung">Satzung</a> (statutes)</li>
+                    <li><a href="https://gitlab.infra4future.de/hacc/verein/satzung">Satzung</a> (statutes)</li>
-                    <li><a href="https://git.infra4future.de/hacc/mitgliedsantrag">Mitgliedsantrag</a> (membership application)</li>
+                    <li><a href="https://gitlab.infra4future.de/hacc/verein/mitgliedsantrag">Mitgliedsantrag</a> (membership application)</li>
-                    <li><a href="https://git.infra4future.de/hacc/zuwendungen">Vereinfachter Spendennachweis</a> (simplified proof of donation)</li>
+                    <li><a href="https://gitlab.infra4future.de/hacc/verein/zuwendungen">Vereinfachter Spendennachweis</a> (simplified proof of donation)</li>
                </ul>
 </p>
 <p>
@@ -427,7 +430,7 @@ Germany<br>
             <div class="section">
                 <h1>About this page<span class="blink"></span></h1>
                 <p>
-The source of the page can be found <a href="https://git.infra4future.de/hacc/haccfiles/src/branch/main/websites/muc.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.
+The source of the page can be found <a href="https://gitlab.infra4future.de/hacc/infra4future/muc.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>.
@@ -440,7 +443,7 @@ The hacc logo was designed by <a href="https://creativesforfuture.de/">Creatives
         </main>
         <footer class="content" style="z-index: 200">
             <div>
-                <a href="https://git.infra4future.de/hacc/haccfiles/src/branch/main/websites/muc.hacc.earth">Source of muc.hacc.earth</a> &bull;
+                <a href="https://gitlab.infra4future.de/hacc/infra4future/muc.hacc.earth">Source of muc.hacc.earth</a> &bull;
                 <a href="#contact">Contact</a> &bull;
                 <a href="https://infra4future.de/impressum.html">Imprint</a>
             </div>