From 818ea249f08846a1b5efdf4cb09ba94e07e44e74 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 19 Jan 2016 20:04:29 +0100 Subject: ma 2 git/cgit: add init-stockholm repo --- makefu/2configs/git/cgit-retiolum.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'makefu') diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix index 35bb169cf..7d85eb8d1 100644 --- a/makefu/2configs/git/cgit-retiolum.nix +++ b/makefu/2configs/git/cgit-retiolum.nix @@ -16,6 +16,9 @@ let desc = "Tinc Advanced Graph Generation"; }; cac = { }; + init-stockholm = { + desc = "Init stuff for stockholm"; + }; }; priv-repos = mapAttrs make-priv-repo { -- cgit v1.2.3 From 1b39a26933966c5da8316f81ae67ff88e56d348d Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 19 Jan 2016 20:37:46 +0100 Subject: ma 2 tinc-basic-retiolum: remove obsolete hosts path - corresponds with defaults --- makefu/2configs/tinc-basic-retiolum.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'makefu') diff --git a/makefu/2configs/tinc-basic-retiolum.nix b/makefu/2configs/tinc-basic-retiolum.nix index 2abf4f188..f49c596fc 100644 --- a/makefu/2configs/tinc-basic-retiolum.nix +++ b/makefu/2configs/tinc-basic-retiolum.nix @@ -4,7 +4,6 @@ with lib; { krebs.retiolum = { enable = true; - hosts = ../../krebs/Zhosts; connectTo = [ "gum" "pigstarter" -- cgit v1.2.3 From 93c217475155f4a7770607b854da9c95ff7b336c Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 13 Jan 2016 12:20:01 +0100 Subject: ma 5 awesomecfg/full: remove volume field --- makefu/5pkgs/awesomecfg/full.cfg | 3 --- 1 file changed, 3 deletions(-) (limited to 'makefu') diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg index 15711a5d5..c1b58aa90 100644 --- a/makefu/5pkgs/awesomecfg/full.cfg +++ b/makefu/5pkgs/awesomecfg/full.cfg @@ -38,8 +38,6 @@ do end) end -- }}} -volwidget = wibox.widget.textbox() -vicious.register(volwidget, vicious.widgets.volume, " $1% ", 2, "Master") -- {{{ Mails widget type local function worker(format,warg) @@ -258,7 +256,6 @@ for s = 1, screen.count() do local right_layout = wibox.layout.fixed.horizontal() right_layout:add(mailwidget) if s == 1 then right_layout:add(wibox.widget.systray()) end - right_layout:add(volwidget) right_layout:add(cpuwidget) right_layout:add(batwidget) right_layout:add(mytextclock) -- cgit v1.2.3 From fbe826ba2ae916b8f8fab1293e302e22a5d0b579 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 18 Jan 2016 12:54:03 +0100 Subject: ma 1 vbob: remove unstable --- makefu/1systems/vbob.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'makefu') diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix index b8c02cb67..d95362919 100644 --- a/makefu/1systems/vbob.nix +++ b/makefu/1systems/vbob.nix @@ -2,9 +2,7 @@ # # { lib, config, pkgs, ... }: -let - pkgs-unst = import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz) {}; -in { +{ krebs.build.host = config.krebs.hosts.vbob; krebs.build.target = "root@10.10.10.220"; imports = @@ -15,14 +13,13 @@ in { # environment ]; + nixpkgs.config.allowUnfree = true; nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; - buildbot = pkgs-unst.buildbot; - buildbot-slave = pkgs-unst.buildbot-slave; }; makefu.buildbot.master = { - enable = true; + enable = false; irc = { enable = true; server = "cd.retiolum"; @@ -30,8 +27,9 @@ in { allowForce = true; }; }; + # services.logstash.enable = true; makefu.buildbot.slave = { - enable = true; + enable = false; masterhost = "localhost"; username = "testslave"; password = "krebspass"; @@ -41,8 +39,8 @@ in { krebs.build.source.git.nixpkgs = { #url = https://github.com/nixos/nixpkgs; - # HTTP Everywhere - rev = "a3974e"; + # HTTP Everywhere + libredir + rev = "8239ac6"; }; fileSystems."/nix" = { device ="/dev/disk/by-label/nixstore"; @@ -56,9 +54,12 @@ in { }; }; environment.systemPackages = with pkgs;[ + fortclientsslvpn buildbot buildbot-slave get + genid + logstash ]; networking.firewall.allowedTCPPorts = [ -- cgit v1.2.3 From 440e78fc9946d3abf74ae1eeeea1532e84fddec6 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 19 Jan 2016 20:26:38 +0100 Subject: makefu: init wbob --- makefu/1systems/wbob.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 makefu/1systems/wbob.nix (limited to 'makefu') diff --git a/makefu/1systems/wbob.nix b/makefu/1systems/wbob.nix new file mode 100644 index 000000000..d6916f006 --- /dev/null +++ b/makefu/1systems/wbob.nix @@ -0,0 +1,19 @@ +{ config, pkgs, ... }: +{ + imports = + [ # Include the results of the hardware scan. + ../2configs/main-laptop.nix + ]; + krebs = { + enable = true; + retiolum.enable = true; + build.host = config.krebs.hosts.wbob; + }; + boot.loader.grub.device = "/dev/sda"; + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" ]; + boot.kernelModules = [ "kvm-intel" ]; + fileSystems."/" = { + device = "/dev/sda1"; + fsType = "ext4"; + }; +} -- cgit v1.2.3 From 69daaa8f3477cdfbe8d0b508c12ee5d976586e11 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 23 Jan 2016 00:22:56 +0100 Subject: ma 2 urlwatch: add acng --- makefu/2configs/urlwatch.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'makefu') diff --git a/makefu/2configs/urlwatch.nix b/makefu/2configs/urlwatch.nix index a83279ba2..f869f5a78 100644 --- a/makefu/2configs/urlwatch.nix +++ b/makefu/2configs/urlwatch.nix @@ -29,6 +29,7 @@ https://pypi.python.org/simple/bepasty/ https://pypi.python.org/simple/xstatic/ http://guest:derpi@cvs2svn.tigris.org/svn/cvs2svn/tags/ + http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/ ]; }; } -- cgit v1.2.3 From d1a371f48b95140279528c2a2ff619d39c177a7c Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 27 Jan 2016 22:00:50 +0100 Subject: ma 1 omo: add samba share --- makefu/1systems/omo.nix | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 5 deletions(-) (limited to 'makefu') diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix index 552af4e4f..9162f2ed4 100644 --- a/makefu/1systems/omo.nix +++ b/makefu/1systems/omo.nix @@ -32,9 +32,35 @@ in { ../3modules ]; # services.openssh.allowSFTP = false; - krebs.build.host = config.krebs.hosts.omo; krebs.build.source.git.nixpkgs.rev = "d0e3cca04edd5d1b3d61f188b4a5f61f35cdf1ce"; + # samba share /media/crypt1/share + users.extraUsers.smbguest = { + name = "smbguest"; + uid = config.ids.uids.smbguest; + description = "smb guest user"; + home = "/var/empty"; + }; + services.samba = { + enable = true; + shares = { + winshare = { + path = "/media/crypt1/share"; + "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 + ''; + }; # copy config from to /var/lib/sabnzbd/ services.sabnzbd.enable = true; systemd.services.sabnzbd.environment.SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; @@ -97,9 +123,22 @@ in { extraModulePackages = [ ]; }; - networking.firewall.allowedUDPPorts = [ 655 ]; - # 8080: sabnzbd - networking.firewall.allowedTCPPorts = [ 80 655 8080 ]; + networking.firewall.allowedUDPPorts = [ + # tinc + 655 + # samba + 137 138 + ]; + networking.firewall.allowedTCPPorts = [ + # nginx + 80 + # tinc + 655 + # samba + 445 139 + # sabnzbd + 8080 + ]; hardware.enableAllFirmware = true; hardware.cpu.amd.updateMicrocode = true; @@ -107,5 +146,5 @@ in { zramSwap.enable = true; zramSwap.numDevices = 2; - + krebs.build.host = config.krebs.hosts.omo; } -- cgit v1.2.3 From f6a3c1f3d6b013641b077baf8ddb3a78e75d8b95 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 27 Jan 2016 22:20:32 +0100 Subject: ma 1 omo: cleanup, fix firewalling --- makefu/1systems/omo.nix | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) (limited to 'makefu') diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix index 9162f2ed4..19183fea8 100644 --- a/makefu/1systems/omo.nix +++ b/makefu/1systems/omo.nix @@ -31,11 +31,19 @@ in { ../2configs/nginx/omo-share.nix ../3modules ]; + networking.firewall.trustedInterfaces = [ "enp3s0" ]; + # udp:137 udp:138 tcp:445 tcp:139 - samba, allowed in local net + # tcp:80 - nginx for sharing files + # tcp:655 udp:655 - tinc + # tcp:8080 - sabnzbd + networking.firewall.allowedUDPPorts = [ 655 ]; + networking.firewall.allowedTCPPorts = [ 80 655 8080 ]; + # services.openssh.allowSFTP = false; krebs.build.source.git.nixpkgs.rev = "d0e3cca04edd5d1b3d61f188b4a5f61f35cdf1ce"; # samba share /media/crypt1/share - users.extraUsers.smbguest = { + users.users.smbguest = { name = "smbguest"; uid = config.ids.uids.smbguest; description = "smb guest user"; @@ -61,6 +69,7 @@ in { disable spoolss = yes ''; }; + # copy config from to /var/lib/sabnzbd/ services.sabnzbd.enable = true; systemd.services.sabnzbd.environment.SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; @@ -93,6 +102,7 @@ in { ${pkgs.hdparm}/sbin/hdparm -y ${disk} '') allDisks); + # crypto unlocking boot = { initrd.luks = { devices = let @@ -123,23 +133,6 @@ in { extraModulePackages = [ ]; }; - networking.firewall.allowedUDPPorts = [ - # tinc - 655 - # samba - 137 138 - ]; - networking.firewall.allowedTCPPorts = [ - # nginx - 80 - # tinc - 655 - # samba - 445 139 - # sabnzbd - 8080 - ]; - hardware.enableAllFirmware = true; hardware.cpu.amd.updateMicrocode = true; -- cgit v1.2.3