From 87c8d7830fb09d9e956308396018d5a00509cbf3 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 1 Feb 2016 15:56:24 +0100
Subject: l 1 mors: update nginx tests

---
 lass/1systems/mors.nix | 91 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 55 insertions(+), 36 deletions(-)

(limited to 'lass/1systems/mors.nix')

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 86a34a637..d0aae6dbb 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -32,51 +32,70 @@
       ];
     }
     {
-      #wordpress-test
-      #imports = singleton (sitesGenerators.createWordpress "testserver.de");
+      #static-nginx-test
       imports = [
-        ../3modules/wordpress_nginx.nix
+        ../3modules/static_nginx.nix
       ];
-      lass.wordpress."testserver.de" = {
-        multiSite = {
-          "1" = "testserver.de";
-          "2" = "bla.testserver.de";
+      lass.staticPage."testserver.de" = {
+        #sslEnable = true;
+        #certificate = "${toString <secrets>}/testserver.de/server.cert";
+        #certificate_key = "${toString <secrets>}/testserver.de/server.pem";
+        ssl = {
+          enable = true;
+          certificate = "${toString <secrets>}/testserver.de/server.cert";
+          certificate_key = "${toString <secrets>}/testserver.de/server.pem";
         };
       };
-
-      services.mysql = {
-        enable = true;
-        package = pkgs.mariadb;
-        rootPassword = "<secrets>/mysql_rootPassword";
-      };
       networking.extraHosts = ''
         10.243.0.2 testserver.de
       '';
-      krebs.iptables.tables.filter.INPUT.rules = [
-        { 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" = {
-      };
+    #{
+    #  #wordpress-test
+    #  #imports = singleton (sitesGenerators.createWordpress "testserver.de");
+    #  imports = [
+    #    ../3modules/wordpress_nginx.nix
+    #  ];
+    #  lass.wordpress."testserver.de" = {
+    #    multiSite = {
+    #      "1" = "testserver.de";
+    #      "2" = "bla.testserver.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; }
-      ];
-    }
+    #  services.mysql = {
+    #    enable = true;
+    #    package = pkgs.mariadb;
+    #    rootPassword = "<secrets>/mysql_rootPassword";
+    #  };
+    #  networking.extraHosts = ''
+    #    10.243.0.2 testserver.de
+    #  '';
+    #  krebs.iptables.tables.filter.INPUT.rules = [
+    #    { 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;
-- 
cgit v1.2.3