m *: minor changes

This commit is contained in:
makefu 2016-10-19 12:31:13 +02:00
parent cd506f30fa
commit ccd89b19f3
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
14 changed files with 105 additions and 8 deletions

View File

@ -24,7 +24,9 @@ in {
../2configs/fs/single-partition-ext4.nix ../2configs/fs/single-partition-ext4.nix
../2configs/smart-monitor.nix ../2configs/smart-monitor.nix
../2configs/tinc/retiolum.nix ../2configs/tinc/retiolum.nix
../2configs/filepimp-share.nix
]; ];
krebs.build.host = config.krebs.hosts.filepimp; krebs.build.host = config.krebs.hosts.filepimp;
# AMD N54L # AMD N54L
boot = { boot = {
@ -76,6 +78,9 @@ in {
(xfsmount "j2" (part1 jDisk2)) // (xfsmount "j2" (part1 jDisk2)) //
(xfsmount "par0" (part1 jDisk3)) (xfsmount "par0" (part1 jDisk3))
; ;
networking.firewall.trustedInterfaces = [ primary-interface ];
services.wakeonlan.interfaces = [ services.wakeonlan.interfaces = [
{ {
interface = primary-interface; interface = primary-interface;

View File

@ -22,6 +22,7 @@ in {
../2configs/tinc/retiolum.nix ../2configs/tinc/retiolum.nix
../2configs/urlwatch.nix ../2configs/urlwatch.nix
../2configs/torrent.nix ../2configs/torrent.nix
../2configs/graphite-standalone.nix
../2configs/sabnzbd.nix ../2configs/sabnzbd.nix
../2configs/opentracker.nix ../2configs/opentracker.nix

View File

@ -44,6 +44,7 @@ in {
../2configs/fs/sda-crypto-root.nix ../2configs/fs/sda-crypto-root.nix
../2configs/zsh-user.nix ../2configs/zsh-user.nix
../2configs/urlwatch.nix ../2configs/urlwatch.nix
../2configs/backup.nix
../2configs/exim-retiolum.nix ../2configs/exim-retiolum.nix
../2configs/smart-monitor.nix ../2configs/smart-monitor.nix
../2configs/mail-client.nix ../2configs/mail-client.nix

View File

@ -55,6 +55,10 @@ in {
# rt2870 with nonfree creates wlp2s0 from wlp0s20u2 # rt2870 with nonfree creates wlp2s0 from wlp0s20u2
# not explicitly setting the interface results in wpa_supplicant to crash # not explicitly setting the interface results in wpa_supplicant to crash
networking.wireless.interfaces = [ "wlp2s0" ]; networking.wireless.interfaces = [ "wlp2s0" ];
networking.interfaces.virbr1.ip4 = [{
address = "10.8.8.11";
prefixLength = 24;
}];
# nuc hardware # nuc hardware

View File

@ -16,13 +16,15 @@ in {
../2configs/bepasty-dual.nix ../2configs/bepasty-dual.nix
../2configs/iodined.nix ../2configs/iodined.nix
../2configs/backup.nix
# other nginx # other nginx
../2configs/nginx/euer.wiki.nix ../2configs/nginx/euer.wiki.nix
../2configs/nginx/euer.blog.nix ../2configs/nginx/euer.blog.nix
../2configs/nginx/euer.test.nix ../2configs/nginx/euer.test.nix
#../2configs/elchos/stats.nix
# collectd # collectd
# ../2configs/collectd/collectd-base.nix # ../2configs/collectd/collectd-base.nix

View File

@ -63,11 +63,10 @@
# configure pulseAudio to provide a HDMI sink as well # configure pulseAudio to provide a HDMI sink as well
networking.firewall.enable = true; networking.firewall.enable = true;
networking.firewall.allowedTCPPorts = [ 80 24800 26061 8000 ]; networking.firewall.allowedTCPPorts = [ 80 24800 26061 8000 3000 ];
networking.firewall.allowedUDPPorts = [ 665 26061 ]; networking.firewall.allowedUDPPorts = [ 665 26061 ];
krebs.build.host = config.krebs.hosts.x; krebs.build.host = config.krebs.hosts.x;
krebs.hosts.omo.nets.retiolum.via.ip4.addr = "192.168.1.11";
krebs.tinc.retiolum.connectTo = [ "omo" "gum" "prism" ]; krebs.tinc.retiolum.connectTo = [ "omo" "gum" "prism" ];

View File

@ -82,7 +82,6 @@ in
URxvt.perl-ext: default,url-select URxvt.perl-ext: default,url-select
URxvt.keysym.M-u: perl:url-select:select_next URxvt.keysym.M-u: perl:url-select:select_next
#URxvt.url-select.launcher: firefox -new-tab
URxvt.url-select.launcher: chromium URxvt.url-select.launcher: chromium
URxvt.url-select.underline: true URxvt.url-select.underline: true
URxvt.searchable-scrollback: CM-s URxvt.searchable-scrollback: CM-s

View File

@ -0,0 +1,33 @@
{ config, lib, pkgs, ... }:
with config.krebs.lib;
let
hostname = config.krebs.build.host.name;
in {
users.users.smbguest = {
name = "smbguest";
uid = config.ids.uids.smbguest;
description = "smb guest user";
home = "/var/empty";
};
services.samba = {
enable = true;
shares = {
media = {
path = "/media/";
"read only" = "no";
browseable = "yes";
"guest ok" = "yes";
};
};
extraConfig = ''
guest account = smbguest
map to guest = bad user
# disable printing
load printers = no
printing = bsd
printcap name = /dev/null
disable spoolss = yes
'';
};
}

View File

@ -5,7 +5,7 @@ with config.krebs.lib;
imports = [ ./tp-x2x0.nix ]; imports = [ ./tp-x2x0.nix ];
boot = { boot = {
kernelModules = [ "kvm-intel" "acpi_call" "tpm-rng" ]; kernelModules = [ "kvm-intel" "acpi_call" "tpm-rng" "tp_smapi" ];
extraModulePackages = [ config.boot.kernelPackages.tp_smapi ]; extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
}; };
hardware.opengl.extraPackages = [ pkgs.vaapiIntel pkgs.vaapiVdpau ]; hardware.opengl.extraPackages = [ pkgs.vaapiIntel pkgs.vaapiVdpau ];

View File

@ -5,8 +5,9 @@ let
domain = "io.krebsco.de"; domain = "io.krebsco.de";
pw = import <secrets/iodinepw.nix>; pw = import <secrets/iodinepw.nix>;
in { in {
networking.firewall.allowedUDPPorts = [ 53 ];
services.iodined = { services.iodine = {
server = { server = {
enable = true; enable = true;
domain = domain; domain = domain;

View File

@ -0,0 +1,28 @@
{ config, pkgs, lib, ... }:
with config.krebs.lib;
let
icecult = pkgs.fetchFromGitHub {
owner = "kraiz";
repo = "icecult";
rev = "1942d43381a97f30111a48725f7532c343a6f4d7";
sha256 = "0l8q7kw3w1kpvmy8hza9vr5liiycivbljkmwpacaifbay5y98z58";
};
in{
krebs.nginx = {
enable = true;
servers.default = {
extraConfig = ''
root ${icecult}/app;
'';
locations = [
(nameValuePair "/rpc" ''
rewrite /rpc/(.*) /$1 break;
proxy_http_version 1.1;
proxy_pass http://10.42.22.163:3121;
'')
];
};
};
}

View File

@ -3,7 +3,7 @@
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
gnuradio-full gnuradio-with-packages
gnuradio-osmosdr gnuradio-osmosdr
gqrx gqrx
]; ];

24
makefu/2configs/solr.nix Normal file
View File

@ -0,0 +1,24 @@
{ config, lib, pkgs, ... }:
# graphite-web on port 8080
# carbon cache on port 2003 (tcp/udp)
with config.krebs.lib;
let
solrHome = "/var/db/solr";
in {
imports = [ ];
users.users.solr = {
home = solrHome;
uid = genid "solr";
createHome = true;
group = "solr";
};
users.groups.solr.gid = genid "solr";
services.solr = {
enable = true;
inherit solrHome;
user = "solr";
group = "solr";
};
}

View File

@ -15,7 +15,7 @@
http://guest:derpi@cvs2svn.tigris.org/svn/cvs2svn/tags/ http://guest:derpi@cvs2svn.tigris.org/svn/cvs2svn/tags/
http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/ http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/
https://github.com/amadvance/snapraid/releases.atom https://github.com/amadvance/snapraid/releases.atom
https://erdgeist.org/gitweb/opentracker/log/ https://erdgeist.org/gitweb/opentracker/commit/
]; ];
}; };
} }