Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Switch the order of our two big pkgdb calls to resolve a race condition.

Browse source
This commit is contained in:
Ralph Bean 2015-12-18 16:22:10 +00:00
parent d29eec75ab
commit 1392043bbd
1 changed files with 29 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

57
roles/distgit/templates/genacls.sh
View file

@ -1,38 +1,39 @@
#!/bin/bash -e
export GL_BINDIR=/usr/bin
TEMPDIR=`mktemp -d -p /var/tmp genacls.XXXXX`
cd $TEMPDIR
# If this fails, then the -e option will cause the whole script to quit.
/usr/local/bin/genacls.pkgdb > gitolite.conf
# Then create the repos and branches on disk (if we need any new ones)
python /usr/local/bin/pkgdb_sync_git_branches.py
TEMPDIR=`mktemp -d -p /var/tmp genacls.XXXXX`
export GL_BINDIR=/usr/bin
mv gitolite.conf /etc/gitolite/conf/
chown gen-acls:gen-acls -R /etc/gitolite/conf/
HOME=/srv/git /usr/bin/gitolite compile
cd $TEMPDIR
# Only replace the acls if genacls completes successfully
if /usr/local/bin/genacls.pkgdb > gitolite.conf ; then
mv gitolite.conf /etc/gitolite/conf/
chown gen-acls:gen-acls -R /etc/gitolite/conf/
HOME=/srv/git /usr/bin/gitolite compile
# After compiling, we have to stick some magic into the gl-conf files of
# every repo so that gitolite will understand our symlinks from rpms/
cd /srv/git/repositories
for repodir in *.git; do
glconf=$repodir/gl-conf;
# After compiling, we have to stick some magic into the gl-conf files of
# every repo so that gitolite will understand our symlinks from rpms/
cd /srv/git/repositories
for repodir in *.git; do
glconf=$repodir/gl-conf;
# Strip off the '.git' on the end.
repo=${repodir::-4}
# Strip off the '.git' on the end.
repo=${repodir::-4}
# Check which repo from gitolite.conf won the gitolite race.
if grep --quiet rpms/ $glconf; then
# ...and map things one way
echo '$one_config{"'$repo'"} = $one_config{"rpms/'$repo'"};' >> $glconf;
echo '$one_repo{"'$repo'"} = $one_repo{"rpms/'$repo'"};' >> $glconf;
else
# or map them the other way
echo '$one_config{"rpms/'$repo'"} = $one_config{"'$repo'"};' >> $glconf;
echo '$one_repo{"rpms/'$repo'"} = $one_repo{"'$repo'"};' >> $glconf;
fi
done
fi
# Check which repo from gitolite.conf won the gitolite race.
if grep --quiet rpms/ $glconf; then
# ...and map things one way
echo '$one_config{"'$repo'"} = $one_config{"rpms/'$repo'"};' >> $glconf;
echo '$one_repo{"'$repo'"} = $one_repo{"rpms/'$repo'"};' >> $glconf;
else
# or map them the other way
echo '$one_config{"rpms/'$repo'"} = $one_config{"'$repo'"};' >> $glconf;
echo '$one_repo{"rpms/'$repo'"} = $one_repo{"'$repo'"};' >> $glconf;
fi
done
cd /