Merge branch 'yaml-config' into 'master'

move config.py to config.yml

See merge request fdroid/fdroidserver!571
This commit is contained in:
Michael Pöhn 2020-11-05 23:00:32 +00:00
commit 196dc75481
18 changed files with 512 additions and 254 deletions

View file

@ -141,8 +141,8 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
ftp.chdir(homedir)
ftp.put(os.path.join(serverpath, '..', 'buildserver',
'config.buildserver.py'), 'config.py')
ftp.chmod('config.py', 0o600)
'config.buildserver.yml'), 'config.yml')
ftp.chmod('config.yml', 0o600)
# Copy over the ID (head commit hash) of the fdroidserver in use...
with open(os.path.join(os.getcwd(), 'tmp', 'fdroidserverid'), 'wb') as fp: