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

deploy 1.6.0 connector to qa

Browse source
This commit is contained in:
Leif Johansson 2020-03-06 11:33:42 +01:00
parent 46467f1f76
commit 46e2377ca8
No known key found for this signature in database
GPG key ID: D73AD6430AD478D6
4 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
eidas-qa-connector/overlay/etc/eidas-connector/eidas-connector.conf
View file

@ -23,6 +23,10 @@ export IDP_SYSLOG_PORT=514
export IDP_PROCESS_SYSLOG_HOST=log.qa.sveidas.se export IDP_PROCESS_SYSLOG_HOST=log.qa.sveidas.se
export IDP_PROCESS_SYSLOG_PORT=514 export IDP_PROCESS_SYSLOG_PORT=514
export IDP_STATS_SYSLOG_HOST=log.qa.sveidas.se
export IDP_STATS_SYSLOG_PORT=514
export IDP_STATS_SYSLOG_FACILITY=LOCAL4
export IDP_AUDIT_SYSLOG_FACILITY=LOCAL0 export IDP_AUDIT_SYSLOG_FACILITY=LOCAL0
export IDP_FTICKS_FEDERATION_ID=eIDAS export IDP_FTICKS_FEDERATION_ID=eIDAS
@ -61,12 +65,15 @@ export TOMCAT_TLS_SERVER_KEY=$TOMCAT_CREDENTIALS/tomcat-key.pem
export TOMCAT_TLS_SERVER_CERTIFICATE=$TOMCAT_CREDENTIALS/tomcat-cert.pem export TOMCAT_TLS_SERVER_CERTIFICATE=$TOMCAT_CREDENTIALS/tomcat-cert.pem
export TOMCAT_TLS_SERVER_CERTIFICATE_CHAIN=$TOMCAT_CREDENTIALS/tomcat-chain.pem export TOMCAT_TLS_SERVER_CERTIFICATE_CHAIN=$TOMCAT_CREDENTIALS/tomcat-chain.pem
export TOMCAT_INTERNAL_PROXIES='"10\.\d{1,3}\.\d{1,3}\.\d{1,3}\|192\.168\.\d{1,3}\.\d{1,3}\|169\.254\.\d{1,3}\.\d{1,3}\|127\.\d{1,3}\.\d{1,3}\.\d{1,3}\|172\.1[6-9]{1}\.\d{1,3}\.\d{1,3}\|172\.2[0-9]{1}\.\d{1,3}\.\d{1,3}\|172\.3[0-1]{1}\.\d{1,3}\.\d{1,3}\|130\.242\.125\.\d{1,3}\|81\.236\.48\.\d{1,3}"' export TOMCAT_INTERNAL_PROXIES='"10\.\d{1,3}\.\d{1,3}\.\d{1,3}\|192\.168\.\d{1,3}\.\d{1,3}\|169\.254\.\d{1,3}\.\d{1,3}\|127\.\d{1,3}\.\d{1,3}\.\d{1,3}\|172\.1[6-9]{1}\.\d{1,3}\.\d{1,3}\|172\.2[0-9]{1}\.\d{1,3}\.\d{1,3}\|172\.3[0-1]{1}\.\d{1,3}\.\d{1,3}\|130\.242\.125\.\d{1,3}\|81\.236\.48\.\d{1,3}"'
export TOMCAT_SESSION_COOKIE_NAME="JSESSIONID.CONNECTOR.QA"
FEDERATION_METADATA_URL=https://qa.md.swedenconnect.se/entities export FEDERATION_METADATA_URL=https://qa.md.swedenconnect.se/entities
FEDERATION_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt export FEDERATION_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt
EIDAS_METADATA_SERVICE_LIST_URL=https://qa.md.eidas.swedenconnect.se/mdservicelist-aggregate.xml #export EIDAS_METADATA_SERVICE_LIST_URL=https://qa.md.eidas.swedenconnect.se/mdservicelist-aggregate.xml
EIDAS_METADATA_SERVICE_LIST_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt unset EIDAS_METADATA_SERVICE_LIST_URL
#export EIDAS_METADATA_SERVICE_LIST_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt
unset EIDAS_METADATA_SERVICE_LIST_VALIDATION_CERT
EIDAS_METADATA_URL=https://qa.md.eidas.swedenconnect.se/entities export EIDAS_METADATA_URL=https://qa.md.eidas.swedenconnect.se/entities
EIDAS_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt export EIDAS_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt

2
global/overlay/etc/puppet/cosmos-rules.yaml
View file

@ -751,7 +751,7 @@ md-eu1.qa.komreg.net:
sunet_iaas_cloud: sunet_iaas_cloud:
autoupdate: autoupdate:
eidas_connector: eidas_connector:
version: 1.5.4 version: 1.6.0
hostname: qa.connector.eidas.swedenconnect.se hostname: qa.connector.eidas.swedenconnect.se
sunet::frontend::register_sites: sunet::frontend::register_sites:
sites: sites:

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

@ -8,6 +8,16 @@
su root syslog su root syslog
} }
/var/log/eidas_stats.log {
rotate 30
daily
missingok
notifempty
delaycompress
compress
su root syslog
}
/var/log/eidas_*.log { /var/log/eidas_*.log {
rotate 7 rotate 7
daily daily

1
log.qa.sveidas.se/overlay/etc/rsyslog.d/99-audit.conf
View file

@ -2,3 +2,4 @@ local0.* -/var/log/eidas_audit.log
local1.* -/var/log/eidas_fticks.log local1.* -/var/log/eidas_fticks.log
local2.* -/var/log/eidas_process.log local2.* -/var/log/eidas_process.log
local3.* -/var/log/eidas_proxy.log local3.* -/var/log/eidas_proxy.log
local4.* -/var/log/eidas_stats.log