diff options
| author | jeschli <jeschli@gmail.com> | 2018-02-28 20:10:42 +0000 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-02-28 20:10:42 +0000 |
| commit | a7e49dd5fc590ba2ccb26d559d672767c87a7692 (patch) | |
| tree | 3d0fb66d17085f1288037da1b4d9987fa402e40e /krebs/2configs | |
| parent | 4a2af184e6846f80b139357c6230558cd8785b10 (diff) | |
| parent | 4c0d0f64ed21d3d7292bb5e8900d973e649375c1 (diff) | |
Merge branch 'staging/jeschli' of prism.i:stockholm into staging/jeschli
Diffstat (limited to 'krebs/2configs')
| -rw-r--r-- | krebs/2configs/go.nix | 1 | ||||
| -rw-r--r-- | krebs/2configs/hw/x220.nix | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/krebs/2configs/go.nix b/krebs/2configs/go.nix index b75233871..f4c1290c2 100644 --- a/krebs/2configs/go.nix +++ b/krebs/2configs/go.nix @@ -8,6 +8,7 @@ with import <stockholm/lib>; krebs.go = { enable = true; }; + networking.firewall.allowedTCPPorts = [ 80 ]; services.nginx = { enable = true; virtualHosts.go = { diff --git a/krebs/2configs/hw/x220.nix b/krebs/2configs/hw/x220.nix index 90a1a111f..3780e0d7d 100644 --- a/krebs/2configs/hw/x220.nix +++ b/krebs/2configs/hw/x220.nix @@ -14,7 +14,6 @@ with import <stockholm/lib>; boot = { kernelModules = [ "kvm-intel" "acpi_call" "tpm-rng" ]; - extraModulePackages = [ config.boot.kernelPackages.tp_smapi ]; kernelParams = [ "acpi_backlight=none" ]; }; |