Apply stashed changes
sorry
This commit is contained in:
parent
d6c9edd9dc
commit
8eb9faea91
@ -914,6 +914,10 @@ TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB
|
|||||||
inherit (makefu) mail pgp;
|
inherit (makefu) mail pgp;
|
||||||
pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCiKvLKaRQPL/Y/4EWx3rNhrY5YGKK4AeqDOFTLgJ7djwJnMo7FP+OIH/4pFxS6Ri2TZwS9QsR3hsycA4n8Z15jXAOXuK52kP65Ei3lLyz9mF+/s1mJsV0Ui/UKF3jE7PEAVky7zXuyYirJpMK8LhXydpFvH95aGrL1Dk30R9/vNkE9rc1XylBfNpT0X0GXmldI+r5OPOtiKLA5BHJdlV8qDYhQsU2fH8S0tmAHF/ir2bh7+PtLE2hmRT+b8I7y1ZagkJsC0sn9GT1AS8ys5s65V2xTTIfQO1zQ4sUH0LczuRuY8MLaO33GAzhyoSQdbdRAmwZQpY/JRJ3C/UROgHYt makefu@vbob";
|
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 = {
|
ciko = {
|
||||||
mail = "wieczorek.stefan@googlemail.com";
|
mail = "wieczorek.stefan@googlemail.com";
|
||||||
};
|
};
|
||||||
|
@ -7,7 +7,7 @@ let
|
|||||||
auxDisk = byid "ata-HGST_HTS721010A9E630_JR10006PH3A02F";
|
auxDisk = byid "ata-HGST_HTS721010A9E630_JR10006PH3A02F";
|
||||||
dataPartition = auxDisk + "-part1";
|
dataPartition = auxDisk + "-part1";
|
||||||
|
|
||||||
allDisks = [ rootDisk auxDisk ];
|
allDisks = [ rootDisk ]; # auxDisk
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
../.
|
../.
|
||||||
@ -64,10 +64,10 @@ in {
|
|||||||
services.smartd.devices = builtins.map (x: { device = x; }) allDisks;
|
services.smartd.devices = builtins.map (x: { device = x; }) allDisks;
|
||||||
zramSwap.enable = true;
|
zramSwap.enable = true;
|
||||||
|
|
||||||
fileSystems."/data" = {
|
#fileSystems."/data" = {
|
||||||
device = dataPartition;
|
# device = dataPartition;
|
||||||
fsType = "ext4";
|
# fsType = "ext4";
|
||||||
};
|
#};
|
||||||
|
|
||||||
boot.loader.grub.device = rootDisk;
|
boot.loader.grub.device = rootDisk;
|
||||||
|
|
||||||
|
@ -11,31 +11,40 @@ in {
|
|||||||
../2configs/fs/simple-swap.nix
|
../2configs/fs/simple-swap.nix
|
||||||
../2configs/fs/single-partition-ext4.nix
|
../2configs/fs/single-partition-ext4.nix
|
||||||
../2configs/smart-monitor.nix
|
../2configs/smart-monitor.nix
|
||||||
../2configs/iodined.nix
|
|
||||||
../2configs/git/cgit-retiolum.nix
|
../2configs/git/cgit-retiolum.nix
|
||||||
|
../2configs/backup.nix
|
||||||
# ../2configs/mattermost-docker.nix
|
# ../2configs/mattermost-docker.nix
|
||||||
|
../2configs/disable_v6.nix
|
||||||
|
../2configs/exim-retiolum.nix
|
||||||
|
../2configs/tinc/retiolum.nix
|
||||||
|
../2configs/urlwatch.nix
|
||||||
|
|
||||||
|
# services
|
||||||
|
../2configs/gum-share.nix
|
||||||
|
../2configs/sabnzbd.nix
|
||||||
|
../2configs/torrent.nix
|
||||||
|
../2configs/iodined.nix
|
||||||
|
|
||||||
|
## Web
|
||||||
|
../2configs/deployment/owncloud.nix
|
||||||
|
../2configs/nginx/share-download.nix
|
||||||
../2configs/nginx/euer.test.nix
|
../2configs/nginx/euer.test.nix
|
||||||
../2configs/nginx/public_html.nix
|
../2configs/nginx/public_html.nix
|
||||||
../2configs/nginx/update.connector.one.nix
|
../2configs/nginx/update.connector.one.nix
|
||||||
../2configs/deployment/mycube.connector.one.nix
|
../2configs/deployment/mycube.connector.one.nix
|
||||||
|
|
||||||
../2configs/exim-retiolum.nix
|
# ../2configs/opentracker.nix
|
||||||
../2configs/tinc/retiolum.nix
|
../2configs/logging/central-stats-client.nix
|
||||||
../2configs/urlwatch.nix
|
|
||||||
../2configs/torrent.nix
|
|
||||||
../2configs/graphite-standalone.nix
|
|
||||||
../2configs/sabnzbd.nix
|
|
||||||
../2configs/gum-share.nix
|
|
||||||
|
|
||||||
../2configs/opentracker.nix
|
|
||||||
|
|
||||||
];
|
];
|
||||||
services.smartd.devices = [ { device = "/dev/sda";} ];
|
services.smartd.devices = [ { device = "/dev/sda";} ];
|
||||||
|
makefu.dl-dir = "/var/download";
|
||||||
|
|
||||||
|
|
||||||
###### stable
|
###### stable
|
||||||
services.nginx.virtualHosts.cgit.serverAliases = [ "cgit.euer.krebsco.de" ];
|
services.nginx.virtualHosts.cgit.serverAliases = [ "cgit.euer.krebsco.de" ];
|
||||||
krebs.build.host = config.krebs.hosts.gum;
|
krebs.build.host = config.krebs.hosts.gum;
|
||||||
|
|
||||||
krebs.tinc.retiolum = {
|
krebs.tinc.retiolum = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
ListenAddress = ${external-ip} 53
|
ListenAddress = ${external-ip} 53
|
||||||
@ -65,6 +74,8 @@ in {
|
|||||||
get
|
get
|
||||||
];
|
];
|
||||||
services.bitlbee.enable = true;
|
services.bitlbee.enable = true;
|
||||||
|
systemd.services.bitlbee.environment.BITLBEE_DEBUG="1";
|
||||||
|
# systemd.services.bitlbee.serviceConfig.ExecStart = "${pkgs.bitlbee}/bin/bitlbee -Dnv -c
|
||||||
|
|
||||||
# Hardware
|
# Hardware
|
||||||
boot.loader.grub.device = "/dev/sda";
|
boot.loader.grub.device = "/dev/sda";
|
||||||
|
@ -55,6 +55,8 @@ in {
|
|||||||
../2configs/tinc/retiolum.nix
|
../2configs/tinc/retiolum.nix
|
||||||
../2configs/logging/central-stats-server.nix
|
../2configs/logging/central-stats-server.nix
|
||||||
../2configs/logging/central-stats-client.nix
|
../2configs/logging/central-stats-client.nix
|
||||||
|
|
||||||
|
../2configs/kapacitor.nix
|
||||||
# ../2configs/torrent.nix
|
# ../2configs/torrent.nix
|
||||||
|
|
||||||
# ../2configs/elchos/search.nix
|
# ../2configs/elchos/search.nix
|
||||||
|
@ -12,22 +12,33 @@
|
|||||||
../2configs/laptop-backup.nix
|
../2configs/laptop-backup.nix
|
||||||
|
|
||||||
# testing
|
# testing
|
||||||
#../2configs/elchos/search.nix
|
../2configs/openvpn/vpngate.nix
|
||||||
#../2configs/temp/share-samba.nix
|
#../2configs/temp/share-samba.nix
|
||||||
# ../2configs/mediawiki.nix
|
# ../2configs/mediawiki.nix
|
||||||
# ../2configs/wordpress.nix
|
# ../2configs/wordpress.nix
|
||||||
# ../2configs/nginx/public_html.nix
|
# ../2configs/nginx/public_html.nix
|
||||||
# ../2configs/nginx/icecult.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/laptop-backup.nix
|
||||||
|
# ../2configs/tinc/siem.nix
|
||||||
|
#../2configs/torrent.nix
|
||||||
|
# temporary modules
|
||||||
|
|
||||||
|
# ../2configs/torrent.nix
|
||||||
#../2configs/temp/elkstack.nix
|
#../2configs/temp/elkstack.nix
|
||||||
# ../2configs/temp/sabnzbd.nix
|
# ../2configs/temp/sabnzbd.nix
|
||||||
../2configs/tinc/siem.nix
|
|
||||||
#../2configs/torrent.nix
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Krebs
|
# Krebs
|
||||||
../2configs/disable_v6.nix
|
# ../2configs/disable_v6.nix
|
||||||
../2configs/tinc/retiolum.nix
|
../2configs/tinc/retiolum.nix
|
||||||
|
|
||||||
# applications
|
# applications
|
||||||
@ -40,7 +51,7 @@
|
|||||||
../2configs/rad1o.nix
|
../2configs/rad1o.nix
|
||||||
|
|
||||||
# services
|
# services
|
||||||
../2configs/git/brain-retiolum.nix
|
#../2configs/git/brain-retiolum.nix
|
||||||
../2configs/tor.nix
|
../2configs/tor.nix
|
||||||
../2configs/steam.nix
|
../2configs/steam.nix
|
||||||
# ../2configs/buildbot-standalone.nix
|
# ../2configs/buildbot-standalone.nix
|
||||||
@ -52,8 +63,8 @@
|
|||||||
# mount points
|
# mount points
|
||||||
../2configs/fs/sda-crypto-root-home.nix
|
../2configs/fs/sda-crypto-root-home.nix
|
||||||
|
|
||||||
# temporary modules
|
|
||||||
];
|
];
|
||||||
|
makefu.server.primary-itf = "wlp2s0";
|
||||||
makefu.full-populate = true;
|
makefu.full-populate = true;
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
@ -22,11 +22,11 @@ with import <stockholm/lib>;
|
|||||||
user = config.krebs.users.makefu;
|
user = config.krebs.users.makefu;
|
||||||
source = let
|
source = let
|
||||||
inherit (config.krebs.build) host user;
|
inherit (config.krebs.build) host user;
|
||||||
ref = "ee13b9af"; # stable @ 2016-12-12
|
ref = "5dad589"; # stable @ 2016-12-28 + cherry-pick graphite
|
||||||
in {
|
in {
|
||||||
nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
|
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
|
else
|
||||||
# TODO use http, once it is implemented
|
# TODO use http, once it is implemented
|
||||||
|
@ -26,6 +26,7 @@ let
|
|||||||
|
|
||||||
priv-repos = mapAttrs make-priv-repo {
|
priv-repos = mapAttrs make-priv-repo {
|
||||||
autosync = { };
|
autosync = { };
|
||||||
|
pass = { };
|
||||||
};
|
};
|
||||||
|
|
||||||
connector-repos = mapAttrs make-priv-repo {
|
connector-repos = mapAttrs make-priv-repo {
|
||||||
@ -61,7 +62,7 @@ let
|
|||||||
|
|
||||||
# TODO: get the list of all krebsministers
|
# TODO: get the list of all krebsministers
|
||||||
krebsminister = with config.krebs.users; [ lass tv ];
|
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 ];
|
all-exco = with config.krebs.users; [ exco ];
|
||||||
|
|
||||||
priv-rules = repo: set-owners repo all-makefu;
|
priv-rules = repo: set-owners repo all-makefu;
|
||||||
|
@ -101,6 +101,7 @@ let
|
|||||||
# for scrubbing,fixing
|
# for scrubbing,fixing
|
||||||
pkgs.snapraid
|
pkgs.snapraid
|
||||||
];
|
];
|
||||||
|
krebs.on-failure.plans.snapraid-sync.name = "snapraid-sync";
|
||||||
environment.etc."snapraid.conf".text = snapraid-conf;
|
environment.etc."snapraid.conf".text = snapraid-conf;
|
||||||
systemd.timers.snapraid-sync = {
|
systemd.timers.snapraid-sync = {
|
||||||
description = "snapraid sync timer";
|
description = "snapraid sync timer";
|
||||||
|
@ -11,6 +11,8 @@ with python3Packages; buildPythonPackage rec {
|
|||||||
sha256 = "1ak9xxpyb7n6iyalf2082jpimklakm0fgm7vsv7qcm8wy6vlq2cw";
|
sha256 = "1ak9xxpyb7n6iyalf2082jpimklakm0fgm7vsv7qcm8wy6vlq2cw";
|
||||||
};
|
};
|
||||||
doCheck = false; # ImportError: Failed to import test module: tests
|
doCheck = false; # ImportError: Failed to import test module: tests
|
||||||
|
|
||||||
|
# acd_cli gets dumped in bin and gets overwritten by fixupPhase
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
mv $out/bin/.acd_cli.py-wrapped $out/bin/acd_cli.py
|
mv $out/bin/.acd_cli.py-wrapped $out/bin/acd_cli.py
|
||||||
'';
|
'';
|
||||||
|
@ -33,5 +33,6 @@ in
|
|||||||
taskserver = callPackage ./taskserver {};
|
taskserver = callPackage ./taskserver {};
|
||||||
udpt = callPackage ./udpt {};
|
udpt = callPackage ./udpt {};
|
||||||
wol = callPackage ./wol {};
|
wol = callPackage ./wol {};
|
||||||
|
snapraid = callPackage ./snapraid {};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -24,8 +24,8 @@ in buildPythonPackage rec {
|
|||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "krebscode";
|
owner = "krebscode";
|
||||||
repo = "elchhub";
|
repo = "elchhub";
|
||||||
rev = "2f499c1";
|
rev = "58707c6";
|
||||||
sha256 = "1lbql3lx7i3ynsjanfy9vln6795rb56n9xq9vkb7xbml60gmn1wg";
|
sha256 = "04spbcr660dxyc4jvrai094na25zizd2cfi36jz19lahb0k66lqm";
|
||||||
};
|
};
|
||||||
meta = {
|
meta = {
|
||||||
homepage = https://github.com/krebscode/elchhub;
|
homepage = https://github.com/krebscode/elchhub;
|
||||||
|
Loading…
Reference in New Issue
Block a user