vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

allow empty conf/stack in nginx config generation

Browse source 
needed for QE users that may not have one yet
This commit is contained in:
Evan Cordell 2017-02-23 15:10:35 -05:00
parent 0003022549
commit f42200a303
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
conf/init/nginx_conf_create.sh
View file

@ -28,8 +28,12 @@ def generate_server_config(config):
""" """
Generates server config from the app config Generates server config from the app config
""" """
if config:
tuf_server = config.get('TUF_SERVER', None) tuf_server = config.get('TUF_SERVER', None)
signing_enabled = config.get('FEATURE_SIGNING', False) signing_enabled = config.get('FEATURE_SIGNING', False)
else:
tuf_server = None
signing_enabled = False
write_config('conf/nginx/server-base.conf', write_config('conf/nginx/server-base.conf',
tuf_server=tuf_server, tuf_server=tuf_server,
@ -37,7 +41,10 @@ def generate_server_config(config):
if __name__ == "__main__": if __name__ == "__main__":
if os.path.exists('conf/stack/config.yaml'):
with open('conf/stack/config.yaml', 'r') as f: with open('conf/stack/config.yaml', 'r') as f:
config = yaml.load(f) config = yaml.load(f)
else:
config = None
generate_server_config(config) generate_server_config(config)
generate_nginx_config() generate_nginx_config()