swedenconnect/eid-ops
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitops.sunet.se:eid-ops

Browse source
This commit is contained in:
Maria Haider 2019-06-10 16:35:29 +02:00
commit d922aca16d
Signed by: mariah
GPG key ID: 7414A760CA747E57
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eidastest-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml
View file

@ -24,7 +24,7 @@ eidastest_compose:
- HUB_PORT_4444_TCP_PORT=4444 - HUB_PORT_4444_TCP_PORT=4444
eidastest-testid: eidastest-testid:
image: docker.sunet.se/eidastest-testid:1.1.1 image: docker.sunet.se/eidastest-testid:1.1.3
container_name: eidastest-testid container_name: eidastest-testid
ports: ports:
- "443:8099" - "443:8099"

2
global/overlay/etc/puppet/manifests/cosmos-site.pp
View file

@ -886,7 +886,7 @@ class nagios_monitor {
config => 'eid' config => 'eid'
} }
class {'nagioscfg::slack': domain => 'sunet.slack.com', token => safe_hiera('slack_token','') } -> class {'nagioscfg::slack': domain => 'sunet.slack.com', token => safe_hiera('slack_token','') } ->
#class {'nagioscfg::passive': enable_notifications => '1', obsess_over_hosts => '0'} class {'nagioscfg::passive': enable_notifications => '0', obsess_over_services => '0', obsess_over_hosts => '0'}
sunet::misc::htpasswd_user { $web_admin_user : sunet::misc::htpasswd_user { $web_admin_user :
filename => "/etc/nagios3/htpasswd.users", filename => "/etc/nagios3/htpasswd.users",