Conf logging for new connector, SC-2670

This commit is contained in:
Patrik Holmqvist 2025-04-03 10:13:18 +02:00
parent b5a5c1af6a
commit 2520ebda66
Signed by: pahol
GPG key ID: 5D5B0D4E93F77273
4 changed files with 41 additions and 2 deletions

View file

@ -1251,6 +1251,7 @@ connector-qa-sto1-1.komreg.net:
session_backend: memory
use_hsm: false
version: 2.0.4_hsm2_ubuntu
syslog_servers: ['log-qa-sto1-1.komreg.net']
sunet::frontend::register_sites:
sites:
'qa.connector.eidas.swedenconnect.se':
@ -1317,6 +1318,7 @@ testmyeid-qa-sto1-1.komreg.net:
eid::connector:
environment: test
version: 2.0.5_hsm2_ubuntu
syslog_servers: ['log-test-sto3-1.komreg.net']
sunet::redictcluster:
hostmode: true
tls: true

View file

@ -13,6 +13,7 @@ class eid::connector (
String $server_fqdn = $facts['networking']['fqdn'],
String $connector_directory = '/opt/eidas-connector',
Boolean $use_hsm=true,
Array[string] $syslog_servers=[],
) {
if $use_hsm {
@ -42,6 +43,12 @@ class eid::connector (
content => template("eid/connector/application-${environment}.yml.erb")
}
# Create the environment specific config file from template
file { "${connector_directory}/logback.xml":
ensure => 'file',
content => template("eid/connector/logback.xml.erb")
}
# If we dont use HSM, we need the keys on disk
unless ($use_hsm) {
sunet::snippets::secret_file {"${connector_directory}/credentials/connector-${environment}-sign.key":

View file

@ -160,8 +160,8 @@ saml:
audit:
in-memory:
capacity: 1000
file:
log-file: ${CONNECTOR_DIRECTORY}/logs/audit.log
log-system:
logger-name: "AUDIT"
logging:
level:
@ -169,3 +169,4 @@ logging:
swedenconnect:
opensaml: DEBUG
eidas: INFO
config: file:${CONNECTOR_DIRECTORY}/logback.xml

View file

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/defaults.xml"/>
<include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
<include resource="org/springframework/boot/logging/logback/file-appender.xml"/>
<springProperty scope="context" name="appName" source="spring.application.name" defaultValue="eIDAS Connector"/>
<% @syslog_servers.each do |syslog_server| -%>
<appender name="<%= syslog_server %>" class="ch.qos.logback.classic.net.SyslogAppender">
<syslogHost><%= syslog_server %></syslogHost>
<port>514</port>
<facility>USER</facility>
<suffixPattern>%msg</suffixPattern>
<throwableExcluded>true</throwableExcluded>
</appender>
<% end -%>
<root level="info">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
</root>
<% @syslog_servers.each do |syslog_server| -%>
<logger name="AUDIT" level="info" additivity="false">
<appender-ref ref="<%= syslog_server %>"/>
</logger>
<% end -%>
</configuration>