Skip to content
Snippets Groups Projects
Commit 320c3c2c authored by Zitnik, Anze's avatar Zitnik, Anze
Browse files

Merge branch 'config-update' into 'master'

Updated clouditor host & port config

See merge request medina/evidence-collector!14
parents cfc71e8d 6186bb87
No related branches found
No related tags found
No related merge requests found
...@@ -16,6 +16,7 @@ redis_queue=low ...@@ -16,6 +16,7 @@ redis_queue=low
clouditor_host=192.168.33.14 clouditor_host=192.168.33.14
clouditor_port=9090 clouditor_port=9090
clouditor_oauth2_host=192.168.33.14
clouditor_oauth2_port=8080 clouditor_oauth2_port=8080
clouditor_client_id=clouditor clouditor_client_id=clouditor
clouditor_client_secret=clouditor clouditor_client_secret=clouditor
......
...@@ -4,7 +4,7 @@ import requests ...@@ -4,7 +4,7 @@ import requests
import urllib3 import urllib3
from datetime import datetime, timedelta from datetime import datetime, timedelta
CLOUDITOR_HOST = os.environ.get("clouditor_host") CLOUDITOR_OAUTH2_HOST = os.environ.get("clouditor_oauth2_host")
CLOUDITOR_OAUTH2_PORT = int(os.environ.get("clouditor_oauth2_port")) CLOUDITOR_OAUTH2_PORT = int(os.environ.get("clouditor_oauth2_port"))
CLIENT_ID = os.environ.get("clouditor_client_id") CLIENT_ID = os.environ.get("clouditor_client_id")
CLIENT_SECRET = os.environ.get("clouditor_client_secret") CLIENT_SECRET = os.environ.get("clouditor_client_secret")
...@@ -17,7 +17,7 @@ class ClouditorAuthentication(object): ...@@ -17,7 +17,7 @@ class ClouditorAuthentication(object):
self.__access_token = None self.__access_token = None
self.__token_expiration_time = None self.__token_expiration_time = None
self.__token_url = 'http://{}:{}/v1/auth/token'.format(CLOUDITOR_HOST, CLOUDITOR_OAUTH2_PORT) self.__token_url = 'http://{}:{}/v1/auth/token'.format(CLOUDITOR_OAUTH2_HOST, CLOUDITOR_OAUTH2_PORT)
self.__data = {'grant_type': 'client_credentials'} self.__data = {'grant_type': 'client_credentials'}
......
...@@ -19,9 +19,10 @@ data: ...@@ -19,9 +19,10 @@ data:
redis_port: '6379' redis_port: '6379'
redis_queue: 'low' redis_queue: 'low'
clouditor_host: 'security-assessment-svc' clouditor_host: 'security-assessment-grpc-svc'
clouditor_port: '9090' clouditor_port: '9092'
clouditor_oauth2_port: '8080' clouditor_oauth2_host: 'security-assessment-svc'
clouditor_oauth2_port: '8082'
wazuh_check_interval: '3600' wazuh_check_interval: '3600'
wazuh_rule_level: '10' wazuh_rule_level: '10'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment