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

Don't do the magic dist-git map in staging. Work towards phasing it out.

Browse source
This commit is contained in:
Ralph Bean 2015-12-22 17:19:42 +00:00
parent a57d418bfb
commit a9f1d0ca6f
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/distgit/templates/genacls.pkgdb
View file

@ -131,6 +131,7 @@ if __name__ == '__main__':
(pkg, ACTIVE[branch]) (pkg, ACTIVE[branch])
) )
{% if env != 'staging' %}
print '' print ''
print 'repo %s%s' % (key, pkg) print 'repo %s%s' % (key, pkg)
print '\n'.join(buffer) print '\n'.join(buffer)
@ -139,6 +140,7 @@ if __name__ == '__main__':
print ' RWC refs/tags/ = %s' % ' '.join(writers) print ' RWC refs/tags/ = %s' % ' '.join(writers)
if masters: if masters:
print ' RWC = %s' % ' '.join(masters) print ' RWC = %s' % ' '.join(masters)
{% endif %}
# Bring backward compatibility while we keep the symlinks in place # Bring backward compatibility while we keep the symlinks in place
# from the old to the new locations. # from the old to the new locations.

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

@ -14,6 +14,7 @@ mv gitolite.conf /etc/gitolite/conf/
chown gen-acls:gen-acls -R /etc/gitolite/conf/ chown gen-acls:gen-acls -R /etc/gitolite/conf/
HOME=/srv/git /usr/bin/gitolite compile HOME=/srv/git /usr/bin/gitolite compile
{% if env != 'staging' %}
# After compiling, we have to stick some magic into the gl-conf files of # 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/ # every repo so that gitolite will understand our symlinks from rpms/
cd /srv/git/repositories cd /srv/git/repositories
@ -34,6 +35,7 @@ for repodir in *.git; do
echo '$one_repo{"rpms/'$repo'"} = $one_repo{"'$repo'"};' >> $glconf; echo '$one_repo{"rpms/'$repo'"} = $one_repo{"'$repo'"};' >> $glconf;
fi fi
done done
{% endif %}
cd / cd /