diff options
| author | lassulus <lassulus@lassul.us> | 2018-05-03 18:59:31 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2018-05-03 18:59:31 +0200 |
| commit | e6794ca8821fd37bf0fcd2966b9927c14e92d180 (patch) | |
| tree | 2450ec0d380a4ea1b0f9cc677e4ee5095efc98c2 /makefu/2configs | |
| parent | 66b55d0a27327b5f0f6adf675a779f8d09e9c703 (diff) | |
| parent | dd71e3f657fb8680a83a47cc2e9bc7a0478240be (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs')
| -rw-r--r-- | makefu/2configs/hw/network-manager.nix | 3 | ||||
| -rw-r--r-- | makefu/2configs/nginx/euer.mon.nix | 26 | ||||
| -rw-r--r-- | makefu/2configs/tools/core-gui.nix | 4 |
3 files changed, 27 insertions, 6 deletions
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; 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; + ''; + }; + }; + }; +} 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 |