Merge branch 'update_21.5' into 'main'

Draft: update to 21.05

See merge request hacc/infra/haccfiles!71

hosts/hainich/configuration.nix

@@ -9,10 +9,7 @@
     ./services/mail.nix
     ./services/hedgedoc_hacc.nix
     ./services/hedgedoc_i4f.nix
-    ../../common
-#   ./wireguard.nix
     ./services/nginx.nix
-#   ./k8s.nix
     ./services/ghost_waszumfff.nix
     ./services/ghost_A20.nix
     ./services/gitlab-runner.nix

hosts/hainich/services/mail.nix

@@ -4,7 +4,7 @@ let
     sources = import ../../../nix/sources.nix;
 in {
   imports = [
-      sources.nixos-mailserver.outPath
+      sources.nixos-mailserver.outPath.outPath
   ];
 
   mailserver = {
@@ -152,4 +152,9 @@ in {
     forceSSL = true;
     locations."/".proxyPass = "http://[::1]:1323";
   };
+
+  users.users."virtualMail" = {
+      isNormalUser = lib.mkForce false;
+      isSystemUser = lib.mkForce true;
+  };
 }

modules/nftnat/default.nix

@@ -36,8 +36,8 @@ in {
     boot = {
       kernelModules = [ "nf_nat_ftp" ];
       kernel.sysctl = {
-        "net.ipv4.conf.all.forwarding" = mkOverride 98 true;
-        "net.ipv4.conf.default.forwarding" = mkOverride 98 true;
+        "net.ipv4.conf.all.forwarding" = mkOverride 90 true;
+        "net.ipv4.conf.default.forwarding" = mkOverride 90 true;
       };
     };
 

nix/sources.json

@@ -6,27 +6,27 @@
         "type": "git"
     },
     "home-manager": {
-        "branch": "release-20.09",
+        "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": "49706878e1580d796cc99b63574310405935113f",
-        "sha256": "07f903ij0czyhly8kvwjazvz3s6kflxzh5fs6j8781lkxsy47i9f",
+        "rev": "148d85ee8303444fb0116943787aa0b1b25f94df",
+        "sha256": "1qdq9cm10lq7ypj26qk4l8mwpmz24j7yn5diy6xi4bijnk0hh07n",
         "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/49706878e1580d796cc99b63574310405935113f.tar.gz",
+        "url": "https://github.com/nix-community/home-manager/archive/148d85ee8303444fb0116943787aa0b1b25f94df.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "mattermost-server": {
-        "branch": "release-5.31",
+        "branch": "master",
         "description": "Open source Slack-alternative in Golang and React - Mattermost",
         "homepage": "https://mattermost.com",
         "owner": "mattermost",
         "repo": "mattermost-server",
-        "rev": "585f34fa8c2ea3f3e882db924a29d8dc3924bc5f",
-        "sha256": "06s1i3r2ivxvpnf613w6jq6wqgsx9prw1h5qmvbphh99slmcby72",
+        "rev": "c898c3007fd65d7613b779e583743d64c21131f7",
+        "sha256": "03zf7wm1qn6q4fpwd1kbpqfargfhza58z5d8wvlci0ybagiisncw",
         "type": "tarball",
-        "url": "https://github.com/mattermost/mattermost-server/archive/585f34fa8c2ea3f3e882db924a29d8dc3924bc5f.tar.gz",
+        "url": "https://github.com/mattermost/mattermost-server/archive/c898c3007fd65d7613b779e583743d64c21131f7.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
         "version": "5.34.3"
     },
@@ -62,24 +62,21 @@
         "type": "git"
     },
     "nixos-mailserver": {
-        "ref": "nixos-20.09",
+        "ref": "nixos-21.05",
         "repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver",
-        "rev": "fb1cc04c0a517d4200237b02c3472bcaf9104afb",
-        "sha256": "0vsvgxxg5cgmzwj98171j7h5l028f1yq784alb3lxgbk8znfk51y",
-        "type": "tarball",
-        "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/fb1cc04c0a517d4200237b02c3472bcaf9104afb/nixos-mailserver-fb1cc04c0a517d4200237b02c3472bcaf9104afb.tar.gz",
-        "url_template": "<repo>/-/archive/<rev>.tar.gz"
+        "rev": "5675b122a947b40e551438df6a623efad19fd2e7",
+        "type": "git"
     },
     "nixpkgs": {
-        "branch": "nixos-20.09",
+        "branch": "nixos-21.05",
         "description": "Nix Packages collection",
         "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "85ed11208f8c7c981071cc6e33a5fc60c396c38f",
-        "sha256": "0kq0rg6yyfr2pdyn0dmsmls0mdf3v5x0msjisj9v9pmb6k6jr39j",
+        "rev": "60cce7e5e1fdf62421ef6d4184ee399b46209366",
+        "sha256": "100xrb925cana1kfd0c7gwkjjalq891vfgr0rn1gl9j8gp3l3gx6",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/85ed11208f8c7c981071cc6e33a5fc60c396c38f.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/60cce7e5e1fdf62421ef6d4184ee399b46209366.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-unstable": {

pkgs/default.nix

@@ -10,13 +10,13 @@ let
   newpkgs = {
     alps = callPackage ./alps {};
 
-    docker = (pkgs.callPackage (pkgs.path + "/pkgs/applications/virtualization/docker") {
+    docker = (pkgs.docker.override {
       iptables = pkgs.writeScriptBin "iptables" ''
         #!${pkgs.runtimeShell}
         echo docker tried to run the following iptables command: $@
         exit 0
       '';
-    }).docker_19_03.overrideAttrs (super: {
+    }).overrideAttrs (super: {
       extraPath = super.extraPath + ":${pkgs.zfs}/bin";
     });