Merge remote-tracking branch 'gum/master'

This commit is contained in:
lassulus 2017-11-10 22:34:50 +01:00
commit 4c083777dd
8 changed files with 96 additions and 15 deletions

View File

@ -26,9 +26,13 @@ in
<stockholm/krebs/2configs/shack/share.nix> <stockholm/krebs/2configs/shack/share.nix>
{ {
systemd.services.telegraf.path = [ pkgs.net_snmp ]; # for snmptranslate systemd.services.telegraf.path = [ pkgs.net_snmp ]; # for snmptranslate
#systemd.services.telegraf.environment = { systemd.services.telegraf.environment = {
# "MIBDIRS" : ""; # extra mibs like ADSL MIBDIRS = pkgs.fetchgit {
#}; url = "http://git.shackspace.de/makefu/modem-mibs.git";
sha256 =
"a4244aa43ddd6e3ef9e64bb80f4ee952f68232aa008d3da9c78e3b627e5675c8";
}; # extra mibs like ADSL
};
services.telegraf = { services.telegraf = {
enable = true; enable = true;
extraConfig = { extraConfig = {

View File

@ -545,8 +545,8 @@ with import <stockholm/lib>;
}; };
nets = rec { nets = rec {
internet = { internet = {
ip4.addr = "188.68.40.19"; ip4.addr = "185.194.143.140";
ip6.addr = "2a03:4000:17:2df::1"; ip6.addr = "2a03:4000:1c:43f::1";
aliases = [ aliases = [
"gum.i" "gum.i"
]; ];

View File

@ -38,12 +38,12 @@ let
${optionalString (cfg.enableXMLRPC ) '' ${optionalString (cfg.enableXMLRPC ) ''
# prepare socket and set permissions. rtorrent user is part of group nginx # prepare socket and set permissions. rtorrent user is part of group nginx
# TODO: configure a shared torrent group # TODO: configure a shared torrent group
execute_nothrow = rm,${cfg.xmlrpc-socket} execute.nothrow = rm,${cfg.xmlrpc-socket}
scgi_local = ${cfg.xmlrpc-socket} scgi_local = ${cfg.xmlrpc-socket}
schedule = scgi_permission,0,0,"execute.nothrow=chmod,\"ug+w,o=\",${cfg.xmlrpc-socket}" schedule = scgi_permission,0,0,"execute.nothrow=chmod,\"ug+w,o=\",${cfg.xmlrpc-socket}"
''} ''}
system.file_allocate.set = ${if cfg.preAllocate then "yes" else "no"} system.file.allocate.set = ${if cfg.preAllocate then "yes" else "no"}
# Prepare systemd logging # Prepare systemd logging
log.open_file = "rtorrent-systemd", ${systemd-logfile} log.open_file = "rtorrent-systemd", ${systemd-logfile}

View File

@ -0,0 +1,38 @@
{ pkgs, fetchFromGitHub, ... }:
with pkgs.python3Packages;
buildPythonPackage rec {
pname = "internetarchive";
version = "1.7.3";
name = "${pname}-${version}";
propagatedBuildInputs = [
requests
jsonpatch
docopt
clint
six
schema
backports_csv
];
# check only works when cloned from git repo
doCheck = false;
checkInputs = [
pytest
responses
];
prePatch = ''
sed -i "s/'schema.*'/'schema>=0.4.0'/" setup.py
'';
src = fetchPypi {
inherit pname version;
sha256 = "0x3saklabdx7qrr11h5bjfd75hfbih7pw5gvl2784zvvvrqrz45g";
};
meta = with stdenv.lib; {
description = "python library and cli for uploading files to internet archive";
license = licenses.agpl3;
};
}

View File

@ -0,0 +1,26 @@
{ pkgs, stdenv, fetchFromGitHub }:
## use with:
# . $(command -v slog.sh)
stdenv.mkDerivation rec {
name = "slog-${version}";
version = "2017-10-27";
src = fetchFromGitHub {
owner = "makefu";
repo = "slog";
rev = "50367c3";
sha256 = "16wlh8xz430101lrxmgl2wangbbhvyj4pg8k5aibnh76sgj6x77r";
};
installPhase = ''
mkdir -p $out/bin
install -m755 slog.sh $out/bin
'';
meta = with stdenv.lib; {
description = "POSIX shell logging";
license = licenses.mit;
};
}

View File

@ -2,16 +2,22 @@
with import <stockholm/lib>; with import <stockholm/lib>;
let let
external-mac = "3a:66:48:8e:82:b2"; # hw-specific
external-mac = "2a:c5:6e:d2:fc:7f";
main-disk = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-0";
external-gw = "185.194.140.1";
# single partition, label "nixos"
# cd /var/src; curl https://github.com/nixos/nixpkgs/tarball/809cf38 -L | tar zx ; mv * nixpkgs && touch .populate
# static
external-ip = config.krebs.build.host.nets.internet.ip4.addr; external-ip = config.krebs.build.host.nets.internet.ip4.addr;
external-ip6 = config.krebs.build.host.nets.internet.ip6.addr; external-ip6 = config.krebs.build.host.nets.internet.ip6.addr;
external-gw = "188.68.40.1";
external-gw6 = "fe80::1"; external-gw6 = "fe80::1";
external-netmask = 22; external-netmask = 22;
external-netmask6 = 64; external-netmask6 = 64;
ext-if = "et0"; # gets renamed on the fly
internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr; internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr;
main-disk = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-0"; ext-if = "et0"; # gets renamed on the fly
in { in {
imports = [ imports = [
<stockholm/makefu> <stockholm/makefu>
@ -19,6 +25,7 @@ in {
<stockholm/makefu/2configs/headless.nix> <stockholm/makefu/2configs/headless.nix>
<stockholm/makefu/2configs/fs/single-partition-ext4.nix> <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
# <stockholm/makefu/2configs/smart-monitor.nix> # <stockholm/makefu/2configs/smart-monitor.nix>
<stockholm/makefu/2configs/git/cgit-retiolum.nix> <stockholm/makefu/2configs/git/cgit-retiolum.nix>
<stockholm/makefu/2configs/backup.nix> <stockholm/makefu/2configs/backup.nix>
# <stockholm/makefu/2configs/mattermost-docker.nix> # <stockholm/makefu/2configs/mattermost-docker.nix>

View File

@ -31,7 +31,10 @@ in {
}); });
pwqgen-ger = callPackage <stockholm/krebs/5pkgs/simple/passwdqc-utils> { pwqgen-ger = callPackage <stockholm/krebs/5pkgs/simple/passwdqc-utils> {
wordset-file = super.pkgs.fetchurl { wordset-file = super.pkgs.fetchurl {
url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ; urls = [
https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c
https://archive.org/download/nixos-stockholm-tarballs/pviar5j1gxiqcf3l34b4n2pil06xc8zf-wordset_4k.c
];
sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb"; sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb";
}; };
}; };

View File

@ -11,9 +11,12 @@ let
then "buildbot" then "buildbot"
else "makefu"; else "makefu";
_file = <stockholm> + "/makefu/1systems/${name}/source.nix"; _file = <stockholm> + "/makefu/1systems/${name}/source.nix";
ref = "809cf38"; # unstable @ 2017-10-07 ref = "e3d14bb"; # unstable @ 2017-11-02
# + ruby stuff (2f0b17e4be9,55a952be5b5) # + ruby stuff: 2f0b17e4be9 55a952be5b5
# + mitmproxy fix (360a5efd,ef52c95b) # + jsbeautifier: c60bee3
# + mitmproxy fix: a0f7cedfae31
# + synergy fix: 5e6c76bc1
# + snapraid fix: e3d14bb1
in in
evalSource (toString _file) [ evalSource (toString _file) [