Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
lassulus 2017-09-20 12:15:51 +02:00
commit dcde03342c
14 changed files with 155 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
krebs/1systems/wolf/config.nix
View File

@ -1,6 +1,7 @@
{ config, pkgs, ... }:
let
shack-ip = config.krebs.build.host.nets.shack.ip4.addr;
influx-host = "127.0.0.1";
in
{
imports = [
@ -23,6 +24,58 @@ in
<stockholm/krebs/2configs/shack/muell_caller.nix>
<stockholm/krebs/2configs/shack/radioactive.nix>
<stockholm/krebs/2configs/shack/share.nix>
{
systemd.services.telegraf.path = [ pkgs.net_snmp ]; # for snmptranslate
#systemd.services.telegraf.environment = {
# "MIBDIRS" : ""; # extra mibs like ADSL
#};
services.telegraf = {
enable = true;
extraConfig = {
inputs = {
snmp = {
agents = [ "10.0.1.3:161" ];
version = 2;
community = "shack";
name = "snmp";
field = [
{
name = "hostname";
oid = "RFC1213-MIB::sysName.0";
is_tag = true;
}
{
name = "load-percent"; #cisco
oid = ".1.3.6.1.4.1.9.9.109.1.1.1.1.4.9";
}
{
name = "uptime";
oid = "DISMAN-EVENT-MIB::sysUpTimeInstance";
}
];
table = [{
name = "snmp";
inherit_tags = [ "hostname" ];
oid = "IF-MIB::ifXTable";
field = [{
name = "ifName";
oid = "IF-MIB::ifName";
is_tag = true;
}];
}];
};
};
outputs = {
influxdb = {
urls = [ "http://${influx-host}:8086" ];
database = "telegraf";
write_consistency = "any";
timeout = "5s";
};
};
};
};
}
];
# use your own binary cache, fallback use cache.nixos.org (which is used by
@ -86,6 +139,9 @@ in
boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/vda";
# without it `/nix/store` is not added grub paths
boot.loader.grub.copyKernels = true;
fileSystems."/" = { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; };
swapDevices = [
@ -100,6 +156,7 @@ in
users.extraUsers.root.openssh.authorizedKeys.keys = [
config.krebs.users.ulrich.pubkey
config.krebs.users.makefu-omo.pubkey
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDb9NPa2Hf51afcG1H13UPbE5E02J8aC9a1sGCRls592wAVlQbmojYR1jWDPA2m32Bsyv0ztqi81zDyndWWZPQVJVBk00VjYBcgk6D5ifqoAuWLzfuHJPWZGOvBf/U74/LNFNUkj1ywjneK7HYTRPXrRBBfBSQNmQzkvue7s599L2vdueZKyjNsMpx2m6nm2SchaMuDskSQut/168JgU1l4M8BeT68Bo4WdelhBYnhSI1a59FGkgdu2SCjyighLQRy2sOH3ksnkHWENPkA+wwQOlKl7R3DsEybrNd4NU9FSwFDyDmdhfv5gJp8UGSFdjAwx43+8zM5t5ruZ25J0LnVb0PuTuRA00UsW83MkLxFpDQLrQV08tlsY6iGrqxP67C3VJ6t4v6oTp7/vaRLhEFc1PhOLh+sZ18o8MLO+e2rGmHGHQnSKfBOLUvDMGa4jb01XBGjdnIXLOkVo79YR5jZn7jJb2gTZ95OD6bWSDADoURSuwuLa7kh4ti1ItAKuhkIvbuky3rRVvQEc92kJ6aNUswIUXJa0K2ibbIY6ycKAA3Ljksl3Mm9KzOn6yc/i/lSF+SOrTGhabPJigKkIoqKIwnV5IU3gkfsxPQJOBMPqHDGAOeYQe3WpWedEPYuhQEczw4exMb9TkNE96F71PzuQPJDl5sPAWyPLeMKpy5XbfRiF2by4nxN3ZIQvjtoyVkjNV+qM0q0yKBzLxuRAEQOZ2yCEaBudZQkQiwHD97H2vu4SRQ/2aOie1XiOnmdbQRDZSO3BsoDK569K1w+gDfSnqY7zVUMj6tw+uKx6Gstck5lbvYMtdWKsfPv/pDM8eyIVFLL93dKTX+ertcQj6xDwLfOiNubE5ayFXhYkjwImV6NgfBuq+3hLK0URP2rPlOZbbZTQ0WlKD6CCRZPMSZCU9oD2zYfqpvRArBUcdkAwGePezORkfJQLE6mYEJp6pdFkJ/IeFLbO6M0lZVlfnpzAC9kjjkMCRofZUETcFSppyTImCbgo3+ok59/PkNU5oavBXyW80ue2tWHr08HX/QALNte3UITmIIlU6SFMCPMWJqadK1eDPWfJ4H4iDXRNn3D5wqN++iMloKvpaj0wieqXLY4+YfvNTNr177OU48GEWW8DnoEkbpwsCbjPxznGDQhdDqdYyMY/fDgRQReKITvKYGHRzesGysw5cKsp9LEfXD0R6WE2TeiiENla5AWzTgXJB0AyZEcOiIfqOgT9Nr9S8q5gc/BdA7P+jhGGJgEHhV3dVlfIZ7pmZc27Yu7UTQ0lbAKWqcMSTOdne+QL6ILzbvLrQwdvax4tQdm5opfU16SrOox1AMwAbkdq84z6uJqYVx3cUXfMJgTyDNrVv3or root@plattenschwein" # for backup
];
time.timeZone = "Europe/Berlin";

4
krebs/2configs/shack/muell_caller.nix
View File

@ -6,8 +6,8 @@ let
name = "muell_caller-2017-06-01";
src = pkgs.fetchgit {
url = "https://github.com/shackspace/muell_caller/";
rev = "bbd4009";
sha256 = "1bfnfl2vdh0p5wzyz5p48qh04vvsg2445avg86fzhzragx25fqv0";
rev = "ee4e499";
sha256 = "0q1v07q633sbqg4wkgf0zya2bnqrikpyjhzp05iwn2vcs8rvsi3k";
};
buildInputs = [
(pkgs.python3.withPackages (pythonPackages: with pythonPackages; [

2
makefu/1systems/gum/config.nix
View File

@ -40,7 +40,7 @@ in {
# services
<stockholm/makefu/2configs/share/gum.nix>
<stockholm/makefu/2configs/sabnzbd.nix>
<stockholm/makefu/2configs/torrent.nix>
# <stockholm/makefu/2configs/torrent.nix>
<stockholm/makefu/2configs/iodined.nix>
<stockholm/makefu/2configs/vpn/openvpn-server.nix>
<stockholm/makefu/2configs/dnscrypt/server.nix>

4
makefu/1systems/omo/config.nix
View File

@ -60,6 +60,7 @@ in {
<stockholm/makefu/2configs/stats/nodisk-client.nix>
# logs to influx
<stockholm/makefu/2configs/stats/external/aralast.nix>
<stockholm/makefu/2configs/stats/telegraf>
# services
<stockholm/makefu/2configs/syncthing.nix>
@ -77,6 +78,9 @@ in {
## as long as pyload is not in nixpkgs:
# docker run -d -v /var/lib/pyload:/opt/pyload/pyload-config -v /media/crypt0/pyload:/opt/pyload/Downloads --name pyload --restart=always -p 8112:8000 -P writl/pyload
# Temporary:
<stockholm/makefu/2configs/temp/rst-issue.nix>
];
makefu.full-populate = true;
makefu.server.primary-itf = primaryInterface;

1
makefu/1systems/x/config.nix
View File

@ -56,7 +56,6 @@ with import <stockholm/lib>;
<stockholm/makefu/2configs/git/brain-retiolum.nix>
<stockholm/makefu/2configs/tor.nix>
<stockholm/makefu/2configs/vpn/vpngate.nix>
<stockholm/makefu/2configs/steam.nix>
# <stockholm/makefu/2configs/buildbot-standalone.nix>
# Hardware

13
makefu/2configs/printer.nix
View File

@ -14,17 +14,20 @@ in {
# scanners are printers just in reverse anyway
services.saned.enable = true;
users.users."${mainUser}".extraGroups = [ "scanner" ];
users.users."${mainUser}".extraGroups = [ "scanner" "lp" ];
hardware.sane = {
enable = true;
extraBackends = [ pkgs.samsungUnifiedLinuxDriver ];
extraBackends = [ ];
# $ scanimage -p --format=jpg --mode=Gray --source="Automatic Document Feeder" -v --batch="lol%d.jpg" --resolution=150
# requires 'sane-extra', scan via:
extraConfig."magicolor" = ''
net 10.42.20.30 0x2098
''; # 10.42.20.30: uhrenkind.shack magicolor 1690mf
#extraConfig."magicolor" = ''
# net 10.42.20.30 0x2098
#''; # 10.42.20.30: uhrenkind.shack magicolor 1690mf
extraConfig."xerox_mfp" = ''
tcp 192.168.1.5
''; #home printer SCX-3205W
};
}

20
makefu/2configs/stats/telegraf/default.nix Normal file
View File

@ -0,0 +1,20 @@
{...}:
let
url = "http://localhost:8086";
in {
imports = [
./europastats.nix
];
services.telegraf = {
enable = true;
extraConfig = {
agent.debug = true;
outputs = {
influxdb = [{
urls = [ url ];
database = "telegraf";
}];
};
};
};
}

43
makefu/2configs/stats/telegraf/europastats.nix Normal file
View File

@ -0,0 +1,43 @@
{ pkgs, ...}:
let
pkg = with pkgs.python3Packages;buildPythonPackage rec {
rev = "be31da7";
name = "europastats-${rev}";
propagatedBuildInputs = [
requests2
docopt
];
src = pkgs.fetchgit {
url = "http://cgit.euer.krebsco.de/europastats";
inherit rev;
sha256 = "0qj18vgj9nm6aisyqhk3iz3rf8xp7mn5jc6sfylcaw588a9sjfvc";
};
};
in {
services.telegraf.extraConfig.inputs.exec = [
{
commands = [ "${pkg}/bin/europa-attractions"];
timeout = "1m";
data_format = "json";
name_override = "europawaiting";
interval = "1m";
tag_keys = [
"status"
"type"
"name"
];
}
{
commands = [ "${pkg}/bin/europa-weather"];
timeout = "20s";
data_format = "json";
name_override = "europaweather";
interval = "10m";
tag_keys = [
"type"
"name"
"offset"
];
}
];
}

1
makefu/2configs/tools/all.nix
View File

@ -7,6 +7,7 @@
./extra-gui.nix
./games.nix
./media.nix
./scanner-tools.nix
./sec.nix
./sec-gui.nix
./studio.nix

6
makefu/2configs/tools/games.nix
View File

@ -1,8 +1,10 @@
{ pkgs, ... }:
{
krebs.per-user.makefu.packages = with pkgs; [
steam
imports = [
./steam.nix
];
users.users.makefu.packages = with pkgs; [
games-user-env
];
}

7
makefu/2configs/tools/scanner-tools.nix Normal file
View File

@ -0,0 +1,7 @@
{
# ln -s /run/current-system/sw/bin/xsane ~/.gimp-2.8/plug-ins/xsane
nixpkgs.config.packageOverrides = pkgs: {
xsaneGimp = pkgs.xsane.override { gimpSupport = true; };
};
}

6
makefu/2configs/steam.nix → makefu/2configs/tools/steam.nix
View File

@ -1,6 +1,10 @@
{pkgs, ...}:
{
environment.systemPackages = [ pkgs.steam ];
environment.systemPackages = [
(pkgs.steam.override {
newStdcpp = true;
})
];
hardware.opengl.driSupport32Bit = true;
hardware.pulseaudio.support32Bit = true;
}

3
makefu/2configs/virtualisation/docker.nix
View File

@ -1,8 +1,9 @@
{ pkgs, ... }:
{ pkgs, config, ... }:
{
virtualisation.docker.enable = true;
environment.systemPackages = with pkgs;[
docker
docker_compose
];
users.extraUsers.${config.krebs.build.user.name}.extraGroups = [ "docker" ];
}

2
makefu/2configs/vncserver.nix
View File

@ -33,7 +33,7 @@ in {
serviceConfig = {
User = "nobody";
ExecStart = "${pkgs.novnc}/bin/launch-novnc.sh --listen ${toString web_port} --vnc localhost:${toString vnc_port}";
PrivateTmp = true;
PrivateTmp = true;
};
};
};