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

rename config values to remove "Quay" (#1431)

Browse source
This commit is contained in:
Jimmy Zelinskie 2016-05-03 13:11:21 -04:00
parent e502f50c88
commit f842545b3e
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
config.py
View file

@ -298,9 +298,6 @@ class DefaultConfig(object):
# If None, will be calculated off of the SERVER_HOSTNAME (default)
JWTPROXY_AUDIENCE = None
# The location of the private key generated for this instance
INSTANCE_SERVICE_KEY_LOCATION = 'conf/quay.pem'
# Torrent management flags
FEATURE_BITTORRENT = False
BITTORRENT_PIECE_SIZE = 512 * 1024
@ -323,7 +320,9 @@ class DefaultConfig(object):
# lowest user in the database will be used.
SERVICE_LOG_ACCOUNT_ID = None
# Quay's service key expiration in minutes
QUAY_SERVICE_KEY_EXPIRATION = 120
# The location of the private key generated for this instance
INSTANCE_SERVICE_KEY_LOCATION = 'conf/quay.pem'
# This instance's service key expiration in minutes
INSTANCE_SERVICE_KEY_EXPIRATION = 120
# Number of minutes between expiration refresh in minutes
QUAY_SERVICE_KEY_REFRESH = 60
INSTANCE_SERVICE_KEY_REFRESH = 60

4
workers/service_key_worker.py
View file

@ -11,7 +11,7 @@ class ServiceKeyWorker(Worker):
def __init__(self):
super(ServiceKeyWorker, self).__init__()
self.add_operation(self._refresh_service_keys,
app.config.get('QUAY_SERVICE_KEY_REFRESH', 60)*60)
app.config.get('INSTANCE_SERVICE_KEY_REFRESH', 60)*60)
def _refresh_service_keys(self):
"""
@ -20,7 +20,7 @@ class ServiceKeyWorker(Worker):
with open("/conf/quay.kid") as f:
kid = f.read()
minutes_until_expiration = app.config.get('QUAY_SERVICE_KEY_EXPIRATION', 120)
minutes_until_expiration = app.config.get('INSTANCE_SERVICE_KEY_EXPIRATION', 120)
expiration = timedelta(minutes=minutes_until_expiration)
logger.debug('Starting refresh of automatic service keys')