summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--krebs/3modules/makefu/default.nix4
-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
-rw-r--r--makefu/2configs/default.nix4
-rw-r--r--makefu/2configs/git/cgit-retiolum.nix3
-rw-r--r--makefu/3modules/snapraid.nix1
-rw-r--r--makefu/5pkgs/acdcli/default.nix2
-rw-r--r--makefu/5pkgs/default.nix1
-rw-r--r--makefu/5pkgs/elchhub/default.nix4
11 files changed, 59 insertions, 26 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index 84720859f..cd84ab815 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -914,6 +914,10 @@ TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB
inherit (makefu) mail pgp;
pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCiKvLKaRQPL/Y/4EWx3rNhrY5YGKK4AeqDOFTLgJ7djwJnMo7FP+OIH/4pFxS6Ri2TZwS9QsR3hsycA4n8Z15jXAOXuK52kP65Ei3lLyz9mF+/s1mJsV0Ui/UKF3jE7PEAVky7zXuyYirJpMK8LhXydpFvH95aGrL1Dk30R9/vNkE9rc1XylBfNpT0X0GXmldI+r5OPOtiKLA5BHJdlV8qDYhQsU2fH8S0tmAHF/ir2bh7+PtLE2hmRT+b8I7y1ZagkJsC0sn9GT1AS8ys5s65V2xTTIfQO1zQ4sUH0LczuRuY8MLaO33GAzhyoSQdbdRAmwZQpY/JRJ3C/UROgHYt makefu@vbob";
};
+ makefu-tempx = {
+ inherit (makefu) mail pgp;
+ pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOXG6iwvm6zUVk+OE9ZviO+WNosAHSZw4ku0RxWbXSlSG0RfzvV4IfByF3Dw+4a8yZQmjwNkQalUURh2fEqhBLBI9XNEIL7qIu17zheguyXzpE3Smy4pbI+fjdsnfFrw+WE2n/IO8N6ojdH6sMmnWwfkFZYqqofWyLB3WUN9wy2b2z0w/jc56+HxxyTl3rD7CttTs9ak67HqIn3/pNeHoOM+JQ/te8t4ageIlPi8yJJpqZgww1RUWCgPPwZ9DP6gQjo85he76x0h9jvhnFd7m9N1aGdRDcK55QyoY/9x07R24GRutohAB/KDWSkDWQv5BW7M1LCawpJcF3DDslD1i7 makefu@gum";
+ };
ciko = {
mail = "wieczorek.stefan@googlemail.com";
};
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;
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 9e3f3eb61..95ca4884e 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -22,11 +22,11 @@ with import <stockholm/lib>;
user = config.krebs.users.makefu;
source = let
inherit (config.krebs.build) host user;
- ref = "ee13b9af"; # stable @ 2016-12-12
+ ref = "5dad589"; # stable @ 2016-12-28 + cherry-pick graphite
in {
nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
{
- git = { url = https://github.com/nixos/nixpkgs; inherit ref; };
+ git = { url = https://github.com/makefu/nixpkgs; inherit ref; };
}
else
# TODO use http, once it is implemented
diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix
index 553a23972..81a5cde81 100644
--- a/makefu/2configs/git/cgit-retiolum.nix
+++ b/makefu/2configs/git/cgit-retiolum.nix
@@ -26,6 +26,7 @@ let
priv-repos = mapAttrs make-priv-repo {
autosync = { };
+ pass = { };
};
connector-repos = mapAttrs make-priv-repo {
@@ -61,7 +62,7 @@ let
# TODO: get the list of all krebsministers
krebsminister = with config.krebs.users; [ lass tv ];
- all-makefu = with config.krebs.users; [ makefu makefu-omo makefu-tsp makefu-vbob ];
+ all-makefu = with config.krebs.users; [ makefu makefu-omo makefu-tsp makefu-vbob makefu-tempx ];
all-exco = with config.krebs.users; [ exco ];
priv-rules = repo: set-owners repo all-makefu;
diff --git a/makefu/3modules/snapraid.nix b/makefu/3modules/snapraid.nix
index 762e909b9..9c7854787 100644
--- a/makefu/3modules/snapraid.nix
+++ b/makefu/3modules/snapraid.nix
@@ -101,6 +101,7 @@ let
# for scrubbing,fixing
pkgs.snapraid
];
+ krebs.on-failure.plans.snapraid-sync.name = "snapraid-sync";
environment.etc."snapraid.conf".text = snapraid-conf;
systemd.timers.snapraid-sync = {
description = "snapraid sync timer";
diff --git a/makefu/5pkgs/acdcli/default.nix b/makefu/5pkgs/acdcli/default.nix
index 1621375e3..6442fecbf 100644
--- a/makefu/5pkgs/acdcli/default.nix
+++ b/makefu/5pkgs/acdcli/default.nix
@@ -11,6 +11,8 @@ with python3Packages; buildPythonPackage rec {
sha256 = "1ak9xxpyb7n6iyalf2082jpimklakm0fgm7vsv7qcm8wy6vlq2cw";
};
doCheck = false; # ImportError: Failed to import test module: tests
+
+ # acd_cli gets dumped in bin and gets overwritten by fixupPhase
postFixup = ''
mv $out/bin/.acd_cli.py-wrapped $out/bin/acd_cli.py
'';
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index b62f1efa2..71354a015 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -33,5 +33,6 @@ in
taskserver = callPackage ./taskserver {};
udpt = callPackage ./udpt {};
wol = callPackage ./wol {};
+ snapraid = callPackage ./snapraid {};
};
}
diff --git a/makefu/5pkgs/elchhub/default.nix b/makefu/5pkgs/elchhub/default.nix
index a4fb86043..a28267cb1 100644
--- a/makefu/5pkgs/elchhub/default.nix
+++ b/makefu/5pkgs/elchhub/default.nix
@@ -24,8 +24,8 @@ in buildPythonPackage rec {
src = fetchFromGitHub {
owner = "krebscode";
repo = "elchhub";
- rev = "2f499c1";
- sha256 = "1lbql3lx7i3ynsjanfy9vln6795rb56n9xq9vkb7xbml60gmn1wg";
+ rev = "58707c6";
+ sha256 = "04spbcr660dxyc4jvrai094na25zizd2cfi36jz19lahb0k66lqm";
};
meta = {
homepage = https://github.com/krebscode/elchhub;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 18:33:54 +0000