From ce10f57b3be0042ccf01ed2605ef9911537552cf Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 17 Jan 2016 00:30:00 +0100 Subject: k 5 krebszones: add todo/doc --- krebs/5pkgs/krebszones/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'krebs') diff --git a/krebs/5pkgs/krebszones/default.nix b/krebs/5pkgs/krebszones/default.nix index f6fd672d..9230192b 100644 --- a/krebs/5pkgs/krebszones/default.nix +++ b/krebs/5pkgs/krebszones/default.nix @@ -1,5 +1,10 @@ { lib, pkgs,python3Packages,fetchurl, ... }: +# TODO: Prepare a diff of future and current +## ovh-zone export krebsco.de --config ~/secrets/krebs/cfg.json |sed 's/[ ]\+/ /g' | sort current +## sed 's/[ ]\+/ /g'/etc/zones/krebsco.de | sort > future +## diff future.sorted current.sorted + python3Packages.buildPythonPackage rec { name = "krebszones-${version}"; version = "0.4.4"; -- cgit v1.2.3 From 0c290c98f00b11c8239fea6450667323137c6321 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 18 Jan 2016 12:53:07 +0100 Subject: k 5 forticlientsslvpn: fix license --- krebs/5pkgs/fortclientsslvpn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/5pkgs/fortclientsslvpn/default.nix b/krebs/5pkgs/fortclientsslvpn/default.nix index 720d4004..e1c81347 100644 --- a/krebs/5pkgs/fortclientsslvpn/default.nix +++ b/krebs/5pkgs/fortclientsslvpn/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.fortinet.com; description = "Forticlient SSL-VPN client"; - license = lib.licenses.nonfree; + license = lib.licenses.unfree; maintainers = [ lib.maintainers.makefu ]; }; } -- 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 --- krebs/3modules/makefu/default.nix | 24 ++++++++++++++++++++++++ krebs/Zhosts/wbob | 10 ++++++++++ 2 files changed, 34 insertions(+) create mode 100644 krebs/Zhosts/wbob (limited to 'krebs') diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 31516d59..38e773b5 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -297,6 +297,30 @@ with lib; ssh.privkey.path = ; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIujMZ3ZFxKpWeB/cjfKfYRr77+VRZk0Eik+92t03NoA root@servarch"; }; + wbob = rec { + cores = 1; + dc = "none"; + nets = { + retiolm = { + addrs4 = ["10.243.214.15/32"]; + addrs6 = ["42:5a02:2c30:c1b1:3f2e:7c19:2496:a732/128"]; + aliases = [ + "wbob.retiolum" + ]; + tinc.pubkey = '' +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAqLTJx91OdR0FlJAc2JGh+AJde95oMzzh8o36JBFpsaN7styNfD3e +QGM/bDXFjk4ieIe5At0Z63P2KWxRp3cz8LWKJsn5cGsX2074YWMAGmKX+ZZJNlal +cJ994xX+8MJ6L2tVKpY7Ace7gqDN+l650PrEzV2SLisIqOdxoBlbAupdwHieUBt8 +khm4NLNUCxPYUx2RtHn4iGdgSgUD/SnyHEFdyDA17lWAGfEi4yFFjFMYQce/TFrs +rQV9t5hGaofu483Epo6mEfcBcsR4GIHI4a4WKYANsIyvFvzyGFEHOMusG6nRRqE9 +TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB +-----END RSA PUBLIC KEY----- +''; + }; + }; + }; + gum = rec { cores = 1; dc = "online.net"; #root-server diff --git a/krebs/Zhosts/wbob b/krebs/Zhosts/wbob new file mode 100644 index 00000000..829a5911 --- /dev/null +++ b/krebs/Zhosts/wbob @@ -0,0 +1,10 @@ +Subnet = 10.243.214.15/32 +Subnet = 42:5a02:2c30:c1b1:3f2e:7c19:2496:a732/128 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAqLTJx91OdR0FlJAc2JGh+AJde95oMzzh8o36JBFpsaN7styNfD3e +QGM/bDXFjk4ieIe5At0Z63P2KWxRp3cz8LWKJsn5cGsX2074YWMAGmKX+ZZJNlal +cJ994xX+8MJ6L2tVKpY7Ace7gqDN+l650PrEzV2SLisIqOdxoBlbAupdwHieUBt8 +khm4NLNUCxPYUx2RtHn4iGdgSgUD/SnyHEFdyDA17lWAGfEi4yFFjFMYQce/TFrs +rQV9t5hGaofu483Epo6mEfcBcsR4GIHI4a4WKYANsIyvFvzyGFEHOMusG6nRRqE9 +TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From ed4e0241d5aba830f31a7271435c93c7299b884b Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 19 Jan 2016 23:45:12 +0100 Subject: k 5 acng: bump to 0.8.8 --- krebs/5pkgs/apt-cacher-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'krebs') diff --git a/krebs/5pkgs/apt-cacher-ng/default.nix b/krebs/5pkgs/apt-cacher-ng/default.nix index f253cdba..f71d17c5 100644 --- a/krebs/5pkgs/apt-cacher-ng/default.nix +++ b/krebs/5pkgs/apt-cacher-ng/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "apt-cacher-ng-${version}"; - version = "0.8.6"; + version = "0.8.8"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "0044dfks8djl11fs28jj8894i4rq424xix3d3fkvzz2i6lnp8nr5"; + sha256 = "0n7yy4h8g7j0g94xngbywmfhrkg9xl3j2c4wzrjknfwvxmqgjivq"; }; NIX_LDFLAGS = "-lpthread"; -- cgit v1.2.3