diff options
| author | lassulus <lass@aidsballs.de> | 2016-10-22 14:24:20 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-10-22 14:24:20 +0200 |
| commit | 0c464bb3cf5f838027d23c4888b8d6ce128e2119 (patch) | |
| tree | 1f670219201ac079a0106bb775653fff69c42fbb /makefu/1systems/x.nix | |
| parent | 8dc0352e4f585ca6b3a7507663dfcbd91fef098a (diff) | |
| parent | bb927ba0bbaa0f0a45d8b3c4f4cebac6fbe4f7c2 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/x.nix')
| -rw-r--r-- | makefu/1systems/x.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix index 00eca87c4..e7f5d0dae 100644 --- a/makefu/1systems/x.nix +++ b/makefu/1systems/x.nix @@ -13,6 +13,7 @@ # Krebs #../2configs/disable_v6.nix + ../2configs/rad1o.nix # applications @@ -38,19 +39,21 @@ ../2configs/fs/sda-crypto-root-home.nix # ../2configs/mediawiki.nix #../2configs/wordpress.nix - ../2configs/nginx/public_html.nix + #../2configs/nginx/public_html.nix + ../2configs/nginx/icecult.nix ../2configs/tinc/retiolum.nix # temporary modules ../2configs/temp/share-samba.nix ../2configs/laptop-backup.nix - # ../2configs/temp/elkstack.nix + ../2configs/temp/elkstack.nix # ../2configs/temp/sabnzbd.nix ../2configs/tinc/siem.nix #../2configs/torrent.nix ]; makefu.full-populate = true; + nixpkgs.config.allowUnfree = true; krebs.nginx = { default404 = false; servers.default.listen = [ "80 default_server" ]; @@ -59,7 +62,7 @@ environment.systemPackages = [ pkgs.passwdqc-utils pkgs.bintray-upload ]; - virtualisation.docker.enable = true; + # virtualisation.docker.enable = true; # configure pulseAudio to provide a HDMI sink as well networking.firewall.enable = true; |