Merge remote-tracking branch 'gum/master'

6 files changed, 51 insertions, 6 deletions

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index cb6fe55b8..bbe108074 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -90,9 +90,14 @@ with import <stockholm/lib>;
     "d /tmp 1777 root root - -"
   ];
   nix.nixPath = [ "/var/src" ];
-  environment.variables = {
+  environment.variables = let
+    ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+  in {
     NIX_PATH = mkForce "/var/src";
     EDITOR = mkForce "vim";
+    CURL_CA_BUNDLE = ca-bundle;
+    GIT_SSL_CAINFO = ca-bundle;
+    SSL_CERT_FILE  = ca-bundle;
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/makefu/2configs/gum-share.nix b/makefu/2configs/gum-share.nix
new file mode 100644
index 000000000..e578f43d3
--- /dev/null
+++ b/makefu/2configs/gum-share.nix
@@ -0,0 +1,39 @@
+{ config, lib, pkgs, ... }:
+
+with config.krebs.lib;
+let
+  hostname = config.krebs.build.host.name;
+in {
+  # users.users.smbguest = {
+  #   name = "smbguest";
+  #   uid = config.ids.uids.smbguest;
+  #   description = "smb guest user";
+  #   home = "/var/empty";
+  # };
+
+  users.users.download = { };
+  services.samba = {
+    enable = true;
+    shares = {
+      download = {
+        path = "/var/download";
+        "read only" = "no";
+        browseable = "yes";
+        "guest ok" = "no";
+        "valid users" = "download";
+      };
+    };
+    extraConfig = ''
+      # guest account = smbguest
+      # map to guest = bad user
+      # disable printing
+      load printers = no
+      printing = bsd
+      printcap name = /dev/null
+      disable spoolss = yes
+    '';
+  };
+  networking.firewall.extraCommands = ''
+      iptables -A INPUT -i retiolum -p tcp --dport 445 -j ACCEPT
+  '';
+}
diff --git a/makefu/2configs/hw/bcm4352.nix b/makefu/2configs/hw/bcm4352.nix
index 516637eb8..5dc8a1449 100644
--- a/makefu/2configs/hw/bcm4352.nix
+++ b/makefu/2configs/hw/bcm4352.nix
@@ -1,6 +1,7 @@
 {config, ...}:
 {
   networking.enableB43Firmware = true;
+  boot.kernelModules = [ "wl" ];
   boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
 }
 
diff --git a/makefu/2configs/hw/tp-x2x0.nix b/makefu/2configs/hw/tp-x2x0.nix
index 2b615ecfa..02bd8bb01 100644
--- a/makefu/2configs/hw/tp-x2x0.nix
+++ b/makefu/2configs/hw/tp-x2x0.nix
@@ -28,8 +28,9 @@ with import <stockholm/lib>;
   services.tlp.enable = true;
   services.tlp.extraConfig = ''
     # BUG: http://linrunner.de/en/tlp/docs/tlp-faq.html#erratic-battery
-    #START_CHARGE_THRESH_BAT0=80
-    STOP_CHARGE_THRESH_BAT0=95
+    START_CHARGE_THRESH_BAT0=67
+    STOP_CHARGE_THRESH_BAT0=100
+
 
     CPU_SCALING_GOVERNOR_ON_AC=performance
     CPU_SCALING_GOVERNOR_ON_BAT=ondemand
@@ -40,6 +41,6 @@ with import <stockholm/lib>;
   '';
 
   powerManagement.resumeCommands = ''
-    {pkgs.rfkill}/bin/rfkill unblock all
+    ${pkgs.rfkill}/bin/rfkill unblock all
   '';
 }
diff --git a/makefu/2configs/nginx/euer.wiki.nix b/makefu/2configs/nginx/euer.wiki.nix
index 22cf9c9b7..9d0b74871 100644
--- a/makefu/2configs/nginx/euer.wiki.nix
+++ b/makefu/2configs/nginx/euer.wiki.nix
@@ -44,7 +44,6 @@ in {
         pm.min_spare_servers = 1
         pm.max_spare_servers = 3
         chdir = /
-        # errors to journal
         php_admin_value[error_log] = 'stderr'
         php_admin_flag[log_errors] = on
         catch_workers_output = yes
diff --git a/makefu/2configs/urlwatch.nix b/makefu/2configs/urlwatch.nix
index 0d8f888fa..d575d18bc 100644
--- a/makefu/2configs/urlwatch.nix
+++ b/makefu/2configs/urlwatch.nix
@@ -15,7 +15,7 @@
       http://guest:derpi@cvs2svn.tigris.org/svn/cvs2svn/tags/
       http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/
       https://github.com/amadvance/snapraid/releases.atom
-      https://erdgeist.org/gitweb/opentracker/commit/
+      https://erdgeist.org/gitweb/opentracker/info/refs?service=git-upload-pack
     ];
   };
 }