summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-10-22 12:47:22 +0200
committermakefu <github@syntax-fehler.de>2016-10-22 12:47:22 +0200
commitab6a4492f2d9cd6154bcbec5684a751168028f5e (patch)
treed4aeb93701b14c7b7722f365c7086255b3211406 /makefu
parent79a83023d5d9ee442d5c0b479cdf2e664a5c3685 (diff)
m 1 x: disable docker for now
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/x.nix9
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;
[cgit] Unable to lock slot /tmp/cgit/89000000.lock: No such file or directory (2)