summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-02-04 14:35:29 +0100
committermakefu <github@syntax-fehler.de>2017-02-04 14:35:29 +0100
commit8eb9faea91abe315207289235fbaa612946ff63e (patch)
tree5943adb228ae3b1d6e59f06dc4f36e19afc87c38 /makefu/1systems
parentd6c9edd9dc860d560d4ea7a727962aaf93d09322 (diff)
Apply stashed changes
sorry
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/darth.nix10
-rw-r--r--makefu/1systems/gum.nix31
-rw-r--r--makefu/1systems/omo.nix2
-rw-r--r--makefu/1systems/x.nix23
4 files changed, 45 insertions, 21 deletions
diff --git a/makefu/1systems/darth.nix b/makefu/1systems/darth.nix
index 11bb47a93..b39021176 100644
--- a/makefu/1systems/darth.nix
+++ b/makefu/1systems/darth.nix
@@ -7,7 +7,7 @@ let
auxDisk = byid "ata-HGST_HTS721010A9E630_JR10006PH3A02F";
dataPartition = auxDisk + "-part1";
- allDisks = [ rootDisk auxDisk ];
+ allDisks = [ rootDisk ]; # auxDisk
in {
imports = [
../.
@@ -64,10 +64,10 @@ in {
services.smartd.devices = builtins.map (x: { device = x; }) allDisks;
zramSwap.enable = true;
- fileSystems."/data" = {
- device = dataPartition;
- fsType = "ext4";
- };
+ #fileSystems."/data" = {
+ # device = dataPartition;
+ # fsType = "ext4";
+ #};
boot.loader.grub.device = rootDisk;
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix
index e7761a642..18dc644fd 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum.nix
@@ -11,31 +11,40 @@ in {
../2configs/fs/simple-swap.nix
../2configs/fs/single-partition-ext4.nix
../2configs/smart-monitor.nix
- ../2configs/iodined.nix
../2configs/git/cgit-retiolum.nix
+ ../2configs/backup.nix
# ../2configs/mattermost-docker.nix
- ../2configs/nginx/euer.test.nix
- ../2configs/nginx/public_html.nix
- ../2configs/nginx/update.connector.one.nix
- ../2configs/deployment/mycube.connector.one.nix
-
+ ../2configs/disable_v6.nix
../2configs/exim-retiolum.nix
../2configs/tinc/retiolum.nix
../2configs/urlwatch.nix
- ../2configs/torrent.nix
- ../2configs/graphite-standalone.nix
- ../2configs/sabnzbd.nix
+
+ # services
../2configs/gum-share.nix
+ ../2configs/sabnzbd.nix
+ ../2configs/torrent.nix
+ ../2configs/iodined.nix
- ../2configs/opentracker.nix
+ ## Web
+ ../2configs/deployment/owncloud.nix
+ ../2configs/nginx/share-download.nix
+ ../2configs/nginx/euer.test.nix
+ ../2configs/nginx/public_html.nix
+ ../2configs/nginx/update.connector.one.nix
+ ../2configs/deployment/mycube.connector.one.nix
+
+ # ../2configs/opentracker.nix
+ ../2configs/logging/central-stats-client.nix
];
services.smartd.devices = [ { device = "/dev/sda";} ];
+ makefu.dl-dir = "/var/download";
###### stable
services.nginx.virtualHosts.cgit.serverAliases = [ "cgit.euer.krebsco.de" ];
krebs.build.host = config.krebs.hosts.gum;
+
krebs.tinc.retiolum = {
extraConfig = ''
ListenAddress = ${external-ip} 53
@@ -65,6 +74,8 @@ in {
get
];
services.bitlbee.enable = true;
+ systemd.services.bitlbee.environment.BITLBEE_DEBUG="1";
+ # systemd.services.bitlbee.serviceConfig.ExecStart = "${pkgs.bitlbee}/bin/bitlbee -Dnv -c
# Hardware
boot.loader.grub.device = "/dev/sda";
diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index 422fe7c48..7a36c57be 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo.nix
@@ -55,6 +55,8 @@ in {
../2configs/tinc/retiolum.nix
../2configs/logging/central-stats-server.nix
../2configs/logging/central-stats-client.nix
+
+ ../2configs/kapacitor.nix
# ../2configs/torrent.nix
# ../2configs/elchos/search.nix
diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix
index 6fe3883a1..adbf372ab 100644
--- a/makefu/1systems/x.nix
+++ b/makefu/1systems/x.nix
@@ -12,22 +12,33 @@
../2configs/laptop-backup.nix
# testing
- #../2configs/elchos/search.nix
+ ../2configs/openvpn/vpngate.nix
#../2configs/temp/share-samba.nix
# ../2configs/mediawiki.nix
# ../2configs/wordpress.nix
# ../2configs/nginx/public_html.nix
# ../2configs/nginx/icecult.nix
+
+ # ../2configs/elchos/irc-token.nix
+ # ../2configs/elchos/log.nix
+
+ #../2configs/elchos/search.nix
+ #../2configs/elchos/stats.nix
+ #../2configs/elchos/test/ftpservers.nix
+
../2configs/laptop-backup.nix
+ # ../2configs/tinc/siem.nix
+ #../2configs/torrent.nix
+ # temporary modules
+
+ # ../2configs/torrent.nix
#../2configs/temp/elkstack.nix
# ../2configs/temp/sabnzbd.nix
- ../2configs/tinc/siem.nix
- #../2configs/torrent.nix
# Krebs
- ../2configs/disable_v6.nix
+ # ../2configs/disable_v6.nix
../2configs/tinc/retiolum.nix
# applications
@@ -40,7 +51,7 @@
../2configs/rad1o.nix
# services
- ../2configs/git/brain-retiolum.nix
+ #../2configs/git/brain-retiolum.nix
../2configs/tor.nix
../2configs/steam.nix
# ../2configs/buildbot-standalone.nix
@@ -52,8 +63,8 @@
# mount points
../2configs/fs/sda-crypto-root-home.nix
- # temporary modules
];
+ makefu.server.primary-itf = "wlp2s0";
makefu.full-populate = true;
nixpkgs.config.allowUnfree = true;