Page MenuHomeSoftware Heritage
Files F9340886

No OneTemporary
Actions

View Options

diff --git a/swh/web/config.py b/swh/web/config.py
index d99981398..dc63ef31f 100644
--- a/swh/web/config.py
+++ b/swh/web/config.py
@@ -1,129 +1,129 @@
# Copyright (C) 2017-2018 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU Affero General Public License version 3, or any later version
# See top-level LICENSE file for more information
from swh.core import config
from swh.storage import get_storage
from swh.indexer.storage import get_indexer_storage
from swh.vault.api.client import RemoteVaultClient
from swh.scheduler import get_scheduler
DEFAULT_CONFIG = {
'allowed_hosts': ('list', []),
'storage': ('dict', {
'cls': 'remote',
'args': {
'url': 'http://127.0.0.1:5002/',
'timeout': 10,
},
}),
'indexer_storage': ('dict', {
'cls': 'remote',
'args': {
'url': 'http://127.0.0.1:5007/',
'timeout': 1,
}
}),
'vault': ('string', 'http://127.0.0.1:5005/'),
'log_dir': ('string', '/tmp/swh/log'),
'debug': ('bool', False),
'serve_assets': ('bool', False),
'host': ('string', '127.0.0.1'),
'port': ('int', 5004),
'secret_key': ('string', 'development key'),
# do not display code highlighting for content > 1MB
'content_display_max_size': ('int', 1024 * 1024),
'throttling': ('dict', {
'cache_uri': None, # production: memcached as cache (127.0.0.1:11211)
# development: in-memory cache so None
'scopes': {
'swh_api': {
'limiter_rate': {
'default': '120/h'
},
'exempted_networks': ['127.0.0.0/8']
},
'swh_vault_cooking': {
'limiter_rate': {
'default': '120/h',
'GET': '60/m'
},
'exempted_networks': ['127.0.0.0/8']
},
'swh_save_origin': {
'limiter_rate': {
'default': '120/h',
'POST': '10/h'
},
'exempted_networks': ['127.0.0.0/8']
}
}
}),
'scheduler': ('dict', {
'cls': 'remote',
'args': {
'url': 'http://localhost:5008/'
}
}),
'grecaptcha': ('dict', {
'validation_url': 'https://www.google.com/recaptcha/api/siteverify',
'site_key': '',
'private_key': ''
}),
'production_db': ('string', '/var/lib/swh/web.sqlite3'),
'deposit': ('dict', {
'private_api_url': 'https://deposit.softwareheritage.org/1/private/',
'private_api_user': 'swhworker',
'private_api_password': ''
})
}
swhweb_config = {}
-def get_config(config_file='webapp/webapp'):
+def get_config(config_file='web/web'):
"""Read the configuration file `config_file`, update the app with
parameters (secret_key, conf) and return the parsed configuration as a
dict. If no configuration file is provided, return a default
configuration."""
if not swhweb_config:
cfg = config.load_named_config(config_file, DEFAULT_CONFIG)
swhweb_config.update(cfg)
config.prepare_folders(swhweb_config, 'log_dir')
swhweb_config['storage'] = get_storage(**swhweb_config['storage'])
swhweb_config['vault'] = RemoteVaultClient(swhweb_config['vault'])
swhweb_config['indexer_storage'] = \
get_indexer_storage(**swhweb_config['indexer_storage'])
swhweb_config['scheduler'] = get_scheduler(**swhweb_config['scheduler']) # noqa
return swhweb_config
def storage():
"""Return the current application's SWH storage.
"""
return get_config()['storage']
def vault():
"""Return the current application's SWH vault.
"""
return get_config()['vault']
def indexer_storage():
"""Return the current application's SWH indexer storage.
"""
return get_config()['indexer_storage']
def scheduler():
"""Return the current application's SWH scheduler.
"""
return get_config()['scheduler']

File Metadata

Mime Type
text/x-diff
Expires
Fri, Jul 4, 11:17 AM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3281583

Event Timeline

About · Developer information · Legal