release-engineering/dist-git
1
0
Fork 0
mirror of https://github.com/release-engineering/dist-git.git synced 2025-02-23 15:02:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add lookaside_dir option, deprecate cache_dir

Browse source
This commit is contained in:
clime 2018-08-14 21:06:02 +02:00
parent c0643b9dc6
commit 26bb3048c4
5 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
beaker-tests/tests/fedpkg-cache-dir-override-test/dist-git.conf → beaker-tests/tests/fedpkg-lookaside_dir-test/dist-git.conf
View file

@ -5,7 +5,7 @@ git_author_email = rel-eng@lists.fedoraproject.org
cache_dir = /var/lib/dist-git/cache
gitroot_dir = /var/lib/dist-git/git
cache_dir_override = /var/lib/dist-git/cache/lookaside/pkgs/ns
lookaside_dir = /var/lib/dist-git/cache/lookaside/pkgs/ns
gitolite = True
grok = True

0
beaker-tests/tests/fedpkg-cache-dir-override-test/run.sh → beaker-tests/tests/fedpkg-lookaside_dir-test/run.sh
View file

8
configs/dist-git/dist-git.conf
View file

@ -2,11 +2,11 @@
git_author_name = Fedora Release Engineering
git_author_email = rel-eng@lists.fedoraproject.org
cache_dir = /var/lib/dist-git/cache
gitroot_dir = /var/lib/dist-git/git
# deprecated:
# cache_dir_override = /var/lib/dist-git/cache/lookaside/pkgs
# cache_dir = /var/lib/dist-git/cache
lookaside_dir = /var/lib/dist-git/cache/lookaside/pkgs
gitroot_dir = /var/lib/dist-git/git
gitolite = True
grok = True

4
docs/scripts/httpd/dist-git-stg.conf
View file

@ -2,8 +2,8 @@
git_author_name = Release Engineering
git_author_email = rel-eng@redhat.com
cache_dir = /srv/cache/lookaside
cache_dir_override = /srv/cache/lookaside
cache_dir = /srv/cache
lookaside_dir = /srv/cache/lookaside/pkgs
gitroot_dir = /srv/git

10
scripts/httpd/upload.cgi
View file

@ -176,10 +176,12 @@ def main():
if config['dist-git'].get('default_namespace'):
name = ensure_namespaced(name, config['dist-git'].get('default_namespace')).strip('/')
module_dir = os.path.join(config['dist-git']['cache_dir'], "lookaside/pkgs", name)
if config['dist-git'].get('cache_dir_override'):
module_dir = os.path.join(config['dist-git']['cache_dir_override'], name)
if config['dist-git'].get('lookaside_dir'):
module_dir = os.path.join(config['dist-git']['lookaside_dir'], name)
elif config['dist-git'].get('cache_dir'): # deprecated
module_dir = os.path.join(config['dist-git']['cache_dir'], 'lookaside/pkgs', name)
else:
raise Exception('Please, set lookaside_dir config option.')
hash_dir = os.path.join(module_dir, filename, hash_type, checksum)
msgpath = os.path.join(name, filename, hash_type, checksum, filename)