mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 14:32:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

publish index-v1.json and include a gpg signature

Browse source 
This gives a more flexible and direct way for many clients to consume the
index file. #969
This commit is contained in:
Hans-Christoph Steiner 2022-02-21 22:40:22 +01:00
parent 8e02c52a45
commit 707cd7addb
No known key found for this signature in database
GPG key ID: 3E177817BA1B9BFA
3 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/deploy.py
View file

@ -107,6 +107,8 @@ def update_awsbucket_s3cmd(repo_section):
indexxml = os.path.join(repo_section, 'index.xml')
indexjar = os.path.join(repo_section, 'index.jar')
indexv1jar = os.path.join(repo_section, 'index-v1.jar')
indexv1json = os.path.join(repo_section, 'index-v1.json')
indexv1jsonasc = os.path.join(repo_section, 'index-v1.json.asc')
s3url = s3bucketurl + '/fdroid/'
logging.debug('s3cmd sync new files in ' + repo_section + ' to ' + s3url)
@ -116,6 +118,8 @@ def update_awsbucket_s3cmd(repo_section):
'--exclude', indexxml,
'--exclude', indexjar,
'--exclude', indexv1jar,
'--exclude', indexv1json,
'--exclude', indexv1jsonasc,
repo_section, s3url]) != 0:
raise FDroidException()
logging.debug('s3cmd sync all files in ' + repo_section + ' to ' + s3url)
@ -124,6 +128,8 @@ def update_awsbucket_s3cmd(repo_section):
'--exclude', indexxml,
'--exclude', indexjar,
'--exclude', indexv1jar,
'--exclude', indexv1json,
'--exclude', indexv1jsonasc,
repo_section, s3url]) != 0:
raise FDroidException()
@ -251,6 +257,8 @@ def update_serverwebroot(serverwebroot, repo_section):
indexxml = os.path.join(repo_section, 'index.xml')
indexjar = os.path.join(repo_section, 'index.jar')
indexv1jar = os.path.join(repo_section, 'index-v1.jar')
indexv1json = os.path.join(repo_section, 'index-v1.json')
indexv1jsonasc = os.path.join(repo_section, 'index-v1.json.asc')
# Upload the first time without the index files and delay the deletion as
# much as possible, that keeps the repo functional while this update is
# running. Then once it is complete, rerun the command again to upload
@ -263,6 +271,8 @@ def update_serverwebroot(serverwebroot, repo_section):
+ ['--exclude', indexxml,
'--exclude', indexjar,
'--exclude', indexv1jar,
'--exclude', indexv1json,
'--exclude', indexv1jsonasc,
repo_section, serverwebroot]) != 0:
raise FDroidException()
if subprocess.call(rsyncargs + [repo_section, serverwebroot]) != 0: