From 3f1168d2b0788e3fc9c5923fc9dfbaafe06f8c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Sun, 11 Nov 2012 21:38:26 -0300 Subject: Appropiately call the update hook --- Makefile | 2 +- git-hooks/hackers-update | 22 ++++++++++++++++++++++ git-hooks/post-receive | 22 ---------------------- 3 files changed, 23 insertions(+), 23 deletions(-) create mode 100755 git-hooks/hackers-update delete mode 100755 git-hooks/post-receive diff --git a/Makefile b/Makefile index 5031c03..62690e3 100644 --- a/Makefile +++ b/Makefile @@ -44,6 +44,6 @@ install: check chmod 700 $(PREFIX) && \ chmod 700 .ssh && \ chmod 600 .ssh/authorized_keys && \ - ln -s $(PREFIX)/.ssh/git-hooks/* hackers.git/hooks/ && \ + ln -s $(PREFIX)/.ssh/git-hooks/hackers-update hackers.git/hooks/post-receive && \ ln -s $(PREFIX)/.ssh/git-shell-commands && \ chown -R $(USER):$(USER) $(PREFIX) diff --git a/git-hooks/hackers-update b/git-hooks/hackers-update new file mode 100755 index 0000000..b78c54d --- /dev/null +++ b/git-hooks/hackers-update @@ -0,0 +1,22 @@ +#!/bin/bash +# post-receive hook, updates /srv/git/.ssh after pushing to this repo +# install: +# git clone hackers.git .ssh +# cp .ssh/git-hooks/post-receive hackers.git/hooks/ + +# fail on any error +set -e + +# the ssh dir +ssh_dir=${HOME}/.ssh + +# pull this repo +git --git-dir ${ssh_dir}/.git \ + --work-tree ${ssh_dir} \ + pull origin master + +# secure the files (sshd will refuse connections otherwise) +chmod 600 ${ssh_dir}/authorized_keys +chmod 700 ${ssh_dir} + +exit $? diff --git a/git-hooks/post-receive b/git-hooks/post-receive deleted file mode 100755 index b78c54d..0000000 --- a/git-hooks/post-receive +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# post-receive hook, updates /srv/git/.ssh after pushing to this repo -# install: -# git clone hackers.git .ssh -# cp .ssh/git-hooks/post-receive hackers.git/hooks/ - -# fail on any error -set -e - -# the ssh dir -ssh_dir=${HOME}/.ssh - -# pull this repo -git --git-dir ${ssh_dir}/.git \ - --work-tree ${ssh_dir} \ - pull origin master - -# secure the files (sshd will refuse connections otherwise) -chmod 600 ${ssh_dir}/authorized_keys -chmod 700 ${ssh_dir} - -exit $? -- cgit v1.2.3