Merge remote-tracking branch 'lass/19.09' into 19.09

1 files changed, 8 insertions, 46 deletions

diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index 526909e8a..f04f312d0 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -21,29 +21,6 @@ in {
 
   krebs.tinc_graphs.enable = true;
 
-  users.users.lass-stuff = {
-    uid = genid_uint31 "lass-stuff";
-    description = "lassul.us blog cgi stuff";
-    home = "/var/empty";
-  };
-
-  services.phpfpm.poolConfigs."lass-stuff" = ''
-    listen = /var/run/lass-stuff.socket
-    user = lass-stuff
-    group = nginx
-    pm = dynamic
-    pm.max_children = 5
-    pm.start_servers = 1
-    pm.min_spare_servers = 1
-    pm.max_spare_servers = 1
-    listen.owner = lass-stuff
-    listen.group = nginx
-    php_admin_value[error_log] = 'stderr'
-    php_admin_flag[log_errors] = on
-    catch_workers_output = yes
-    security.limit_extensions =
-  '';
-
   users.groups.lasscert.members = [
     "dovecot2"
     "ejabberd"
@@ -60,48 +37,33 @@ in {
     locations."= /retiolum-hosts.tar.bz2".extraConfig = ''
       alias ${config.krebs.tinc.retiolum.hostsArchive};
     '';
+    locations."= /hosts".extraConfig = ''
+      alias ${pkgs.krebs-hosts_combined};
+    '';
     locations."= /retiolum.hosts".extraConfig = ''
       alias ${pkgs.krebs-hosts-retiolum};
     '';
     locations."= /wireguard-key".extraConfig = ''
       alias ${pkgs.writeText "prism.wg" config.krebs.hosts.prism.nets.wiregrill.wireguard.pubkey};
     '';
-    locations."/tinc".extraConfig = ''
+    locations."/tinc/".extraConfig = ''
       alias ${config.krebs.tinc_graphs.workingDir}/external;
     '';
-    locations."/krebspage".extraConfig = ''
+    locations."= /krebspage".extraConfig = ''
       default_type "text/html";
       alias ${pkgs.krebspage}/index.html;
     '';
-    # TODO make this work!
-    locations."= /ddate".extraConfig = let
-      script = pkgs.writeBash "test" ''
-        echo "hello world"
-      '';
-      #script = pkgs.exec "ddate-wrapper" {
-      #  filename = "${pkgs.ddate}/bin/ddate";
-      #  argv = [];
-      #};
-    in ''
-      gzip off;
-      fastcgi_pass unix:/var/run/lass-stuff.socket;
-      include ${pkgs.nginx}/conf/fastcgi_params;
-      fastcgi_param DOCUMENT_ROOT /var/empty;
-      fastcgi_param SCRIPT_FILENAME ${script};
-      fastcgi_param SCRIPT_NAME ${script};
-    '';
-
-    locations."/init".extraConfig = let
+    locations."= /init".extraConfig = let
       initscript = pkgs.init.override {
         pubkey = config.krebs.users.lass.pubkey;
       };
     in ''
       alias ${initscript};
     '';
-    locations."/pub".extraConfig = ''
+    locations."= /pub".extraConfig = ''
       alias ${pkgs.writeText "pub" config.krebs.users.lass.pubkey};
     '';
-    locations."/pub1".extraConfig = ''
+    locations."= /pub1".extraConfig = ''
       alias ${pkgs.writeText "pub" config.krebs.users.lass-mors.pubkey};
     '';
   };