From 542696394058cf870dd9143fe0f3a70a964a4c55 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 20 May 2015 23:31:52 +0200 Subject: cloudkrebs: add networking.nix --- modules/cloudkrebs/networking.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 modules/cloudkrebs/networking.nix diff --git a/modules/cloudkrebs/networking.nix b/modules/cloudkrebs/networking.nix new file mode 100644 index 000000000..fc5007365 --- /dev/null +++ b/modules/cloudkrebs/networking.nix @@ -0,0 +1,14 @@ +{...}: +{ + networking.hostName = "cloudkrebs"; + networking.interfaces.enp2s1.ip4 = [ + { + address = "104.167.113.104"; + prefixLength = 24; + } + ]; + networking.defaultGateway = "104.167.113.1"; + networking.nameservers = [ + "8.8.8.8" + ]; +} -- cgit v1.2.3 From ad2093acbd29f0cbe91991d567d7570ecfea29b3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 21 May 2015 19:36:17 +0200 Subject: experiment with gitolite --- modules/lass/base.nix | 118 -------------------------- modules/uriel/default.nix | 212 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 211 insertions(+), 119 deletions(-) diff --git a/modules/lass/base.nix b/modules/lass/base.nix index d16c4d341..29010dd91 100644 --- a/modules/lass/base.nix +++ b/modules/lass/base.nix @@ -68,124 +68,6 @@ enable = true; dataDir = "/home/gitolite"; adminPubkey = config.sshKeys.lass.pub; - #commonHooks = [ - # (pkgs.writeText "irc-announce" '' - # #! /bin/sh - # set -euf - - # config_file="$GL_ADMIN_BASE/conf/irc-announce.conf" - # if test -f "$config_file"; then - # . "$config_file" - # fi - - # # XXX when changing IRC_CHANNEL or IRC_SERVER/_PORT, don't forget to update - # # any relevant gitolite LOCAL_CODE! - # # CAVEAT we hope that IRC_NICK is unique - # IRC_NICK="''${IRC_NICK-gl$GL_TID}" - # IRC_CHANNEL="''${IRC_CHANNEL-#retiolum}" - # IRC_SERVER="''${IRC_SERVER-ire.retiolum}" - # IRC_PORT="''${IRC_PORT-6667}" - - # # for privmsg_cat below - # export IRC_CHANNEL - - # # collect users that are mentioned in the gitolite configuration - # interested_users="$(perl -e ' - # do "gl-conf"; - # print join(" ", keys%{ $one_repo{$ENV{"GL_REPO"}} }); - # ')" - - # # CAVEAT beware of real TABs in grep pattern! - # # CAVEAT there will never be more than 42 relevant log entries! - # log="$(tail -n 42 "$GL_LOGFILE" | grep "^[^ ]* $GL_TID ")" - # update_log="$(echo "$log" | grep "^[^ ]* $GL_TID update")" - - # # (debug output) - # env | sed 's/^/env: /' - # echo "$log" | sed 's/^/log: /' - - # # see http://gitolite.com/gitolite/dev-notes.html#lff - # reponame=$(echo "$update_log" | cut -f 4) - # username=$(echo "$update_log" | cut -f 5) - # ref_name=$(echo "$update_log" | cut -f 7 | sed 's|^refs/heads/||') - # old_sha=$(echo "$update_log" | cut -f 8) - # new_sha=$(echo "$update_log" | cut -f 9) - - # # check if new branch is created - # if test $old_sha = 0000000000000000000000000000000000000000; then - # # TODO what should we really show? - # old_sha=$new_sha^ - # fi - - # # - # git_log="$(git log $old_sha..$new_sha --pretty=oneline --abbrev-commit)" - # commit_count=$(echo "$git_log" | wc -l) - - # # echo2 and cat2 are used output to both, stdout and stderr - # # This is used to see what we send to the irc server. (debug output) - # echo2() { echo "$*"; echo "$*" >&2; } - # cat2() { tee /dev/stderr; } - - # # privmsg_cat transforms stdin to a privmsg - # privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; } - - # # ircin is used to feed the output of netcat back to the "irc client" - # # so we can implement expect-like behavior with sed^_^ - # # XXX mkselfdestructingtmpfifo would be nice instead of this cruft - # tmpdir="$(mktemp -d irc-announce_XXXXXXXX)" - # cd "$tmpdir" - # mkfifo ircin - # trap " - # rm ircin - # cd '$OLDPWD' - # rmdir '$tmpdir' - # trap - EXIT INT QUIT - # " EXIT INT QUIT - - # # - # # - # # - # { - # echo2 "USER $LOGNAME 0 * :$LOGNAME@$(hostname)" - # echo2 "NICK $IRC_NICK" - - # # wait for MODE message - # sed -n '/^:[^ ]* MODE /q' - - # echo2 "JOIN $IRC_CHANNEL" - - # echo "$interested_users" \ - # | tr ' ' '\n' \ - # | grep -v "^$GL_USER" \ - # | sed 's/$/: poke/' \ - # | privmsg_cat \ - # | cat2 - - # printf '[13%s] %s pushed %s new commit%s to 6%s %s\n' \ - # "$reponame" \ - # "$username" \ - # "$commit_count" \ - # "$(test $commit_count = 1 || echo s)" \ - # "$(hostname)" \ - # "$ref_name" \ - # | privmsg_cat \ - # | cat2 - - # echo "$git_log" \ - # | sed 's/^/14/;s/ / /' \ - # | privmsg_cat \ - # | cat2 - - # echo2 "PART $IRC_CHANNEL" - - # # wait for PART confirmation - # sed -n '/:'"$IRC_NICK"'![^ ]* PART /q' - - # echo2 'QUIT :Gone to have lunch' - # } < ircin \ - # | nc "$IRC_SERVER" "$IRC_PORT" | tee -a ircin - # '') - #]; }; services.openssh = { diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix index bfdc02256..9cab8915f 100644 --- a/modules/uriel/default.nix +++ b/modules/uriel/default.nix @@ -19,7 +19,216 @@ ]; nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; - rev = "b42ecfb8c61e514bf7733b4ab0982d3e7e27dacb"; + rev = "b3531eebf625e388d2fa33d56646180236263e74"; + }; + + services.gitolite = { + keys = { + uriel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM1v/N0G7k48thX1vIALTdqrdYUvYM+SvHRq/rCcKLC2 lass@mors"; + lass = config.sshKeys.lass.pub; + }; + config = '' + repo emse-hsdb + RW+ = lass + R = tv + option hook.post-receive = irc-announce + + repo pong + RW+ = lass + R = tv + option hook.post-receive = irc-announce + + repo load-env + RW+ = lass + RW+ = uriel + R = tv + option hook.post-receive = irc-announce + + repo pass + RW+ = lass + RW+ = uriel + + repo testing + RW+ = @all + + repo painload + RW+ = lass + R = tv + R = makefu + + repo brain + RW+ = lass + R = tv + R = makefu + option hook.post-receive = irc-announce + + repo services + RW+ = lass + R = tv + R = makefu + option hook.post-receive = irc-announce + + repo emse-drywall + RW+ = lass + R = tv + R = uriel + option hook.post-receive = irc-announce + + repo emse-db + RW+ = lass + R = tv + option hook.post-receive = irc-announce + + repo config + RW+ = lass + RW+ = uriel + R = fastpoke + ''; + + rc = '' + %RC = ( + UMASK => 0077, + GIT_CONFIG_KEYS => "", + LOG_EXTRA => 1, + ROLES => { + READERS => 1, + WRITERS => 1, + }, + LOCAL_CODE => "$ENV{HOME}/.gitolite", + ENABLE => [ + 'help', + 'desc', + 'info', + 'perms', + 'writable', + 'ssh-authkeys', + 'git-config', + 'daemon', + 'gitweb', + 'repo-specific-hooks', + ], + ); + 1; + ''; + + hooks.repoSpecific = { + irc-announce = '' + #! /bin/sh + set -euf + + config_file="$GL_ADMIN_BASE/conf/irc-announce.conf" + if test -f "$config_file"; then + . "$config_file" + fi + + # XXX when changing IRC_CHANNEL or IRC_SERVER/_PORT, don't forget to update + # any relevant gitolite LOCAL_CODE! + # CAVEAT we hope that IRC_NICK is unique + IRC_NICK="''${IRC_NICK-gl$GL_TID}" + IRC_CHANNEL="''${IRC_CHANNEL-#retiolum}" + IRC_SERVER="''${IRC_SERVER-ire.retiolum}" + IRC_PORT="''${IRC_PORT-6667}" + + # for privmsg_cat below + export IRC_CHANNEL + + # collect users that are mentioned in the gitolite configuration + interested_users="$(perl -e ' + do "gl-conf"; + print join(" ", keys%{ $one_repo{$ENV{"GL_REPO"}} }); + ')" + + # CAVEAT beware of real TABs in grep pattern! + # CAVEAT there will never be more than 42 relevant log entries! + log="$(tail -n 42 "$GL_LOGFILE" | grep "^[^ ]* $GL_TID ")" + update_log="$(echo "$log" | grep "^[^ ]* $GL_TID update")" + + # (debug output) + env | sed 's/^/env: /' + echo "$log" | sed 's/^/log: /' + + # see http://gitolite.com/gitolite/dev-notes.html#lff + reponame=$(echo "$update_log" | cut -f 4) + username=$(echo "$update_log" | cut -f 5) + ref_name=$(echo "$update_log" | cut -f 7 | sed 's|^refs/heads/||') + old_sha=$(echo "$update_log" | cut -f 8) + new_sha=$(echo "$update_log" | cut -f 9) + + # check if new branch is created + if test $old_sha = 0000000000000000000000000000000000000000; then + # TODO what should we really show? + old_sha=$new_sha^ + fi + + # + git_log="$(git log $old_sha..$new_sha --pretty=oneline --abbrev-commit)" + commit_count=$(echo "$git_log" | wc -l) + + # echo2 and cat2 are used output to both, stdout and stderr + # This is used to see what we send to the irc server. (debug output) + echo2() { echo "$*"; echo "$*" >&2; } + cat2() { tee /dev/stderr; } + + # privmsg_cat transforms stdin to a privmsg + privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; } + + # ircin is used to feed the output of netcat back to the "irc client" + # so we can implement expect-like behavior with sed^_^ + # XXX mkselfdestructingtmpfifo would be nice instead of this cruft + tmpdir="$(mktemp -d irc-announce_XXXXXXXX)" + cd "$tmpdir" + mkfifo ircin + trap " + rm ircin + cd '$OLDPWD' + rmdir '$tmpdir' + trap - EXIT INT QUIT + " EXIT INT QUIT + + # + # + # + { + echo2 "USER $LOGNAME 0 * :$LOGNAME@$(hostname)" + echo2 "NICK $IRC_NICK" + + # wait for MODE message + sed -n '/^:[^ ]* MODE /q' + + echo2 "JOIN $IRC_CHANNEL" + + echo "$interested_users" \ + | tr ' ' '\n' \ + | grep -v "^$GL_USER" \ + | sed 's/$/: poke/' \ + | privmsg_cat \ + | cat2 + + printf '[13%s] %s pushed %s new commit%s to 6%s %s\n' \ + "$reponame" \ + "$username" \ + "$commit_count" \ + "$(test $commit_count = 1 || echo s)" \ + "$(hostname)" \ + "$ref_name" \ + | privmsg_cat \ + | cat2 + + echo "$git_log" \ + | sed 's/^/14/;s/ / /' \ + | privmsg_cat \ + | cat2 + + echo2 "PART $IRC_CHANNEL" + + # wait for PART confirmation + sed -n '/:'"$IRC_NICK"'![^ ]* PART /q' + + echo2 'QUIT :Gone to have lunch' + } < ircin \ + | nc "$IRC_SERVER" "$IRC_PORT" | tee -a ircin + ''; + }; }; @@ -104,6 +313,7 @@ environment.systemPackages = with pkgs; [ ]; + #users.extraGroups = { # loot = { # members = [ -- cgit v1.2.3 From 1d40f7ffc624ae407edf46f74ba71201da0b350a Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 21 May 2015 20:36:19 +0200 Subject: update test gitolite config --- modules/uriel/default.nix | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix index 9cab8915f..367a2847c 100644 --- a/modules/uriel/default.nix +++ b/modules/uriel/default.nix @@ -19,7 +19,7 @@ ]; nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; - rev = "b3531eebf625e388d2fa33d56646180236263e74"; + rev = "946329e1342acc08d9bed9e7af860f2a5b1f1765"; }; services.gitolite = { @@ -82,7 +82,7 @@ repo config RW+ = lass RW+ = uriel - R = fastpoke + option hook.post-receive = irc-announce ''; rc = '' @@ -229,6 +229,26 @@ | nc "$IRC_SERVER" "$IRC_PORT" | tee -a ircin ''; }; + + customFiles = [ + { + filename = ".gitolite/conf/irc-announce.conf"; + content = '' + IRC_NICK="$(hostname)$GL_TID" + case "$GL_REPO" in + brain|painload|services|load-env|pong|config) + IRC_CHANNEL='#retiolum' + ;; + emse*) + IRC_CHANNEL='#emse' + ;; + *) + IRC_CHANNEL='&testing' + ;; + esac + ''; + } + ]; }; -- cgit v1.2.3 From 1782c7942566821a1b8b33b2290c38019306872b Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 21 May 2015 22:00:43 +0200 Subject: uriel: update gitolite test stuff --- modules/uriel/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix index 367a2847c..a07972c90 100644 --- a/modules/uriel/default.nix +++ b/modules/uriel/default.nix @@ -55,9 +55,11 @@ RW+ = lass R = tv R = makefu + option hook.post-receive = irc-announce repo brain - RW+ = lass + RW+ = uriel + R = lass R = tv R = makefu option hook.post-receive = irc-announce @@ -83,6 +85,10 @@ RW+ = lass RW+ = uriel option hook.post-receive = irc-announce + + repo teeest + RW+ = lass + option hook.post-receive = irc-announce ''; rc = '' @@ -140,8 +146,10 @@ # CAVEAT beware of real TABs in grep pattern! # CAVEAT there will never be more than 42 relevant log entries! - log="$(tail -n 42 "$GL_LOGFILE" | grep "^[^ ]* $GL_TID ")" - update_log="$(echo "$log" | grep "^[^ ]* $GL_TID update")" + tab=$(printf '\x09') + log="$(tail -n 42 "$GL_LOGFILE" | grep "^[^$tab]*$tab$GL_TID$tab" || :)" + + update_log="$(echo "$log" | grep "^[^$tab]*$tab$GL_TID''${tab}update")" # (debug output) env | sed 's/^/env: /' -- cgit v1.2.3 From 8c953def2368d735cb1cd9b9ff7b56df6f1b3f95 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 21 May 2015 23:54:12 +0200 Subject: uriel: update hash --- modules/uriel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix index a07972c90..25e3f59b1 100644 --- a/modules/uriel/default.nix +++ b/modules/uriel/default.nix @@ -19,7 +19,7 @@ ]; nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; - rev = "946329e1342acc08d9bed9e7af860f2a5b1f1765"; + rev = "ffe3f799a2eb565e1755a6a18260ece5cbbd746b"; }; services.gitolite = { -- cgit v1.2.3 From 862c3317beb8a3199bd989d87ad390d3de2f0011 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 21 May 2015 23:54:57 +0200 Subject: gitolite irc-announce: fix colors --- modules/uriel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix index 25e3f59b1..5ff37117d 100644 --- a/modules/uriel/default.nix +++ b/modules/uriel/default.nix @@ -212,7 +212,7 @@ | privmsg_cat \ | cat2 - printf '[13%s] %s pushed %s new commit%s to 6%s %s\n' \ + printf '[\x0313%s\x03] %s pushed %s new commit%s to \x036%s %s\x03\n' \ "$reponame" \ "$username" \ "$commit_count" \ @@ -223,7 +223,7 @@ | cat2 echo "$git_log" \ - | sed 's/^/14/;s/ / /' \ + | sed 's/^/\x0314/;s/ /\x03 /' \ | privmsg_cat \ | cat2 -- cgit v1.2.3 From 6c99817df0ef99773adb2622540849c9aad5fa80 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 20 May 2015 23:31:52 +0200 Subject: cloudkrebs: add networking.nix --- modules/cloudkrebs/networking.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 modules/cloudkrebs/networking.nix diff --git a/modules/cloudkrebs/networking.nix b/modules/cloudkrebs/networking.nix new file mode 100644 index 000000000..fc5007365 --- /dev/null +++ b/modules/cloudkrebs/networking.nix @@ -0,0 +1,14 @@ +{...}: +{ + networking.hostName = "cloudkrebs"; + networking.interfaces.enp2s1.ip4 = [ + { + address = "104.167.113.104"; + prefixLength = 24; + } + ]; + networking.defaultGateway = "104.167.113.1"; + networking.nameservers = [ + "8.8.8.8" + ]; +} -- cgit v1.2.3 From 259e2ce8554be0f8374ed35e7bef02b9396db92b Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 21 May 2015 19:36:17 +0200 Subject: experiment with gitolite --- modules/lass/base.nix | 118 -------------------------- modules/uriel/default.nix | 212 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 211 insertions(+), 119 deletions(-) diff --git a/modules/lass/base.nix b/modules/lass/base.nix index d16c4d341..29010dd91 100644 --- a/modules/lass/base.nix +++ b/modules/lass/base.nix @@ -68,124 +68,6 @@ enable = true; dataDir = "/home/gitolite"; adminPubkey = config.sshKeys.lass.pub; - #commonHooks = [ - # (pkgs.writeText "irc-announce" '' - # #! /bin/sh - # set -euf - - # config_file="$GL_ADMIN_BASE/conf/irc-announce.conf" - # if test -f "$config_file"; then - # . "$config_file" - # fi - - # # XXX when changing IRC_CHANNEL or IRC_SERVER/_PORT, don't forget to update - # # any relevant gitolite LOCAL_CODE! - # # CAVEAT we hope that IRC_NICK is unique - # IRC_NICK="''${IRC_NICK-gl$GL_TID}" - # IRC_CHANNEL="''${IRC_CHANNEL-#retiolum}" - # IRC_SERVER="''${IRC_SERVER-ire.retiolum}" - # IRC_PORT="''${IRC_PORT-6667}" - - # # for privmsg_cat below - # export IRC_CHANNEL - - # # collect users that are mentioned in the gitolite configuration - # interested_users="$(perl -e ' - # do "gl-conf"; - # print join(" ", keys%{ $one_repo{$ENV{"GL_REPO"}} }); - # ')" - - # # CAVEAT beware of real TABs in grep pattern! - # # CAVEAT there will never be more than 42 relevant log entries! - # log="$(tail -n 42 "$GL_LOGFILE" | grep "^[^ ]* $GL_TID ")" - # update_log="$(echo "$log" | grep "^[^ ]* $GL_TID update")" - - # # (debug output) - # env | sed 's/^/env: /' - # echo "$log" | sed 's/^/log: /' - - # # see http://gitolite.com/gitolite/dev-notes.html#lff - # reponame=$(echo "$update_log" | cut -f 4) - # username=$(echo "$update_log" | cut -f 5) - # ref_name=$(echo "$update_log" | cut -f 7 | sed 's|^refs/heads/||') - # old_sha=$(echo "$update_log" | cut -f 8) - # new_sha=$(echo "$update_log" | cut -f 9) - - # # check if new branch is created - # if test $old_sha = 0000000000000000000000000000000000000000; then - # # TODO what should we really show? - # old_sha=$new_sha^ - # fi - - # # - # git_log="$(git log $old_sha..$new_sha --pretty=oneline --abbrev-commit)" - # commit_count=$(echo "$git_log" | wc -l) - - # # echo2 and cat2 are used output to both, stdout and stderr - # # This is used to see what we send to the irc server. (debug output) - # echo2() { echo "$*"; echo "$*" >&2; } - # cat2() { tee /dev/stderr; } - - # # privmsg_cat transforms stdin to a privmsg - # privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; } - - # # ircin is used to feed the output of netcat back to the "irc client" - # # so we can implement expect-like behavior with sed^_^ - # # XXX mkselfdestructingtmpfifo would be nice instead of this cruft - # tmpdir="$(mktemp -d irc-announce_XXXXXXXX)" - # cd "$tmpdir" - # mkfifo ircin - # trap " - # rm ircin - # cd '$OLDPWD' - # rmdir '$tmpdir' - # trap - EXIT INT QUIT - # " EXIT INT QUIT - - # # - # # - # # - # { - # echo2 "USER $LOGNAME 0 * :$LOGNAME@$(hostname)" - # echo2 "NICK $IRC_NICK" - - # # wait for MODE message - # sed -n '/^:[^ ]* MODE /q' - - # echo2 "JOIN $IRC_CHANNEL" - - # echo "$interested_users" \ - # | tr ' ' '\n' \ - # | grep -v "^$GL_USER" \ - # | sed 's/$/: poke/' \ - # | privmsg_cat \ - # | cat2 - - # printf '[13%s] %s pushed %s new commit%s to 6%s %s\n' \ - # "$reponame" \ - # "$username" \ - # "$commit_count" \ - # "$(test $commit_count = 1 || echo s)" \ - # "$(hostname)" \ - # "$ref_name" \ - # | privmsg_cat \ - # | cat2 - - # echo "$git_log" \ - # | sed 's/^/14/;s/ / /' \ - # | privmsg_cat \ - # | cat2 - - # echo2 "PART $IRC_CHANNEL" - - # # wait for PART confirmation - # sed -n '/:'"$IRC_NICK"'![^ ]* PART /q' - - # echo2 'QUIT :Gone to have lunch' - # } < ircin \ - # | nc "$IRC_SERVER" "$IRC_PORT" | tee -a ircin - # '') - #]; }; services.openssh = { diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix index bfdc02256..9cab8915f 100644 --- a/modules/uriel/default.nix +++ b/modules/uriel/default.nix @@ -19,7 +19,216 @@ ]; nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; - rev = "b42ecfb8c61e514bf7733b4ab0982d3e7e27dacb"; + rev = "b3531eebf625e388d2fa33d56646180236263e74"; + }; + + services.gitolite = { + keys = { + uriel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM1v/N0G7k48thX1vIALTdqrdYUvYM+SvHRq/rCcKLC2 lass@mors"; + lass = config.sshKeys.lass.pub; + }; + config = '' + repo emse-hsdb + RW+ = lass + R = tv + option hook.post-receive = irc-announce + + repo pong + RW+ = lass + R = tv + option hook.post-receive = irc-announce + + repo load-env + RW+ = lass + RW+ = uriel + R = tv + option hook.post-receive = irc-announce + + repo pass + RW+ = lass + RW+ = uriel + + repo testing + RW+ = @all + + repo painload + RW+ = lass + R = tv + R = makefu + + repo brain + RW+ = lass + R = tv + R = makefu + option hook.post-receive = irc-announce + + repo services + RW+ = lass + R = tv + R = makefu + option hook.post-receive = irc-announce + + repo emse-drywall + RW+ = lass + R = tv + R = uriel + option hook.post-receive = irc-announce + + repo emse-db + RW+ = lass + R = tv + option hook.post-receive = irc-announce + + repo config + RW+ = lass + RW+ = uriel + R = fastpoke + ''; + + rc = '' + %RC = ( + UMASK => 0077, + GIT_CONFIG_KEYS => "", + LOG_EXTRA => 1, + ROLES => { + READERS => 1, + WRITERS => 1, + }, + LOCAL_CODE => "$ENV{HOME}/.gitolite", + ENABLE => [ + 'help', + 'desc', + 'info', + 'perms', + 'writable', + 'ssh-authkeys', + 'git-config', + 'daemon', + 'gitweb', + 'repo-specific-hooks', + ], + ); + 1; + ''; + + hooks.repoSpecific = { + irc-announce = '' + #! /bin/sh + set -euf + + config_file="$GL_ADMIN_BASE/conf/irc-announce.conf" + if test -f "$config_file"; then + . "$config_file" + fi + + # XXX when changing IRC_CHANNEL or IRC_SERVER/_PORT, don't forget to update + # any relevant gitolite LOCAL_CODE! + # CAVEAT we hope that IRC_NICK is unique + IRC_NICK="''${IRC_NICK-gl$GL_TID}" + IRC_CHANNEL="''${IRC_CHANNEL-#retiolum}" + IRC_SERVER="''${IRC_SERVER-ire.retiolum}" + IRC_PORT="''${IRC_PORT-6667}" + + # for privmsg_cat below + export IRC_CHANNEL + + # collect users that are mentioned in the gitolite configuration + interested_users="$(perl -e ' + do "gl-conf"; + print join(" ", keys%{ $one_repo{$ENV{"GL_REPO"}} }); + ')" + + # CAVEAT beware of real TABs in grep pattern! + # CAVEAT there will never be more than 42 relevant log entries! + log="$(tail -n 42 "$GL_LOGFILE" | grep "^[^ ]* $GL_TID ")" + update_log="$(echo "$log" | grep "^[^ ]* $GL_TID update")" + + # (debug output) + env | sed 's/^/env: /' + echo "$log" | sed 's/^/log: /' + + # see http://gitolite.com/gitolite/dev-notes.html#lff + reponame=$(echo "$update_log" | cut -f 4) + username=$(echo "$update_log" | cut -f 5) + ref_name=$(echo "$update_log" | cut -f 7 | sed 's|^refs/heads/||') + old_sha=$(echo "$update_log" | cut -f 8) + new_sha=$(echo "$update_log" | cut -f 9) + + # check if new branch is created + if test $old_sha = 0000000000000000000000000000000000000000; then + # TODO what should we really show? + old_sha=$new_sha^ + fi + + # + git_log="$(git log $old_sha..$new_sha --pretty=oneline --abbrev-commit)" + commit_count=$(echo "$git_log" | wc -l) + + # echo2 and cat2 are used output to both, stdout and stderr + # This is used to see what we send to the irc server. (debug output) + echo2() { echo "$*"; echo "$*" >&2; } + cat2() { tee /dev/stderr; } + + # privmsg_cat transforms stdin to a privmsg + privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; } + + # ircin is used to feed the output of netcat back to the "irc client" + # so we can implement expect-like behavior with sed^_^ + # XXX mkselfdestructingtmpfifo would be nice instead of this cruft + tmpdir="$(mktemp -d irc-announce_XXXXXXXX)" + cd "$tmpdir" + mkfifo ircin + trap " + rm ircin + cd '$OLDPWD' + rmdir '$tmpdir' + trap - EXIT INT QUIT + " EXIT INT QUIT + + # + # + # + { + echo2 "USER $LOGNAME 0 * :$LOGNAME@$(hostname)" + echo2 "NICK $IRC_NICK" + + # wait for MODE message + sed -n '/^:[^ ]* MODE /q' + + echo2 "JOIN $IRC_CHANNEL" + + echo "$interested_users" \ + | tr ' ' '\n' \ + | grep -v "^$GL_USER" \ + | sed 's/$/: poke/' \ + | privmsg_cat \ + | cat2 + + printf '[13%s] %s pushed %s new commit%s to 6%s %s\n' \ + "$reponame" \ + "$username" \ + "$commit_count" \ + "$(test $commit_count = 1 || echo s)" \ + "$(hostname)" \ + "$ref_name" \ + | privmsg_cat \ + | cat2 + + echo "$git_log" \ + | sed 's/^/14/;s/ / /' \ + | privmsg_cat \ + | cat2 + + echo2 "PART $IRC_CHANNEL" + + # wait for PART confirmation + sed -n '/:'"$IRC_NICK"'![^ ]* PART /q' + + echo2 'QUIT :Gone to have lunch' + } < ircin \ + | nc "$IRC_SERVER" "$IRC_PORT" | tee -a ircin + ''; + }; }; @@ -104,6 +313,7 @@ environment.systemPackages = with pkgs; [ ]; + #users.extraGroups = { # loot = { # members = [ -- cgit v1.2.3 From 6cf8d443b4da1611722e2de904ed8bb89126b1b5 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 21 May 2015 20:36:19 +0200 Subject: update test gitolite config --- modules/uriel/default.nix | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix index 9cab8915f..367a2847c 100644 --- a/modules/uriel/default.nix +++ b/modules/uriel/default.nix @@ -19,7 +19,7 @@ ]; nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; - rev = "b3531eebf625e388d2fa33d56646180236263e74"; + rev = "946329e1342acc08d9bed9e7af860f2a5b1f1765"; }; services.gitolite = { @@ -82,7 +82,7 @@ repo config RW+ = lass RW+ = uriel - R = fastpoke + option hook.post-receive = irc-announce ''; rc = '' @@ -229,6 +229,26 @@ | nc "$IRC_SERVER" "$IRC_PORT" | tee -a ircin ''; }; + + customFiles = [ + { + filename = ".gitolite/conf/irc-announce.conf"; + content = '' + IRC_NICK="$(hostname)$GL_TID" + case "$GL_REPO" in + brain|painload|services|load-env|pong|config) + IRC_CHANNEL='#retiolum' + ;; + emse*) + IRC_CHANNEL='#emse' + ;; + *) + IRC_CHANNEL='&testing' + ;; + esac + ''; + } + ]; }; -- cgit v1.2.3 From 678b52c7aa7d8d23d1c0effa3b186fc27e8f9733 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 21 May 2015 22:00:43 +0200 Subject: uriel: update gitolite test stuff --- modules/uriel/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix index 367a2847c..a07972c90 100644 --- a/modules/uriel/default.nix +++ b/modules/uriel/default.nix @@ -55,9 +55,11 @@ RW+ = lass R = tv R = makefu + option hook.post-receive = irc-announce repo brain - RW+ = lass + RW+ = uriel + R = lass R = tv R = makefu option hook.post-receive = irc-announce @@ -83,6 +85,10 @@ RW+ = lass RW+ = uriel option hook.post-receive = irc-announce + + repo teeest + RW+ = lass + option hook.post-receive = irc-announce ''; rc = '' @@ -140,8 +146,10 @@ # CAVEAT beware of real TABs in grep pattern! # CAVEAT there will never be more than 42 relevant log entries! - log="$(tail -n 42 "$GL_LOGFILE" | grep "^[^ ]* $GL_TID ")" - update_log="$(echo "$log" | grep "^[^ ]* $GL_TID update")" + tab=$(printf '\x09') + log="$(tail -n 42 "$GL_LOGFILE" | grep "^[^$tab]*$tab$GL_TID$tab" || :)" + + update_log="$(echo "$log" | grep "^[^$tab]*$tab$GL_TID''${tab}update")" # (debug output) env | sed 's/^/env: /' -- cgit v1.2.3 From 61bfbef3eda8aa6bfc923361c68a0b50506927bd Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 21 May 2015 23:54:12 +0200 Subject: uriel: update hash --- modules/uriel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix index a07972c90..25e3f59b1 100644 --- a/modules/uriel/default.nix +++ b/modules/uriel/default.nix @@ -19,7 +19,7 @@ ]; nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; - rev = "946329e1342acc08d9bed9e7af860f2a5b1f1765"; + rev = "ffe3f799a2eb565e1755a6a18260ece5cbbd746b"; }; services.gitolite = { -- cgit v1.2.3 From f0567c64c49254254318842063645f36d42e55ab Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 21 May 2015 23:54:57 +0200 Subject: gitolite irc-announce: fix colors --- modules/uriel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix index 25e3f59b1..5ff37117d 100644 --- a/modules/uriel/default.nix +++ b/modules/uriel/default.nix @@ -212,7 +212,7 @@ | privmsg_cat \ | cat2 - printf '[13%s] %s pushed %s new commit%s to 6%s %s\n' \ + printf '[\x0313%s\x03] %s pushed %s new commit%s to \x036%s %s\x03\n' \ "$reponame" \ "$username" \ "$commit_count" \ @@ -223,7 +223,7 @@ | cat2 echo "$git_log" \ - | sed 's/^/14/;s/ / /' \ + | sed 's/^/\x0314/;s/ /\x03 /' \ | privmsg_cat \ | cat2 -- cgit v1.2.3 From 26a166c8c1a577cefe7884eaeea1541eb910aa87 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 25 May 2015 13:46:02 +0200 Subject: better terminal&vim colors --- modules/lass/urxvt.nix | 29 ++++------------------------- modules/lass/vim.nix | 24 +++++++++++++++++------- 2 files changed, 21 insertions(+), 32 deletions(-) diff --git a/modules/lass/urxvt.nix b/modules/lass/urxvt.nix index 9c9702e58..889f768ac 100644 --- a/modules/lass/urxvt.nix +++ b/modules/lass/urxvt.nix @@ -31,31 +31,10 @@ in URxvt.intensityStyles: false - !solarized colors - URxvt*fading: 5 - URxvt*background: #002b36 - URxvt*foreground: #657b83 - URxvt*fadeColor: #002b36 - URxvt*cursorColor: #93a1a1 - URxvt*pointerColorBackground: #586e75 - URxvt*pointerColorForeground: #93a1a1 - URxvt*colorUL: #859900 - URxvt*colorBD: #268bd2 - URxvt*color0: #073642 - URxvt*color8: #002b36 - URxvt*color1: #dc322f - URxvt*color9: #cb4b16 - URxvt*color2: #859900 - URxvt*color10: #586e75 - URxvt*color3: #b58900 - URxvt*color11: #657b83 + URxvt*background: #000000 + URxvt*foreground: #ffffff + + !change unreadable blue URxvt*color4: #268bd2 - URxvt*color12: #839496 - URxvt*color5: #d33682 - URxvt*color13: #6c71c4 - URxvt*color6: #2aa198 - URxvt*color14: #93a1a1 - URxvt*color7: #eee8d5 - URxvt*color15: #fdf6e3 ''; } diff --git a/modules/lass/vim.nix b/modules/lass/vim.nix index e277bd725..56a20c383 100644 --- a/modules/lass/vim.nix +++ b/modules/lass/vim.nix @@ -1,6 +1,17 @@ { config, pkgs, ... }: -{ +let + customPlugins.mustang2 = pkgs.vimUtils.buildVimPlugin { + name = "Mustang2"; + src = pkgs.fetchFromGitHub { + owner = "croaker"; + repo = "mustang-vim"; + rev = "6533d7d21bf27cae94d9c2caa575f627f003dfd5"; + sha256 = "0zlmcrr04j3dkiivrhqi90f618lmnnnpvbz1b9msfs78cmgw9w67"; + }; + }; + +in { environment.systemPackages = with pkgs; [ (vim_configurable.customize { @@ -12,7 +23,7 @@ syntax on " TODO autoload colorscheme file set background=dark - colorscheme solarized + colorscheme mustang filetype off filetype plugin indent on @@ -81,13 +92,12 @@ set undofile ''; - vimrcConfig.vam.knownPlugins = vimPlugins; + vimrcConfig.vam.knownPlugins = vimPlugins // customPlugins; vimrcConfig.vam.pluginDictionaries = [ - { name = "Gundo"; } - { name = "commentary"; } - { name = "vim-addon-nix"; } - { name = "colors-solarized"; } + { names = [ "Gundo" "commentary" "vim-addon-nix" ]; } + { name = "mustang2"; } ]; + }) ]; } -- cgit v1.2.3 From 67526d6c0849d9abc60c9a4cbee28e3a2dc707ce Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 25 May 2015 19:32:54 +0200 Subject: activate gitolite config --- modules/lass/gitolite-base.nix | 172 +++++++++++++++++++++++++++++ modules/mors/default.nix | 1 + modules/mors/repos.nix | 75 +++++++++++++ modules/uriel/default.nix | 239 +---------------------------------------- modules/uriel/repos.nix | 75 +++++++++++++ 5 files changed, 324 insertions(+), 238 deletions(-) create mode 100644 modules/lass/gitolite-base.nix create mode 100644 modules/mors/repos.nix create mode 100644 modules/uriel/repos.nix diff --git a/modules/lass/gitolite-base.nix b/modules/lass/gitolite-base.nix new file mode 100644 index 000000000..9fcdbb9e9 --- /dev/null +++ b/modules/lass/gitolite-base.nix @@ -0,0 +1,172 @@ +{ config, ... }: + +{ + services.gitolite = { + mutable = false; + keys = { + lass = config.sshKeys.lass.pub; + }; + rc = '' + %RC = ( + UMASK => 0077, + GIT_CONFIG_KEYS => "", + LOG_EXTRA => 1, + ROLES => { + READERS => 1, + WRITERS => 1, + }, + LOCAL_CODE => "$ENV{HOME}/.gitolite", + ENABLE => [ + 'help', + 'desc', + 'info', + 'perms', + 'writable', + 'ssh-authkeys', + 'git-config', + 'daemon', + 'gitweb', + 'repo-specific-hooks', + ], + ); + 1; + ''; + + hooks.repoSpecific = { + irc-announce = '' + #! /bin/sh + set -euf + + config_file="$GL_ADMIN_BASE/conf/irc-announce.conf" + if test -f "$config_file"; then + . "$config_file" + fi + + # XXX when changing IRC_CHANNEL or IRC_SERVER/_PORT, don't forget to update + # any relevant gitolite LOCAL_CODE! + # CAVEAT we hope that IRC_NICK is unique + IRC_NICK="''${IRC_NICK-gl$GL_TID}" + IRC_CHANNEL="''${IRC_CHANNEL-#retiolum}" + IRC_SERVER="''${IRC_SERVER-ire.retiolum}" + IRC_PORT="''${IRC_PORT-6667}" + + # for privmsg_cat below + export IRC_CHANNEL + + # collect users that are mentioned in the gitolite configuration + interested_users="$(perl -e ' + do "gl-conf"; + print join(" ", keys%{ $one_repo{$ENV{"GL_REPO"}} }); + ')" + + # CAVEAT beware of real TABs in grep pattern! + # CAVEAT there will never be more than 42 relevant log entries! + tab=$(printf '\x09') + log="$(tail -n 42 "$GL_LOGFILE" | grep "^[^$tab]*$tab$GL_TID$tab" || :)" + + update_log="$(echo "$log" | grep "^[^$tab]*$tab$GL_TID''${tab}update")" + + # (debug output) + env | sed 's/^/env: /' + echo "$log" | sed 's/^/log: /' + + # see http://gitolite.com/gitolite/dev-notes.html#lff + reponame=$(echo "$update_log" | cut -f 4) + username=$(echo "$update_log" | cut -f 5) + ref_name=$(echo "$update_log" | cut -f 7 | sed 's|^refs/heads/||') + old_sha=$(echo "$update_log" | cut -f 8) + new_sha=$(echo "$update_log" | cut -f 9) + + # check if new branch is created + if test $old_sha = 0000000000000000000000000000000000000000; then + # TODO what should we really show? + old_sha=$new_sha^ + fi + + # + git_log="$(git log $old_sha..$new_sha --pretty=oneline --abbrev-commit)" + commit_count=$(echo "$git_log" | wc -l) + + # echo2 and cat2 are used output to both, stdout and stderr + # This is used to see what we send to the irc server. (debug output) + echo2() { echo "$*"; echo "$*" >&2; } + cat2() { tee /dev/stderr; } + + # privmsg_cat transforms stdin to a privmsg + privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; } + + # ircin is used to feed the output of netcat back to the "irc client" + # so we can implement expect-like behavior with sed^_^ + # XXX mkselfdestructingtmpfifo would be nice instead of this cruft + tmpdir="$(mktemp -d irc-announce_XXXXXXXX)" + cd "$tmpdir" + mkfifo ircin + trap " + rm ircin + cd '$OLDPWD' + rmdir '$tmpdir' + trap - EXIT INT QUIT + " EXIT INT QUIT + + # + # + # + { + echo2 "USER $LOGNAME 0 * :$LOGNAME@$(hostname)" + echo2 "NICK $IRC_NICK" + + # wait for MODE message + sed -n '/^:[^ ]* MODE /q' + + echo2 "JOIN $IRC_CHANNEL" + + echo "$interested_users" \ + | tr ' ' '\n' \ + | grep -v "^$GL_USER" \ + | sed 's/$/: poke/' \ + | privmsg_cat \ + | cat2 + + printf '[\x0313%s\x03] %s pushed %s new commit%s to \x036%s %s\x03\n' \ + "$reponame" \ + "$username" \ + "$commit_count" \ + "$(test $commit_count = 1 || echo s)" \ + "$(hostname)" \ + "$ref_name" \ + | privmsg_cat \ + | cat2 + + echo "$git_log" \ + | sed 's/^/\x0314/;s/ /\x03 /' \ + | privmsg_cat \ + | cat2 + + echo2 "PART $IRC_CHANNEL" + + # wait for PART confirmation + sed -n '/:'"$IRC_NICK"'![^ ]* PART /q' + + echo2 'QUIT :Gone to have lunch' + } < ircin \ + | nc "$IRC_SERVER" "$IRC_PORT" | tee -a ircin + ''; + }; + customFiles = [ + { + filename = ".gitolite/conf/irc-announce.conf"; + content = '' + IRC_NICK="$(hostname)$GL_TID" + case "$GL_REPO" in + brain|painload|services|load-env|config) + IRC_CHANNEL='#retiolum' + ;; + *) + IRC_CHANNEL='&testing' + ;; + esac + ''; + } + ]; + }; +} diff --git a/modules/mors/default.nix b/modules/mors/default.nix index 8768cd1ec..c7d1f1b9a 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 000000000..6d3cf2157 --- /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"; + }; + + }; + }; +} diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix index 5ff37117d..e57a4dafb 100644 --- a/modules/uriel/default.nix +++ b/modules/uriel/default.nix @@ -16,250 +16,13 @@ ../../secrets/uriel-pw.nix ../lass/sshkeys.nix ../lass/bird.nix + ./repos.nix ]; nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; rev = "ffe3f799a2eb565e1755a6a18260ece5cbbd746b"; }; - services.gitolite = { - keys = { - uriel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM1v/N0G7k48thX1vIALTdqrdYUvYM+SvHRq/rCcKLC2 lass@mors"; - lass = config.sshKeys.lass.pub; - }; - config = '' - repo emse-hsdb - RW+ = lass - R = tv - option hook.post-receive = irc-announce - - repo pong - RW+ = lass - R = tv - option hook.post-receive = irc-announce - - repo load-env - RW+ = lass - RW+ = uriel - R = tv - option hook.post-receive = irc-announce - - repo pass - RW+ = lass - RW+ = uriel - - repo testing - RW+ = @all - - repo painload - RW+ = lass - R = tv - R = makefu - option hook.post-receive = irc-announce - - repo brain - RW+ = uriel - R = lass - R = tv - R = makefu - option hook.post-receive = irc-announce - - repo services - RW+ = lass - R = tv - R = makefu - option hook.post-receive = irc-announce - - repo emse-drywall - RW+ = lass - R = tv - R = uriel - option hook.post-receive = irc-announce - - repo emse-db - RW+ = lass - R = tv - option hook.post-receive = irc-announce - - repo config - RW+ = lass - RW+ = uriel - option hook.post-receive = irc-announce - - repo teeest - RW+ = lass - option hook.post-receive = irc-announce - ''; - - rc = '' - %RC = ( - UMASK => 0077, - GIT_CONFIG_KEYS => "", - LOG_EXTRA => 1, - ROLES => { - READERS => 1, - WRITERS => 1, - }, - LOCAL_CODE => "$ENV{HOME}/.gitolite", - ENABLE => [ - 'help', - 'desc', - 'info', - 'perms', - 'writable', - 'ssh-authkeys', - 'git-config', - 'daemon', - 'gitweb', - 'repo-specific-hooks', - ], - ); - 1; - ''; - - hooks.repoSpecific = { - irc-announce = '' - #! /bin/sh - set -euf - - config_file="$GL_ADMIN_BASE/conf/irc-announce.conf" - if test -f "$config_file"; then - . "$config_file" - fi - - # XXX when changing IRC_CHANNEL or IRC_SERVER/_PORT, don't forget to update - # any relevant gitolite LOCAL_CODE! - # CAVEAT we hope that IRC_NICK is unique - IRC_NICK="''${IRC_NICK-gl$GL_TID}" - IRC_CHANNEL="''${IRC_CHANNEL-#retiolum}" - IRC_SERVER="''${IRC_SERVER-ire.retiolum}" - IRC_PORT="''${IRC_PORT-6667}" - - # for privmsg_cat below - export IRC_CHANNEL - - # collect users that are mentioned in the gitolite configuration - interested_users="$(perl -e ' - do "gl-conf"; - print join(" ", keys%{ $one_repo{$ENV{"GL_REPO"}} }); - ')" - - # CAVEAT beware of real TABs in grep pattern! - # CAVEAT there will never be more than 42 relevant log entries! - tab=$(printf '\x09') - log="$(tail -n 42 "$GL_LOGFILE" | grep "^[^$tab]*$tab$GL_TID$tab" || :)" - - update_log="$(echo "$log" | grep "^[^$tab]*$tab$GL_TID''${tab}update")" - - # (debug output) - env | sed 's/^/env: /' - echo "$log" | sed 's/^/log: /' - - # see http://gitolite.com/gitolite/dev-notes.html#lff - reponame=$(echo "$update_log" | cut -f 4) - username=$(echo "$update_log" | cut -f 5) - ref_name=$(echo "$update_log" | cut -f 7 | sed 's|^refs/heads/||') - old_sha=$(echo "$update_log" | cut -f 8) - new_sha=$(echo "$update_log" | cut -f 9) - - # check if new branch is created - if test $old_sha = 0000000000000000000000000000000000000000; then - # TODO what should we really show? - old_sha=$new_sha^ - fi - - # - git_log="$(git log $old_sha..$new_sha --pretty=oneline --abbrev-commit)" - commit_count=$(echo "$git_log" | wc -l) - - # echo2 and cat2 are used output to both, stdout and stderr - # This is used to see what we send to the irc server. (debug output) - echo2() { echo "$*"; echo "$*" >&2; } - cat2() { tee /dev/stderr; } - - # privmsg_cat transforms stdin to a privmsg - privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; } - - # ircin is used to feed the output of netcat back to the "irc client" - # so we can implement expect-like behavior with sed^_^ - # XXX mkselfdestructingtmpfifo would be nice instead of this cruft - tmpdir="$(mktemp -d irc-announce_XXXXXXXX)" - cd "$tmpdir" - mkfifo ircin - trap " - rm ircin - cd '$OLDPWD' - rmdir '$tmpdir' - trap - EXIT INT QUIT - " EXIT INT QUIT - - # - # - # - { - echo2 "USER $LOGNAME 0 * :$LOGNAME@$(hostname)" - echo2 "NICK $IRC_NICK" - - # wait for MODE message - sed -n '/^:[^ ]* MODE /q' - - echo2 "JOIN $IRC_CHANNEL" - - echo "$interested_users" \ - | tr ' ' '\n' \ - | grep -v "^$GL_USER" \ - | sed 's/$/: poke/' \ - | privmsg_cat \ - | cat2 - - printf '[\x0313%s\x03] %s pushed %s new commit%s to \x036%s %s\x03\n' \ - "$reponame" \ - "$username" \ - "$commit_count" \ - "$(test $commit_count = 1 || echo s)" \ - "$(hostname)" \ - "$ref_name" \ - | privmsg_cat \ - | cat2 - - echo "$git_log" \ - | sed 's/^/\x0314/;s/ /\x03 /' \ - | privmsg_cat \ - | cat2 - - echo2 "PART $IRC_CHANNEL" - - # wait for PART confirmation - sed -n '/:'"$IRC_NICK"'![^ ]* PART /q' - - echo2 'QUIT :Gone to have lunch' - } < ircin \ - | nc "$IRC_SERVER" "$IRC_PORT" | tee -a ircin - ''; - }; - - customFiles = [ - { - filename = ".gitolite/conf/irc-announce.conf"; - content = '' - IRC_NICK="$(hostname)$GL_TID" - case "$GL_REPO" in - brain|painload|services|load-env|pong|config) - IRC_CHANNEL='#retiolum' - ;; - emse*) - IRC_CHANNEL='#emse' - ;; - *) - IRC_CHANNEL='&testing' - ;; - esac - ''; - } - ]; - }; - - networking.hostName = "uriel"; networking.wireless.enable = true; nix.maxJobs = 2; diff --git a/modules/uriel/repos.nix b/modules/uriel/repos.nix new file mode 100644 index 000000000..6d3cf2157 --- /dev/null +++ b/modules/uriel/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.2.3 From bcd6a13478397310a2d69c39bfc9ebff5a1c0ade 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(-) diff --git a/modules/mors/default.nix b/modules/mors/default.nix index c7d1f1b9a..6dfd05039 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 e57a4dafb..3d7935362 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.2.3 From 224c8965eef21b3f003d1ffd28cd0643765545d8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 29 May 2015 02:43:46 +0200 Subject: update vim.nix --- modules/lass/vim.nix | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/modules/lass/vim.nix b/modules/lass/vim.nix index 56a20c383..1000b8da6 100644 --- a/modules/lass/vim.nix +++ b/modules/lass/vim.nix @@ -13,8 +13,8 @@ let in { - environment.systemPackages = with pkgs; [ - (vim_configurable.customize { + environment.systemPackages = [ + (pkgs.vim_configurable.customize { name = "vim"; vimrcConfig.customRC = '' @@ -58,8 +58,6 @@ in { "Tabwidth set ts=2 sts=2 sw=2 et - autocmd BufRead *.js,*.json set ts=2 sts=2 sw=2 et - autocmd BufRead *.hs set ts=4 sts=4 sw=4 et " create Backup/tmp/undo dirs function! InitBackupDir() @@ -90,12 +88,24 @@ in { set viminfo='20,<1000,s100,h,n~/.vim/tmp/info set undodir=$HOME/.vim/undo set undofile + + " highlight whitespaces + highlight ExtraWhitespace ctermbg=red guibg=red + match ExtraWhitespace /\s\+$/ + autocmd BufWinEnter * match ExtraWhitespace /\s\+$/ + autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@ Date: Fri, 29 May 2015 02:44:04 +0200 Subject: add uriel to gitolite --- modules/lass/gitolite-base.nix | 1 + modules/lass/sshkeys.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/modules/lass/gitolite-base.nix b/modules/lass/gitolite-base.nix index 9fcdbb9e9..1448e8604 100644 --- a/modules/lass/gitolite-base.nix +++ b/modules/lass/gitolite-base.nix @@ -5,6 +5,7 @@ mutable = false; keys = { lass = config.sshKeys.lass.pub; + uriel = config.sshKeys.uriel.pub; }; rc = '' %RC = ( diff --git a/modules/lass/sshkeys.nix b/modules/lass/sshkeys.nix index 24c056644..f2b0786e5 100644 --- a/modules/lass/sshkeys.nix +++ b/modules/lass/sshkeys.nix @@ -6,4 +6,6 @@ ]; config.sshKeys.lass.pub = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAp83zynhIueJJsWlSEykVSBrrgBFKq38+vT8bRfa+csqyjZBl2SQFuCPo+Qbh49mwchpZRshBa9jQEIGqmXxv/PYdfBFQuOFgyUq9ZcTZUXqeynicg/SyOYFW86iiqYralIAkuGPfQ4howLPVyjTZtWeEeeEttom6p6LMY5Aumjz2em0FG0n9rRFY2fBzrdYAgk9C0N6ojCs/Gzknk9SGntA96MDqHJ1HXWFMfmwOLCnxtE5TY30MqSmkrJb7Fsejwjoqoe9Y/mCaR0LpG2cStC1+37GbHJNH0caCMaQCX8qdfgMVbWTVeFWtV6aWOaRgwLrPDYn4cHWQJqTfhtPrNQ== lass@mors"; + + config.sshKeys.uriel.pub = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDExWuRcltGM2FqXO695nm6/QY3wU3r1bDTyCpMrLfUSym7TxcXDSmZSWcueexPXV6GENuUfjJPZswOdWqIo5u2AXw9t0aGvwEDmI6uJ7K5nzQOsXIneGMdYuoOaAzWI8pxZ4N+lIP1HsOYttIPDp8RwU6kyG+Ud8mnVHWSTO13C7xC9vePnDP6b+44nHS691Zj3X/Cq35Ls0ISC3EM17jreucdP62L3TKk2R4NCm3Sjqj+OYEv0LAqIpgqSw5FypTYQgNByxRcIcNDlri63Q1yVftUP1338UiUfxtraUu6cqa2CdsHQmtX5mTNWEluVWO3uUKTz9zla3rShC+d3qvr lass@uriel"; } -- cgit v1.2.3 From 8d8f111d0fff976003038373ea59026ddfe6d741 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 29 May 2015 02:44:54 +0200 Subject: allow more users to do audio --- modules/lass/virtualbox.nix | 2 +- modules/lass/wine.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/lass/virtualbox.nix b/modules/lass/virtualbox.nix index 82d32bb1a..026203124 100644 --- a/modules/lass/virtualbox.nix +++ b/modules/lass/virtualbox.nix @@ -12,7 +12,7 @@ in { description = "user for running VirtualBox"; home = "/home/virtual"; useDefaultShell = true; - extraGroups = [ "vboxusers" ]; + extraGroups = [ "vboxusers" "audio" ]; createHome = true; }; }; diff --git a/modules/lass/wine.nix b/modules/lass/wine.nix index b9413d662..8d55da7fd 100644 --- a/modules/lass/wine.nix +++ b/modules/lass/wine.nix @@ -13,7 +13,7 @@ in { description = "user for running wine"; home = "/home/wine"; useDefaultShell = true; - extraGroups = []; + extraGroups = [ "audio" ]; createHome = true; }; }; -- cgit v1.2.3 From b07eb816b3d985ceb705cba30fea119e1c956eaa Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 1 Jun 2015 03:09:29 +0200 Subject: base: add terminfo for urxvt --- modules/lass/base.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/lass/base.nix b/modules/lass/base.nix index 29010dd91..87127fb80 100644 --- a/modules/lass/base.nix +++ b/modules/lass/base.nix @@ -24,6 +24,7 @@ environment.systemPackages = with pkgs; [ git most + rxvt_unicode.terminfo #network iptables -- cgit v1.2.3 From da8694ed1197d943a9f635f237f2b2339236f9eb Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 1 Jun 2015 03:10:06 +0200 Subject: base: allow icmp on all interfaces --- modules/lass/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/lass/base.nix b/modules/lass/base.nix index 87127fb80..3a8d879eb 100644 --- a/modules/lass/base.nix +++ b/modules/lass/base.nix @@ -94,10 +94,10 @@ extraCommands = '' iptables -A INPUT -j ACCEPT -m conntrack --ctstate RELATED,ESTABLISHED iptables -A INPUT -j ACCEPT -i lo + iptables -A INPUT -j ACCEPT -p icmp #iptables -N Retiolum iptables -A INPUT -j Retiolum -i retiolum - iptables -A Retiolum -j ACCEPT -p icmp iptables -A Retiolum -j ACCEPT -m conntrack --ctstate RELATED,ESTABLISHED iptables -A Retiolum -j REJECT -p tcp --reject-with tcp-reset iptables -A Retiolum -j REJECT -p udp --reject-with icmp-port-unreachable -- cgit v1.2.3 From 1da4b25cb8554f7b14e7192365e21349a00ce425 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(+) diff --git a/modules/mors/repos.nix b/modules/mors/repos.nix index 6d3cf2157..d54d43725 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 6d3cf2157..d54d43725 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.2.3 From 388dfb3035497f5eb6c4ceeef44ba4637c54ab07 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 1 Jun 2015 03:10:59 +0200 Subject: gitolite: add xmonad-config repo --- modules/lass/gitolite-base.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/lass/gitolite-base.nix b/modules/lass/gitolite-base.nix index 1448e8604..b47629956 100644 --- a/modules/lass/gitolite-base.nix +++ b/modules/lass/gitolite-base.nix @@ -33,7 +33,7 @@ 1; ''; - hooks.repoSpecific = { + repoSpecificHooks = { irc-announce = '' #! /bin/sh set -euf @@ -155,8 +155,8 @@ }; customFiles = [ { - filename = ".gitolite/conf/irc-announce.conf"; - content = '' + path = ".gitolite/conf/irc-announce.conf"; + file = '' IRC_NICK="$(hostname)$GL_TID" case "$GL_REPO" in brain|painload|services|load-env|config) -- cgit v1.2.3 From ac6cb36531c47b711839517ad024488c30474017 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 5 Jun 2015 12:55:51 +0200 Subject: vim: change escape timeout --- modules/lass/vim.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/lass/vim.nix b/modules/