From 2db6515213c0d4867770ff236f2005eec494010d Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 4 Jul 2016 00:13:25 +0200 Subject: use buildbot from 15.09 --- krebs/3modules/buildbot/master.nix | 9 ++++++++- krebs/5pkgs/default.nix | 8 -------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix index c365798f3..f23981f44 100644 --- a/krebs/3modules/buildbot/master.nix +++ b/krebs/3modules/buildbot/master.nix @@ -2,7 +2,14 @@ with config.krebs.lib; let - buildbot = pkgs.buildbot; + + nixpkgs-1509 = import (pkgs.fetchFromGitHub { + owner = "NixOS"; repo = "nixpkgs-channels"; + rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda"; + sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73"; + }) {}; + + buildbot = nixpkgs-1509.buildbot; buildbot-master-config = pkgs.writeText "buildbot-master.cfg" '' # -*- python -*- from buildbot.plugins import * diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index f0bda0ee1..cdab64212 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -38,14 +38,6 @@ with config.krebs.lib; ReaktorPlugins = callPackage ./Reaktor/plugins.nix {}; - buildbot = callPackage { - inherit (pkgs.pythonPackages) twisted jinja2; - dateutil = pkgs.pythonPackages.dateutil_1_5; - sqlalchemy_migrate_0_7 = pkgs.pythonPackages.sqlalchemy_migrate_func (pkgs.pythonPackages.sqlalchemy7.override { - doCheck = false; - }); - }; - # XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d symlinkJoin = { name, paths, ... }@args: let x = pkgs.symlinkJoin args; -- cgit v1.2.3 From 54e6eecc9282b4a6e7ae06a0130a02684864afb9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 5 Jul 2016 09:15:56 +0200 Subject: l 3 power-action: add option for battery --- lass/3modules/power-action.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lass/3modules/power-action.nix b/lass/3modules/power-action.nix index 3116514a8..30875c9a9 100644 --- a/lass/3modules/power-action.nix +++ b/lass/3modules/power-action.nix @@ -12,6 +12,10 @@ let api = { enable = mkEnableOption "power-action"; + battery = mkOption { + type = types.str; + default = "BAT0"; + }; user = mkOption { type = types.user; default = { @@ -80,11 +84,11 @@ let "if [ $power -ge ${toString plan.lowerLimit} ] && [ $power -le ${toString plan.upperLimit} ] ${charging_check plan}; then ${plan.action}; fi"; powerlvl = pkgs.writeDash "powerlvl" '' - cat /sys/class/power_supply/BAT0/capacity + cat /sys/class/power_supply/${cfg.battery}/capacity ''; state = pkgs.writeDash "state" '' - if [ "$(cat /sys/class/power_supply/BAT0/status)" = "Discharging" ] + if [ "$(cat /sys/class/power_supply/${cfg.battery}/status)" = "Discharging" ] then echo "false" else echo "true" fi -- cgit v1.2.3 From e578dfcd67d62add1a9c016af7794309a2dc2d62 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 5 Jul 2016 09:18:16 +0200 Subject: l: build module from 2/umts --- lass/1systems/mors.nix | 11 +++++- lass/1systems/uriel.nix | 6 ++++ lass/2configs/umts.nix | 62 -------------------------------- lass/3modules/default.nix | 1 + lass/3modules/umts.nix | 91 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 108 insertions(+), 63 deletions(-) delete mode 100644 lass/2configs/umts.nix create mode 100644 lass/3modules/umts.nix diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index f26f0ed5f..d065d4dfa 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -25,7 +25,6 @@ ../2configs/c-base.nix ../2configs/mail.nix ../2configs/krebs-pass.nix - ../2configs/umts.nix ../2configs/repo-sync.nix { #risk of rain port @@ -54,6 +53,16 @@ # package = pkgs.postgresql; # }; #} + { + lass.umts = { + enable = true; + modem = "/dev/serial/by-id/usb-Lenovo_F5521gw_38214921FBBBC7B0-if09"; + initstrings = '' + Init1 = AT+CFUN=1 + Init2 = AT+CGDCONT=1,"IP","pinternet.interkom.de","",0,0 + ''; + }; + } ]; krebs.build.host = config.krebs.hosts.mors; diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix index 92996c181..6b56419d7 100644 --- a/lass/1systems/uriel.nix +++ b/lass/1systems/uriel.nix @@ -16,6 +16,12 @@ with builtins; ../2configs/bitlbee.nix ../2configs/weechat.nix ../2configs/skype.nix + { + lass.umts = { + enable = true; + modem = "/dev/serial/by-id/usb-HUAWEI_Technologies_HUAWEI_Mobile-if00-port0"; + }; + } ]; krebs.build.host = config.krebs.hosts.uriel; diff --git a/lass/2configs/umts.nix b/lass/2configs/umts.nix deleted file mode 100644 index c1fce9ea2..000000000 --- a/lass/2configs/umts.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ config, lib, pkgs, ... }: - -with config.krebs.lib; - -let - nixpkgs-1509 = import (pkgs.fetchFromGitHub { - owner = "NixOS"; repo = "nixpkgs-channels"; - rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda"; - sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73"; - }) {}; - - wvdial = nixpkgs-1509.wvdial; # https://github.com/NixOS/nixpkgs/issues/16113 - - modem-device = "/dev/serial/by-id/usb-Lenovo_F5521gw_38214921FBBBC7B0-if09"; - - # TODO: currently it is only netzclub - umts-bin = pkgs.writeScriptBin "umts" '' - #!/bin/sh - set -euf - systemctl stop wpa_supplicant - systemctl start umts - trap "systemctl stop umts && systemctl start wpa_supplicant;trap - INT TERM EXIT;exit" INT TERM EXIT - echo nameserver 8.8.8.8 | tee -a /etc/resolv.conf - journalctl -xfu umts - ''; - - wvdial-defaults = '' - Modem = ${modem-device} - Init1 = AT+CFUN=1 - Init2 = AT+CGDCONT=1,"IP","pinternet.interkom.de","",0,0 - Baud = 460800 - phone= *99# - Username = netzclub - Password = netzclub - Stupid Mode = 1 - Idle Seconds = 0 - ''; - - - out = { - environment.shellAliases = { - umts = "sudo ${umts-bin}/bin/umts"; - }; - - security.sudo.extraConfig = '' - lass ALL= (root) NOPASSWD: ${umts-bin}/bin/umts - ''; - - environment.wvdial.dialerDefaults = wvdial-defaults; - - systemd.services.umts = { - description = "UMTS wvdial Service"; - serviceConfig = { - Type = "simple"; - Restart = "always"; - RestartSec = "10s"; - ExecStart = "${wvdial}/bin/wvdial -n"; - }; - }; - }; -in out - diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix index b3037205e..6a3b41ca4 100644 --- a/lass/3modules/default.nix +++ b/lass/3modules/default.nix @@ -5,6 +5,7 @@ _: ./folderPerms.nix ./mysql-backup.nix ./power-action.nix + ./umts.nix ./urxvtd.nix ./wordpress_nginx.nix ./xresources.nix diff --git a/lass/3modules/umts.nix b/lass/3modules/umts.nix new file mode 100644 index 000000000..01adc0409 --- /dev/null +++ b/lass/3modules/umts.nix @@ -0,0 +1,91 @@ +{ config, lib, pkgs, ... }: + +with config.krebs.lib; + +let + cfg = config.lass.umts; + + out = { + options.lass.umts = api; + config = lib.mkIf cfg.enable imp; + }; + + api = { + enable = mkEnableOption "umts"; + modem = mkOption { + type = types.str; + default = "/dev/ttyUSB0"; + }; + initstrings = mkOption { + type = types.str; + default = '' + Init1 = ATZ + Init2 = ATQ0 V1 E1 S0=0 &C1 &D2 + ''; + }; + username = mkOption { + type = types.str; + default = "default"; + }; + password = mkOption { + type = types.str; + default = "default"; + }; + }; + + nixpkgs-1509 = import (pkgs.fetchFromGitHub { + owner = "NixOS"; repo = "nixpkgs-channels"; + rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda"; + sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73"; + }) {}; + + wvdial = nixpkgs-1509.wvdial; # https://github.com/NixOS/nixpkgs/issues/16113 + + #modem-device = "/dev/serial/by-id/usb-Lenovo_F5521gw_38214921FBBBC7B0-if09"; + modem-device = "/dev/serial/by-id/usb-HUAWEI_Technologies_HUAWEI_Mobile-if00-port0"; + + # TODO: currently it is only netzclub + umts-bin = pkgs.writeScriptBin "umts" '' + #!/bin/sh + set -euf + systemctl start umts + trap "systemctl stop umts;trap - INT TERM EXIT;exit" INT TERM EXIT + echo nameserver 8.8.8.8 | tee -a /etc/resolv.conf + journalctl -xfu umts + ''; + + wvdial-defaults = '' + Modem = ${cfg.modem} + ${cfg.initstrings} + Modem Type = Analog Modem + Baud = 460800 + phone= *99# + Username = ${cfg.username} + Password = ${cfg.password} + Stupid Mode = 1 + Idle Seconds = 0 + ''; + + imp = { + environment.shellAliases = { + umts = "sudo ${umts-bin}/bin/umts"; + }; + + security.sudo.extraConfig = '' + lass ALL= (root) NOPASSWD: ${umts-bin}/bin/umts + ''; + + environment.wvdial.dialerDefaults = wvdial-defaults; + + systemd.services.umts = { + description = "UMTS wvdial Service"; + serviceConfig = { + Type = "simple"; + Restart = "always"; + RestartSec = "10s"; + ExecStart = "${wvdial}/bin/wvdial -n"; + }; + }; + }; + +in out -- cgit v1.2.3 From f9c561566d1b18bb89f0eff33cdbd0225300ab2f Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 5 Jul 2016 09:18:44 +0200 Subject: l 1 uriel: update boot.loader options --- lass/1systems/uriel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix index 6b56419d7..83553f5ca 100644 --- a/lass/1systems/uriel.nix +++ b/lass/1systems/uriel.nix @@ -39,8 +39,8 @@ with builtins; #loader.grub.version = 2; #loader.grub.device = "/dev/sda"; - loader.gummiboot.enable = true; - loader.gummiboot.timeout = 5; + loader.systemd-boot.enable = true; + loader.timeout = 5; initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; } ]; initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ]; -- cgit v1.2.3 From 8b829fdfa1e90635b1681ec9f466fcdc5d6e8f7e Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 5 Jul 2016 09:19:19 +0200 Subject: l 2: nix.useSandbox -> nix.useChroot --- lass/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 377554514..e3065ba84 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -66,7 +66,7 @@ with config.krebs.lib; }; }; - nix.useSandbox = true; + nix.useChroot = true; users.mutableUsers = false; -- cgit v1.2.3