From 80c2eb0367e26a8d0b0bc5c328080b8ff4a6f2ce Mon Sep 17 00:00:00 2001 From: Luke Faraone Date: Mon, 7 Oct 2013 12:32:26 -0400 Subject: [PATCH] Repoint to new repository (imported from commit bc90453bf9776b1e3d05c222f78cc66383278c32) --- servers/install-server | 2 +- servers/puppet/modules/zulip/manifests/git.pp | 8 ++++---- tools/post-receive | 2 +- tools/setup-git-repo | 2 +- tools/update-deployment | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/servers/install-server b/servers/install-server index 9107365543..4741bd4531 100755 --- a/servers/install-server +++ b/servers/install-server @@ -73,7 +73,7 @@ EOF2 # clone humbug repository cd /root rm -rf /root/humbug -git clone humbug@git.zulip.net:/srv/git/humbug.git +git clone git@git.zulip.net:eng/zulip.git humbug cd /root/humbug git checkout master EOF diff --git a/servers/puppet/modules/zulip/manifests/git.pp b/servers/puppet/modules/zulip/manifests/git.pp index 72e9507a07..8a15a7dca1 100644 --- a/servers/puppet/modules/zulip/manifests/git.pp +++ b/servers/puppet/modules/zulip/manifests/git.pp @@ -4,14 +4,14 @@ class zulip::git { $git_packages = [ ] package { $git_packages: ensure => "installed" } - file { '/srv/git/humbug.git': + file { '/home/git/repositories/eng/zulip.git/hooks': ensure => 'directory', - owner => 'humbug', - group => 'humbug', + owner => 'git', + group => 'git', mode => 755, } - file { '/srv/git/humbug.git/hooks/post-receive': + file { '/home/git/repositories/eng/zulip.git/hooks/post-receive': ensure => 'link', target => '/home/humbug/humbug/tools/post-receive', } diff --git a/tools/post-receive b/tools/post-receive index 81548567c3..c0a753ba9b 100755 --- a/tools/post-receive +++ b/tools/post-receive @@ -1,7 +1,7 @@ #!/usr/bin/env python # # Zulip's post-receive hook. There is a symlink -# from /srv/git/humbug.git/hooks/post-receive +# from /home/git/repositories/eng/zulip.git/hooks/post-receive # to ~humbug/humbug/tools/post-receive # on git.zulip.net. So to deploy changes to this script, run # diff --git a/tools/setup-git-repo b/tools/setup-git-repo index c7cc93f195..c4f0e2431c 100755 --- a/tools/setup-git-repo +++ b/tools/setup-git-repo @@ -2,7 +2,7 @@ if ! [ -d ".git/hooks/" ]; then echo "Error: Could not find .git/hooks directory" - echo "Please re-run this script from the root of your humbug.git checkout" + echo "Please re-run this script from the root of your zulip.git checkout" exit 1 fi diff --git a/tools/update-deployment b/tools/update-deployment index 065dbb6e1a..c1a9950802 100755 --- a/tools/update-deployment +++ b/tools/update-deployment @@ -43,7 +43,7 @@ deploy_path = os.path.join(DEPLOYMENTS_DIR, timestamp) logging.info("Cloning the repository") subprocess.check_call(["git", "clone", "-q", "-b", refname, - "humbug@git.zulip.net:/srv/git/humbug.git", + "git@git.zulip.net:eng/zulip.git", deploy_path], stdout=open('/dev/null', 'w')) os.chdir(deploy_path)