From 4c7abddb0ea4b3c6812f0d3f37262b9c74648f5e Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 25 May 2015 19:32:54 +0200 Subject: activate gitolite config --- modules/mors/default.nix | 1 + modules/mors/repos.nix | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 modules/mors/repos.nix (limited to 'modules/mors') diff --git a/modules/mors/default.nix b/modules/mors/default.nix index 8768cd1..c7d1f1b 100644 --- a/modules/mors/default.nix +++ b/modules/mors/default.nix @@ -24,6 +24,7 @@ ../lass/binary-caches.nix ../lass/ircd.nix ../../secrets/mors-pw.nix + ./repos.nix ]; nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; diff --git a/modules/mors/repos.nix b/modules/mors/repos.nix new file mode 100644 index 0000000..6d3cf21 --- /dev/null +++ b/modules/mors/repos.nix @@ -0,0 +1,75 @@ +{ ... }: + +{ + imports = [ + ../lass/gitolite-base.nix + ]; + + services.gitolite = { + repos = { + + config = { + users = { + lass = "RW+"; + uriel = "R"; + tv = "R"; + }; + extraConfig = "option hook.post-receive = irc-announce"; + }; + + pass = { + users = { + lass = "RW+"; + uriel = "R"; + }; + }; + + load-env = { + users = { + lass = "RW+"; + uriel = "R"; + tv = "R"; + }; + extraConfig = "option hook.post-receive = irc-announce"; + }; + + emse-hsdb = { + users = { + lass = "RW+"; + uriel = "R"; + tv = "R"; + }; + extraConfig = "option hook.post-receive = irc-announce"; + }; + + painload = { + users = { + lass = "RW+"; + tv = "R"; + makefu = "R"; + }; + extraConfig = "option hook.post-receive = irc-announce"; + }; + + brain = { + users = { + lass = "RW+"; + tv = "R"; + makefu = "R"; + }; + extraConfig = "option hook.post-receive = irc-announce"; + }; + + services = { + users = { + lass = "RW+"; + tv = "R"; + makefu = "R"; + reaktor = "R"; + }; + extraConfig = "option hook.post-receive = irc-announce"; + }; + + }; + }; +} -- cgit v1.3.1 From 143e742f21c3be08c4689cb2bae3912f12bbb716 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 25 May 2015 19:33:15 +0200 Subject: cleanup code & update hashes --- modules/mors/default.nix | 5 +---- modules/uriel/default.nix | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'modules/mors') diff --git a/modules/mors/default.nix b/modules/mors/default.nix index c7d1f1b..6dfd050 100644 --- a/modules/mors/default.nix +++ b/modules/mors/default.nix @@ -28,7 +28,7 @@ ]; nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; - rev = "eba85883a07a9fc414d7860f8d6fee4d9f09b2ac"; + rev = "0b1dfed50d9ec2222b94d68f84376f66e82d19e3"; }; networking.hostName = "mors"; @@ -55,8 +55,6 @@ initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ]; #kernelModules = [ "kvm-intel" "msr" ]; kernelModules = [ "msr" ]; - extraModprobeConfig = '' - ''; }; fileSystems = { "/" = { @@ -146,7 +144,6 @@ ''; services.xserver = { - videoDriver = "intel"; vaapiDrivers = [ pkgs.vaapiIntel ]; deviceSection = '' diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix index e57a4da..3d79353 100644 --- a/modules/uriel/default.nix +++ b/modules/uriel/default.nix @@ -20,7 +20,7 @@ ]; nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; - rev = "ffe3f799a2eb565e1755a6a18260ece5cbbd746b"; + rev = "0b1dfed50d9ec2222b94d68f84376f66e82d19e3"; }; networking.hostName = "uriel"; -- cgit v1.3.1 From d0b6a5ccd9e5f1ae7c6b7103c207a0192315577e Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 1 Jun 2015 03:10:59 +0200 Subject: add xmonad-config repo --- modules/mors/repos.nix | 7 +++++++ modules/uriel/repos.nix | 7 +++++++ 2 files changed, 14 insertions(+) (limited to 'modules/mors') diff --git a/modules/mors/repos.nix b/modules/mors/repos.nix index 6d3cf21..d54d437 100644 --- a/modules/mors/repos.nix +++ b/modules/mors/repos.nix @@ -70,6 +70,13 @@ extraConfig = "option hook.post-receive = irc-announce"; }; + xmonad-config = { + users = { + lass = "RW+"; + uriel = "R"; + }; + }; + }; }; } diff --git a/modules/uriel/repos.nix b/modules/uriel/repos.nix index 6d3cf21..d54d437 100644 --- a/modules/uriel/repos.nix +++ b/modules/uriel/repos.nix @@ -70,6 +70,13 @@ extraConfig = "option hook.post-receive = irc-announce"; }; + xmonad-config = { + users = { + lass = "RW+"; + uriel = "R"; + }; + }; + }; }; } -- cgit v1.3.1 From 77e1ddfbb085b05d56bd03dae2a63f36860af595 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 10 Jun 2015 00:15:24 +0200 Subject: krebs-repos: add initial config --- modules/common/krebs-keys.nix | 14 ++++++++++++++ modules/common/krebs-repos.nix | 36 ++++++++++++++++++++++++++++++++++++ modules/mors/repos.nix | 14 +++++--------- modules/uriel/repos.nix | 14 +++++--------- 4 files changed, 60 insertions(+), 18 deletions(-) create mode 100644 modules/common/krebs-keys.nix create mode 100644 modules/common/krebs-repos.nix (limited to 'modules/mors') diff --git a/modules/common/krebs-keys.nix b/modules/common/krebs-keys.nix new file mode 100644 index 0000000..8df1630 --- /dev/null +++ b/modules/common/krebs-keys.nix @@ -0,0 +1,14 @@ +# alle public keys der krebsminister fuer R in krebs repos +{ config, ... }: + +with import ../lass/sshkeys.nix { + config.sshKeys.lass.pub = config.sshKeys.lass.pub; + config.sshKeys.uriel.pub = config.sshKeys.uriel.pub; + }; +{ + imports = [ + ./sshkeys.nix + ]; + + config.sshKeys.tv.pub = "ssh-rsaAAAAB3NzaC1yc2EAAAADAQABAAAEAQDFR//RnCvEZAt0F6ExDsatKZ/DDdifanuSL360mqOhaFieKI34RoOwfQT9T+Ga52Vh5V2La6esvlph686EdgzeKLvDoxEwFM9ZYFBcMrNzu4bMTlgE7YUYw5JiORyXNfznBGnme6qpuvx9ibYhUyiZo99kM8ys5YrUHrP2JXQJMezDFZHxT4GFMOuSdh/1daGoKKD6hYL/jEHX8CI4E3BSmKK6ygYr1fVX0K0Tv77lIi5mLXucjR7CytWYWYnhM6DC3Hxpv2zRkPgf3k0x/Y1hrw3V/r0Me5h90pd2C8pFaWA2ZoUT/fmyVqvx1tZPYToU/O2dMItY0zgx2kR0yD+6g7Aahz3R+KlXkV8k5c8bbTbfGnZWDR1ZlbLRM9Yt5vosfwapUD90MmVkpmR3wUkO2sUKi80QfC7b4KvSDXQ+MImbGxMaU5Bnsq1PqLN95q+uat3nlAVBAELkcx51FlE9CaIS65y4J7FEDg8BE5JeuCNshh62VSYRXVSFt8bk3f/TFGgzC8OIo14BhVmiRQQ503Z1sROyf5xLX2a/EJavMm1i2Bs2TH6ROKY9z5Pz8hT5US0r381V8oG7TZyLF9HTtoy3wCYsgWA5EmLanjAsVU2YEeAA0rxzdtYP8Y2okFiJ6u+M4HQZ3Wg3peSodyp3vxdYce2vk4EKeqEFuuS82850DYb7Et7fmp+wQQUT8Q/bMO0DreWjHoMM5lE4LJ4ME6AxksmMiFtfo/4Fe2q9D+LAqZ+ANOcv9M+8Rn6ngiYmuRNd0l/a02q1PEvO6vTfXgcl4f7Z1IULHPEaDNZHCJS1K5RXYFqYQ6OHsTmOm7hnwaRAS97+VFMo1i5uvTx9nYaAcY7yzq3Ckfb67dMBKApGOpJpkvPgfrP7bgBO5rOZXM1opXqVPb09nljAhhAhyCTh1e/8+mJrBo0cLQ/LupQzVxGDgm3awSMPxsZAN45PSWz76zzxdDa1MMo51do+VJHfs7Wl0NcXAQrniOBYL9Wqt0qNkn1gY5smkkISGeQ/vxNap4MmzeZE7b5fpOy+2fpcRVQLpc4nooQzJvSVTFz+25lgZ6iHf45K87gQFMIAri1Pf/EDDpL87az+bRWvWi+BA2kMe1kf+Ay1LyMz8r+g51H0ma0bNFh6+fbWMfUiD9JCepIObclnUJ4NlWfcgHxTf17d/4tl6z4DTcLpCCk8Da77JouSHgvtcRbRlFV1OfhWZLXUsrlfpaQTiItv6TGIr3k7+7b66o3Qw/GQVs5GmYifaIZIz8n8my4XjkaMBd0SZfBzzvFjHMq6YUP9+SbjvReqofuoO+5tW1wTYZXitFFBfwuHlXm6w77K5QDBW6olT7pat41/F5eGxLcz tv@wu"; +} diff --git a/modules/common/krebs-repos.nix b/modules/common/krebs-repos.nix new file mode 100644 index 0000000..86f3731 --- /dev/null +++ b/modules/common/krebs-repos.nix @@ -0,0 +1,36 @@ +{ lib, ... }: + +let + inherit (lib) mkDefault; + + mkSecureRepo = name: + { inherit name; + value = { + users = { + lass = mkDefault "R"; + tv = mkDefault "R"; + makefu = mkDefault "R"; + }; + }; + }; + + mkRepo = name: + { inherit name; + value = { + users = { + lass = mkDefault "R"; + tv = mkDefault "R"; + makefu = mkDefault "R"; + }; + }; + }; + +in { + services.gitolite.repos = + (lib.listToAttrs (map mkSecureRepo [ "brain" ])) // + (lib.listToAttrs (map mkRepo [ + "painload" + "services" + "hosts" + ])); +} diff --git a/modules/mors/repos.nix b/modules/mors/repos.nix index d54d437..e31ba94 100644 --- a/modules/mors/repos.nix +++ b/modules/mors/repos.nix @@ -3,6 +3,8 @@ { imports = [ ../lass/gitolite-base.nix + ../common/krebs-keys.nix + ../common/krebs-repos.nix ]; services.gitolite = { @@ -42,20 +44,17 @@ extraConfig = "option hook.post-receive = irc-announce"; }; - painload = { + brain = { users = { lass = "RW+"; - tv = "R"; - makefu = "R"; }; extraConfig = "option hook.post-receive = irc-announce"; + #hooks.post-receive = irc-announce; }; - brain = { + painload = { users = { lass = "RW+"; - tv = "R"; - makefu = "R"; }; extraConfig = "option hook.post-receive = irc-announce"; }; @@ -63,9 +62,6 @@ services = { users = { lass = "RW+"; - tv = "R"; - makefu = "R"; - reaktor = "R"; }; extraConfig = "option hook.post-receive = irc-announce"; }; diff --git a/modules/uriel/repos.nix b/modules/uriel/repos.nix index d54d437..e31ba94 100644 --- a/modules/uriel/repos.nix +++ b/modules/uriel/repos.nix @@ -3,6 +3,8 @@ { imports = [ ../lass/gitolite-base.nix + ../common/krebs-keys.nix + ../common/krebs-repos.nix ]; services.gitolite = { @@ -42,20 +44,17 @@ extraConfig = "option hook.post-receive = irc-announce"; }; - painload = { + brain = { users = { lass = "RW+"; - tv = "R"; - makefu = "R"; }; extraConfig = "option hook.post-receive = irc-announce"; + #hooks.post-receive = irc-announce; }; - brain = { + painload = { users = { lass = "RW+"; - tv = "R"; - makefu = "R"; }; extraConfig = "option hook.post-receive = irc-announce"; }; @@ -63,9 +62,6 @@ services = { users = { lass = "RW+"; - tv = "R"; - makefu = "R"; - reaktor = "R"; }; extraConfig = "option hook.post-receive = irc-announce"; }; -- cgit v1.3.1 From 3eb5e2ace450035c0cdff424e68eed6906e997e1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 10 Jun 2015 00:21:12 +0200 Subject: mors & uriel: update revs --- modules/mors/default.nix | 3 ++- modules/uriel/default.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'modules/mors') diff --git a/modules/mors/default.nix b/modules/mors/default.nix index 6dfd050..d9ddd28 100644 --- a/modules/mors/default.nix +++ b/modules/mors/default.nix @@ -26,9 +26,10 @@ ../../secrets/mors-pw.nix ./repos.nix ]; + nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; - rev = "0b1dfed50d9ec2222b94d68f84376f66e82d19e3"; + rev = "b74c8eeb73a75eb61148c190df4733474a99a205"; }; networking.hostName = "mors"; diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix index 3d79353..a54dfa7 100644 --- a/modules/uriel/default.nix +++ b/modules/uriel/default.nix @@ -18,9 +18,10 @@ ../lass/bird.nix ./repos.nix ]; + nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; - rev = "0b1dfed50d9ec2222b94d68f84376f66e82d19e3"; + rev = "b74c8eeb73a75eb61148c190df4733474a99a205"; }; networking.hostName = "uriel"; -- cgit v1.3.1 [cgit] Unable to lock slot /tmp/cgit/37100000.lock: No such file or directory (2)