From 309124175425cb7abd6dad166f485ae832435562 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 25 Apr 2018 14:50:06 +0200
Subject: ma gum.r: expose euer.mon

---
 makefu/2configs/nginx/euer.mon.nix | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 makefu/2configs/nginx/euer.mon.nix

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/nginx/euer.mon.nix b/makefu/2configs/nginx/euer.mon.nix
new file mode 100644
index 000000000..c5a7e68af
--- /dev/null
+++ b/makefu/2configs/nginx/euer.mon.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+with import <stockholm/lib>;
+let
+  hostname = config.krebs.build.host.name;
+  user = config.services.nginx.user;
+  group = config.services.nginx.group;
+  external-ip = config.krebs.build.host.nets.internet.ip4.addr;
+  internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr;
+in {
+  services.nginx = {
+    enable = mkDefault true;
+    virtualHosts."mon.euer.krebsco.de" = {
+      forceSSL = true;
+      enableACME = true;
+      locations."/" =  {
+        proxyPass = "http://wbob.r:3000/";
+        extraConfig = ''
+          proxy_set_header   Host $host;
+          proxy_set_header   X-Real-IP          $remote_addr;
+          proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        '';
+      };
+    };
+  };
+}
-- 
cgit v1.2.3


From 0ea7fd530f5b0b74ebff8b352283a7b399e9a109 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 3 May 2018 18:41:03 +0200
Subject: ma core-gui: rip flash on firefox

---
 makefu/2configs/tools/core-gui.nix | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
index 2f80b08c9..898bae10d 100644
--- a/makefu/2configs/tools/core-gui.nix
+++ b/makefu/2configs/tools/core-gui.nix
@@ -1,10 +1,6 @@
 { pkgs, ... }:
 
 {
-  nixpkgs.config.firefox = {
-    enableAdobeFlash = true;
-  };
-
   krebs.per-user.makefu.packages = with pkgs; [
     chromium
     clipit
-- 
cgit v1.2.3


From 49193180cb66b35dc95ab34003c739af575adc77 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 3 May 2018 18:41:54 +0200
Subject: ma network-manager: wanted by multi-user

---
 makefu/2configs/hw/network-manager.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/hw/network-manager.nix b/makefu/2configs/hw/network-manager.nix
index 7e29849b1..d322c683d 100644
--- a/makefu/2configs/hw/network-manager.nix
+++ b/makefu/2configs/hw/network-manager.nix
@@ -11,9 +11,8 @@
 
   systemd.services.modemmanager = {
     description = "ModemManager";
-    after = [ "network-manager.service" ];
     bindsTo = [ "network-manager.service" ];
-    wantedBy = [ "network-manager.service" ];
+    wantedBy = [ "network-manager.service" "multi-user.target" ];
     serviceConfig = {
       ExecStart = "${pkgs.modemmanager}/bin/ModemManager";
       PrivateTmp = true;
-- 
cgit v1.2.3