diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-08-19 12:04:56 -0400 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-08-19 12:04:56 -0400 |
| commit | 212348145838e8791474b987efc624cba3fb8b00 (patch) | |
| tree | c4914439531f177fd24fb083b785446f0c35c910 /src/conf_mode/http-api.py | |
| parent | 589952faadcf7700702b24390c1d654706f3a857 (diff) | |
| parent | dc8cfa6dfd1d95890b3e14c928e3d2064451a851 (diff) | |
| download | vyos-1x-212348145838e8791474b987efc624cba3fb8b00.tar.gz vyos-1x-212348145838e8791474b987efc624cba3fb8b00.zip | |
Merge branch 'current' into equuleus
Diffstat (limited to 'src/conf_mode/http-api.py')
| -rwxr-xr-x | src/conf_mode/http-api.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/conf_mode/http-api.py b/src/conf_mode/http-api.py index c1d596ea3..1f91ac582 100755 --- a/src/conf_mode/http-api.py +++ b/src/conf_mode/http-api.py @@ -27,14 +27,6 @@ from vyos import ConfigError config_file = '/etc/vyos/http-api.conf' -default_config_data = { - 'listen_address' : '127.0.0.1', - 'port' : '8080', - 'strict' : 'false', - 'debug' : 'false', - 'api_keys' : [ {"id": "testapp", "key": "qwerty"} ] -} - vyos_conf_scripts_dir=vyos.defaults.directories['conf_mode'] # XXX: this model will need to be extended for tag nodes @@ -43,7 +35,8 @@ dependencies = [ ] def get_config(): - http_api = default_config_data + http_api = vyos.defaults.api_data + conf = Config() if not conf.exists('service https api'): return None |