Merge branch 'master' into 20.09

3 files changed, 0 insertions, 101 deletions

diff --git a/lass/1systems/littleT/config.nix b/lass/1systems/littleT/config.nix
index d44e62053..eee23ee60 100644
--- a/lass/1systems/littleT/config.nix
+++ b/lass/1systems/littleT/config.nix
@@ -8,7 +8,6 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/retiolum.nix>
     <stockholm/lass/2configs/blue-host.nix>
     <stockholm/lass/2configs/syncthing.nix>
-    <stockholm/lass/2configs/green-host.nix>
   ];
 
   networking.networkmanager.enable = true;
diff --git a/lass/1systems/skynet/config.nix b/lass/1systems/skynet/config.nix
index 1bc440a98..507ccd14d 100644
--- a/lass/1systems/skynet/config.nix
+++ b/lass/1systems/skynet/config.nix
@@ -8,7 +8,6 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/blue-host.nix>
     <stockholm/lass/2configs/power-action.nix>
     <stockholm/lass/2configs/syncthing.nix>
-    <stockholm/lass/2configs/green-host.nix>
     {
       services.xserver.enable = true;
       services.xserver.desktopManager.xfce.enable = true;
diff --git a/lass/2configs/green-host.nix b/lass/2configs/green-host.nix
deleted file mode 100644
index 6cccab4b3..000000000
--- a/lass/2configs/green-host.nix
+++ /dev/null
@@ -1,99 +0,0 @@
-{ config, lib, pkgs, ... }:
-with import <stockholm/lib>;
-
-let
-
-  cname = "green";
-  cryfs = pkgs.cryfs.overrideAttrs (old: {
-    patches = [
-      (pkgs.writeText "file_mode.patch" ''
-        --- a/src/cryfs/filesystem/CryNode.cpp
-        +++ b/src/cryfs/filesystem/CryNode.cpp
-        @@ -171,7 +171,7 @@ CryNode::stat_info CryNode::stat() const {
-             result.uid = fspp::uid_t(getuid());
-             result.gid = fspp::gid_t(getgid());
-         #endif
-        -    result.mode = fspp::mode_t().addDirFlag().addUserReadFlag().addUserWriteFlag().addUserExecFlag();
-        +    result.mode = fspp::mode_t().addDirFlag().addUserReadFlag().addUserWriteFlag().addUserExecFlag().addGroupReadFlag().addGroupExecFlag().addOtherReadFlag().addOtherExecFlag();;
-             result.size = fsblobstore::DirBlob::DIR_LSTAT_SIZE;
-             //TODO If possible without performance loss, then for a directory, st_nlink should return number of dir entries (including "." and "..")
-             result.nlink = 1;
-      '')
-    ] ++ old.patches;
-  });
-
-in {
-  imports = [
-    <stockholm/lass/2configs/container-networking.nix>
-    <stockholm/lass/2configs/syncthing.nix>
-  ];
-
-  programs.fuse.userAllowOther = true;
-
-  services.syncthing.declarative.folders."/var/lib/sync-containers/${cname}".devices = [ "icarus" "skynet" "littleT" "shodan" ];
-  # krebs.permown."/var/lib/sync-containers/${cname}" = {
-  #   owner = "root";
-  #   group = "syncthing";
-  #   umask = "0007";
-  # };
-
-  systemd.services."container@green".reloadIfChanged = mkForce false;
-  containers.${cname} = {
-    config = { ... }: {
-      environment.systemPackages = [
-        pkgs.git
-        pkgs.rxvt_unicode.terminfo
-      ];
-      services.openssh.enable = true;
-      users.users.root.openssh.authorizedKeys.keys = [
-        config.krebs.users.lass.pubkey
-      ];
-      system.activationScripts.fuse = {
-        text = ''
-          ${pkgs.coreutils}/bin/mknod /dev/fuse c 10 229
-        '';
-        deps = [];
-      };
-    };
-    allowedDevices = [
-      { modifier = "rwm"; node = "/dev/fuse"; }
-    ];
-    autoStart = false;
-    enableTun = true;
-    privateNetwork = true;
-    hostAddress = "10.233.2.15"; # TODO find way to automatically calculate IPs
-    localAddress = "10.233.2.16"; # TODO find way to automatically calculate IPs
-  };
-
-  environment.systemPackages = [
-    (pkgs.writeDashBin "start-${cname}" ''
-      set -euf
-
-      mkdir -p /var/lib/containers/${cname}/var/state
-      chown ${config.services.syncthing.user}: /var/lib/containers/${cname}/var/state
-      if ! ${pkgs.mount}/bin/mount | grep -q '^cryfs@/var/lib/sync-containers/${cname} on /var/lib/containers/${cname}/var/state '; then
-        /run/wrappers/bin/sudo -u "${config.services.syncthing.user}" \
-          ${cryfs}/bin/cryfs /var/lib/sync-containers/${cname} /var/lib/containers/${cname}/var/state -o allow_other -o default_permissions
-      fi
-
-      STATE=$(${pkgs.nixos-container}/bin/nixos-container status ${cname})
-      if [ "$STATE" = 'down' ]; then
-        ${pkgs.nixos-container}/bin/nixos-container start ${cname}
-      fi
-
-      if ! ping -c1 -q -w5 ${cname}.r && [ -d /var/lib/containers/${cname}/var/src ]; then
-        ${pkgs.nixos-container}/bin/nixos-container run ${cname} -- ${pkgs.writeDash "deploy-${cname}" ''
-          mkdir -p /var/state/var_src
-          ln -sf state/var_Src /var/src
-          nixos-rebuild -I /var/src switch
-        ''}
-      fi
-    '')
-    (pkgs.writeDashBin "stop-${cname}" ''
-      set -euf
-
-      ${pkgs.nixos-container}/bin/nixos-container stop ${cname}
-      ${cryfs}/bin/cryfs-unmount /var/lib/containers/${cname}/var/state
-    '')
-  ];
-}