From a1b7dc912e0ee485d060232184acee8081c1c451 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 10 Apr 2020 09:46:08 +0200 Subject: [PATCH] Re-instate keys --- ansible/templates/alerta.conf | 3 ++- ansible/templates/alertad.conf | 2 +- ansible/vars/alerta_cli_api_key.yml | 12 ++++++------ ansible/vars/alerta_mailer_api_key.yml | 12 ++++++------ 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ansible/templates/alerta.conf b/ansible/templates/alerta.conf index 38c4c23..0c14f14 100644 --- a/ansible/templates/alerta.conf +++ b/ansible/templates/alerta.conf @@ -1,9 +1,10 @@ [DEFAULT] +debug = True endpoint = http://localhost:8080/api +key = {{ alerta_cli_api_key }} output = psql sslverify = False timezone = Europe/London -debug = True [alerta-mailer] amqp_url = "{{ db_type }}://{{ db_user }}:{{ db_passwd }}@{{ db_loc }}" diff --git a/ansible/templates/alertad.conf b/ansible/templates/alertad.conf index 13d0929..c43df2c 100644 --- a/ansible/templates/alertad.conf +++ b/ansible/templates/alertad.conf @@ -11,7 +11,7 @@ ALLOWED_ENVIRONMENTS = [ BASE_URL = "/api" USE_PROXYFIX = True -AUTH_REQUIRED = False +AUTH_REQUIRED = True AUTH_PROVIDER = "keycloak" ADMIN_USERS = [ diff --git a/ansible/vars/alerta_cli_api_key.yml b/ansible/vars/alerta_cli_api_key.yml index bb74706..4abaca0 100644 --- a/ansible/vars/alerta_cli_api_key.yml +++ b/ansible/vars/alerta_cli_api_key.yml @@ -1,9 +1,9 @@ --- alerta_cli_api_key: !vault | $ANSIBLE_VAULT;1.1;AES256 - 30623065663233623665666462623566623461333132366630363030353836646538623032366566 - 3236656234633364633133373731646231363261633134630a346135336132393232333031376237 - 38316162363134303764656261613837663766666633386363303039663631643537373731386533 - 3139313262363935370a623839386233363661303463383230366565666434626465363436303063 - 35653331643632313661616138623230656562643863656338396135326564336236613365633336 - 6332313536663936393130353862313230343164306233353462 + 31613438623962623730323666633431383066306566653562393663376364373030303233653836 + 6664353163646430366436346530653463376464623164310a313965643737646563636263386564 + 66383965653138396338383938613134306438643537336531353437643239376135326564623737 + 6533666539346337340a333236343064656463383163386230313731343966363064626236336363 + 33396463666136613663356135643062666633356435643564353739616661303566363561613966 + 3164316364336135363331396363356266373666633731626262 diff --git a/ansible/vars/alerta_mailer_api_key.yml b/ansible/vars/alerta_mailer_api_key.yml index beca8f8..6d845bd 100644 --- a/ansible/vars/alerta_mailer_api_key.yml +++ b/ansible/vars/alerta_mailer_api_key.yml @@ -1,9 +1,9 @@ --- alerta_mailer_api_key: !vault | $ANSIBLE_VAULT;1.1;AES256 - 66336232393337663930393532343664303330643162663065396662336534633232663534633666 - 6537373864323561666435326362303162613163643466350a303762386339323861353837376466 - 37353637346330353539623862366339613939303135333437336663393335363862303737376635 - 6530333732333131390a373765646333363137663363633235303764323030396534636630633832 - 37623530643038353731633065653138653665623933396639623334323535346437623737626464 - 6435336563366634343264373531323561333135343362386331 + 32366665633739636439343636633563616465653864356163386365616635396466656631656537 + 3266393861333132336561336236363633616434336462370a623539323664333763356562663934 + 62363033646264386137353933313931633637633736333737633066656561343530333938376532 + 3231666663376335370a353062633239356364306230356362303962633338333265646238356439 + 34663234666334366430323661353030373436363662383063363164366464646632303063646262 + 3366653738646438313265316639396636313565633737653335