diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index c9d424888..bfd880b88 100644 --- a/makefu/1systems/gum.nix +++ b/makefu/1systems/gum.nix @@ -11,9 +11,9 @@ in { ../2configs/fs/simple-swap.nix ../2configs/fs/single-partition-ext4.nix ../2configs/smart-monitor.nix - # ../2configs/iodined.nix + ../2configs/iodined.nix ../2configs/git/cgit-retiolum.nix - ../2configs/mattermost-docker.nix + # ../2configs/mattermost-docker.nix ../2configs/nginx/euer.test.nix ../2configs/nginx/update.connector.one.nix ../2configs/deployment/mycube.connector.one.nix diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix index 27a216316..56d1b01ba 100644 --- a/makefu/1systems/vbob.nix +++ b/makefu/1systems/vbob.nix @@ -40,7 +40,7 @@ fortclientsslvpn ppp xclip get logstash - docker + # docker devpi-web devpi-client ]; @@ -53,8 +53,6 @@ 8010 ]; - virtualisation.docker.enable = false; - fileSystems."/media/share" = { fsType = "vboxsf"; device = "share"; 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; diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index af0e2bae0..cb6fe55b8 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -23,7 +23,8 @@ with import ; user = config.krebs.users.makefu; source = let inherit (config.krebs.build) host user; - ref = "b8ede35"; # stable @ 2016-10-19 + # ref = "b8ede35"; # stable @ 2016-10-19 + ref = "31c72ce"; # stable @ 2016-10-21 (dirtycow) in { nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then {