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:
Leif Johansson 2019-09-11 13:13:54 +02:00
commit b56579d025
3 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -127,7 +127,20 @@ class https_server {
}
class eidas_log { }
class eidas_log {
file {
'/etc/logrotate.d':
ensure => 'directory',
mode => '0755',
;
'/etc/logrotate.d/eidas_logs':
ensure => file,
path => '/etc/logrotate.d/eidas_logs',
mode => '0644',
content => template('eid/eidas_logs/eidas_logs.erb'),
;
}
}
class swamid_metadata($filename=undef) {
sunet::metadata::swamid { "$filename": }
@ -1084,7 +1097,7 @@ class nagios_monitor {
nagioscfg::command {'check_ssl_cert_3':
command_line => "/usr/lib/nagios/plugins/check_ssl_cert -A -H '\$HOSTADDRESS\$' -c '\$ARG2\$' -w '\$ARG1\$' -p '\$ARG3\$'"
}
$public_hosts = ['swedenconnect.se','qa.test.swedenconnect.se','qa.md.swedenconnect.se','md.swedenconnect.se','md.eidas.swedenconnect.se','qa.md.eidas.swedenconnect.se','qa.connector.eidas.swedenconnect.se','qa.proxy.eidas.swedenconnect.se','connector.eidas.swedenconnect.se']
$public_hosts = ['demw.eidas.swedenconnect.se','swedenconnect.se','qa.test.swedenconnect.se','qa.md.swedenconnect.se','md.swedenconnect.se','md.eidas.swedenconnect.se','qa.md.eidas.swedenconnect.se','qa.connector.eidas.swedenconnect.se','qa.proxy.eidas.swedenconnect.se','connector.eidas.swedenconnect.se']
nagioscfg::host {$public_hosts: }
nagioscfg::service {'check_public_ssl_cert':
host_name => $public_hosts,
@ -1113,6 +1126,12 @@ class nagios_monitor {
description => 'check metadata for Sweden Connect',
contact_groups => ['alerts'],
}
nagioscfg::service {'check_metadata_DE_middleware':
host_name => ['demw.eidas.swedenconnect.se'],
check_command => 'check_website!https://demw.eidas.swedenconnect.se/eidas-middleware/Metadata',
description => 'check metadata for DE middleware',
contact_groups => ['alerts'],
}
}
class redis_cluster_node {

9
global/overlay/etc/puppet/modules/eid/templates/eidas_logs/eidas_logs.erb Normal file
View file

@ -0,0 +1,9 @@
/var/log/eidas_*.log {
rotate 7
daily
missingok
notifempty
delaycompress
compress
su root syslog
}

1
host-puppet-conf-test
View file

@ -25,6 +25,7 @@ then
rsync -av --exclude '*~' global/overlay/etc/puppet/cosmos-rules.yaml root@$HOSTNAME:/etc/puppet/cosmos-rules.yaml
rsync -av --exclude '*~' global/overlay/etc/puppet/manifests/cosmos-site.pp root@$HOSTNAME:/etc/puppet/manifests/cosmos-site.pp
rsync -av --exclude '*~' global/overlay/etc/puppet/cosmos-db.yaml root@$HOSTNAME:/etc/puppet/cosmos-db.yaml
rsync -av --exclude '*~' global/overlay/etc/puppet/modules/eid/* root@$HOSTNAME:/etc/puppet/modules/eid/.
# Test if the user has symlinked puppet-sunet correctly
# by first checking if the link exits and then whether