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 -------------------------------------------------- 1 file changed, 118 deletions(-) (limited to 'modules/lass/base.nix') 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 = { -- 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(+) (limited to 'modules/lass/base.nix') 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(-) (limited to 'modules/lass/base.nix') 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