summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Bridon <bochecha@daitauha.fr>2015-01-23 11:23:28 +0100
committerMathieu Bridon <bochecha@daitauha.fr>2015-01-23 11:23:28 +0100
commit3ed1da51ca8c1eb9e497df8dc0fbe351b7ed31d5 (patch)
treed4f4e3cc7d21ffe0c57fa21b9c51e1fb4bb84f88
parent9c8deb1637792bc1f64f723bb0c94848b95b41d6 (diff)
downloadansible-3ed1da51ca8c1eb9e497df8dc0fbe351b7ed31d5.tar.gz
ansible-3ed1da51ca8c1eb9e497df8dc0fbe351b7ed31d5.tar.xz
ansible-3ed1da51ca8c1eb9e497df8dc0fbe351b7ed31d5.zip
distgit: Remove the update-chained stuff
This doesn't work with Gitolite.
-rw-r--r--roles/distgit/files/setup_git_package10
-rw-r--r--roles/git/hooks/files/update-chained12
-rw-r--r--roles/git/hooks/tasks/main.yml1
3 files changed, 0 insertions, 23 deletions
diff --git a/roles/distgit/files/setup_git_package b/roles/distgit/files/setup_git_package
index df7692730..4b30d5aeb 100644
--- a/roles/distgit/files/setup_git_package
+++ b/roles/distgit/files/setup_git_package
@@ -108,16 +108,6 @@ git commit -q -m 'Initial setup of the repo' --author "$AUTHOR"
git push -q origin master
popd >/dev/null
-# Setup our update hooks
-#mkdir -p $GITROOT/$PACKAGE.git/hooks/update-chained.d
-#ln -s /etc/gitolite/hooks/common/update \
-# $GITROOT/$PACKAGE.git/hooks/update-chained.d/update-gitolite
-#ln -s /usr/share/git-core/update-block-push-origin \
-# $GITROOT/$PACKAGE.git/hooks/update-chained.d/update-block-push-origin
-
-# This one kicks off all the others in update-chained.d
-#ln -s /usr/share/git-core/update-chained $GITROOT/$PACKAGE.git/hooks/update
-
# Place the gitolite update hook in place since we're not using our own
ln -s /etc/gitolite/hooks/common/update $GITROOT/$PACKAGE.git/hooks/update
diff --git a/roles/git/hooks/files/update-chained b/roles/git/hooks/files/update-chained
deleted file mode 100644
index 6062f4bf9..000000000
--- a/roles/git/hooks/files/update-chained
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-
-refname="${1}"
-sha1_old="${2}"
-sha1_new="${3}"
-
-
-$GIT_DIR/hooks/update-chained.d/update-gitolite "$refname" "$sha1_old" "$sha1_new" || exit 1
-$GIT_DIR/hooks/update-chained.d/update-block-push-origin "$refname" "$sha1_old" "$sha1_new" || exit 1
-
-exit 0
diff --git a/roles/git/hooks/tasks/main.yml b/roles/git/hooks/tasks/main.yml
index 84a049622..ff17b80e9 100644
--- a/roles/git/hooks/tasks/main.yml
+++ b/roles/git/hooks/tasks/main.yml
@@ -14,7 +14,6 @@
- post-receive-fedmsg
- post-receive-chained
- update-block-push-origin
- - update-chained
- name: install the git mail hooks
copy: src={{item}} dest=/usr/share/git-core/mail-hooks/ mode=0755