Merge remote-tracking branch 'gum/master'

4 files changed, 46 insertions, 5 deletions

diff --git a/makefu/2configs/lanparty/lancache-dns.nix b/makefu/2configs/lanparty/lancache-dns.nix
index 4b4ebf0a0..c9da7c4c4 100644
--- a/makefu/2configs/lanparty/lancache-dns.nix
+++ b/makefu/2configs/lanparty/lancache-dns.nix
@@ -1,6 +1,19 @@
 { pkgs, lib, config, ... }:
 with import <stockholm/lib>;
 let
+  upstream-server = "8.8.8.8";
+  # make sure the router pins the ip address to the deployed host
+  # and set it as dns server ( dhcp option 6,192.168.10.10 )
+  local_ip = "192.168.10.10";
+
+  extra-config = pkgs.writeText "local.conf" ''
+    server:
+    local-data: "piratebox. A ${local_ip}"
+    local-data: "store. A ${local_ip}"
+    local-data: "share. A ${local_ip}"
+  '';
+
+
   # see https://github.com/zeropingheroes/lancache for full docs
   lancache-dns = pkgs.stdenv.mkDerivation rec {
     name = "lancache-dns-2017-06-28";
@@ -11,8 +24,9 @@ let
       rev = "420aa62";
       sha256 = "0ik7by7ripdv2avyy5kk9jp1i7rz9ksc8xmg7n9iik365q9pv94m";
     };
+
     phases = [ "unpackPhase" "installPhase" ];
-    # here we can chance to edit `includes/proxy-cache-paths.conf`
+    # here we have the chance to edit `includes/proxy-cache-paths.conf`
     installPhase = ''
       mkdir -p $out
       cp -r * $out/
@@ -20,7 +34,6 @@ let
   };
   stateDir = "/var/lib/unbound";
   user = "unbound";
-  upstream-server = "8.8.8.8";
 in {
   services.unbound = {
     enable = true;
@@ -29,6 +42,7 @@ in {
     forwardAddresses = [ upstream-server ];
     extraConfig = ''
       include: "${stateDir}/lancache/*.conf"
+      include: "${extra-config}"
     '';
   };
   services.dnscrypt-proxy.enable = lib.mkForce false;
@@ -42,7 +56,8 @@ in {
       path = [ pkgs.gawk pkgs.iproute pkgs.gnused ];
       script = ''
         set -xeu
-        current_ip=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}')
+        # current_ip=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}')
+        current_ip=${local_ip}
         old_ip=10.1.1.250
         mkdir -p ${stateDir}
         rm -rvf ${stateDir}/lancache
diff --git a/makefu/2configs/lanparty/lancache.nix b/makefu/2configs/lanparty/lancache.nix
index 3df2e3f59..bcacf2e15 100644
--- a/makefu/2configs/lanparty/lancache.nix
+++ b/makefu/2configs/lanparty/lancache.nix
@@ -17,15 +17,21 @@ let
     installPhase = ''
       mkdir -p $out
       cp -r * $out/
+      rm $out/caches-enabled/*
       sed -i -e 's/^\(user\).*/\1 ${cfg.user} ${cfg.group};/' \
              -e '1 idaemon off;' \
+             -e 's#/var/lancache#${cfg.statedir}#g' \
               $out/nginx.conf
+      sed -i -e 's#/var/lancache#${cfg.statedir}#g' \
+              $out/*/*.conf
+      ln -s $out/caches-available/* $out/caches-enabled/
     '';
   };
   cfg = {
+    statedir = "/data/cache";
+
     group = "nginx-lancache";
     user = "nginx-lancache";
-    statedir = "/var/lancache";
     package = pkgs.stdenv.lib.overrideDerivation pkgs.nginx (old:{
       configureFlags = old.configureFlags ++ [
         "--with-http_slice_module"
@@ -43,6 +49,7 @@ in {
 
     preStart = ''
       mkdir -p ${cfg.statedir} && cd ${cfg.statedir}
+      chmod 700 ${cfg.statedir}
       PATH_CACHE=$PATH_BASE/cache
       PATH_LOGS=$PATH_BASE/logs
 
diff --git a/makefu/2configs/lanparty/mumble-server.nix b/makefu/2configs/lanparty/mumble-server.nix
new file mode 100644
index 000000000..5b9631cd1
--- /dev/null
+++ b/makefu/2configs/lanparty/mumble-server.nix
@@ -0,0 +1,12 @@
+{ config, ... }:
+{
+  networking.firewall.allowedTCPPorts = [ 64738 ];
+  networking.firewall.allowedUDPPorts = [ 64738 ];
+  services.murmur = {
+    enable = true;
+    welcometext = "Welcome to the LANest Party mumble server";
+    bonjour = true;
+    hostName = "0.0.0.0";
+    sendVersion = true;
+  };
+}
diff --git a/makefu/2configs/lanparty/samba.nix b/makefu/2configs/lanparty/samba.nix
index de834ab16..4176d7b35 100644
--- a/makefu/2configs/lanparty/samba.nix
+++ b/makefu/2configs/lanparty/samba.nix
@@ -10,9 +10,16 @@
   };
   services.samba = {
     enable = true;
+    enableNmbd = true;
     shares = {
-      share-home = {
+      lanparty = {
         path = "/data/lanparty/";
+        "read only" = "yes";
+        browseable = "yes";
+        "guest ok" = "yes";
+      };
+      share = {
+        path = "/data/incoming";
         "read only" = "no";
         browseable = "yes";
         "guest ok" = "yes";