2 files changed, 74 insertions, 5 deletions
diff --git a/lass/1systems/dishfire.nix b/lass/1systems/dishfire.nix
new file mode 100644
index 000000000..a1288d578
--- /dev/null
+++ b/lass/1systems/dishfire.nix
@@ -0,0 +1,43 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
+    ../2configs/base.nix
+    {
+      boot.loader.grub = {
+        device = "/dev/vda";
+        splashImage = null;
+      };
+
+      boot.initrd.availableKernelModules = [
+        "ata_piix"
+        "ehci_pci"
+        "uhci_hcd"
+        "virtio_pci"
+        "virtio_blk"
+      ];
+
+      fileSystems."/" = {
+        device = "/dev/mapper/pool-nix";
+        fsType = "ext4";
+      };
+
+      fileSystems."/boot" = {
+        device = "/dev/vda1";
+        fsType = "ext4";
+      };
+    }
+    {
+      networking.dhcpcd.allowInterfaces = [
+        "enp*"
+        "eth*"
+      ];
+    }
+    {
+      sound.enable = false;
+    }
+  ];
+
+  krebs.build.host = config.krebs.hosts.dishfire;
+}
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 8af096f51..61f57f1f9 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -38,6 +38,10 @@
         ../3modules/wordpress_nginx.nix
       ];
       lass.wordpress."testserver.de" = {
+        multiSite = {
+          "1" = "testserver.de";
+          "2" = "bla.testserver.de";
+        };
       };
 
       services.mysql = {
@@ -52,6 +56,27 @@
         { predicate = "-i retiolum -p tcp --dport 80"; target = "ACCEPT"; precedence = 9998; }
       ];
     }
+    {
+      #owncloud-test
+      #imports = singleton (sitesGenerators.createWordpress "testserver.de");
+      imports = [
+        ../3modules/owncloud_nginx.nix
+      ];
+      lass.owncloud."owncloud-test.de" = {
+      };
+
+      #services.mysql = {
+      #  enable = true;
+      #  package = pkgs.mariadb;
+      #  rootPassword = "<secrets>/mysql_rootPassword";
+      #};
+      networking.extraHosts = ''
+        10.243.0.2 owncloud-test.de
+      '';
+      krebs.iptables.tables.filter.INPUT.rules = [
+        { predicate = "-i retiolum -p tcp --dport 80"; target = "ACCEPT"; precedence = 9998; }
+      ];
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.mors;
@@ -59,11 +84,12 @@
   networking.wireless.enable = true;
 
   networking.extraHosts = ''
-    10.243.206.102 habsys.de
-    10.243.206.102 pixelpocket.de
-    10.243.206.102 karlaskop.de
-    10.243.206.102 ubikmedia.de
-    10.243.206.102 apanowicz.de
+    213.239.205.240 wohnprojekt-rhh.de
+    213.239.205.240 karlaskop.de
+    213.239.205.240 makeup.apanowicz.de
+    213.239.205.240 pixelpocket.de
+    213.239.205.240 reich-gebaeudereinigung.de
+    213.239.205.240 o.ubikmedia.de
   '';
 
   hardware.enableAllFirmware = true;