From 188d7b7dd983f9bfea0319e28724e4d88b6bfa15 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Mon, 24 Sep 2018 09:19:49 +0200
Subject: [PATCH] deploy 1.1.9 proxy with syslog config

---
 .../eidas-proxy/se/cfg/application.properties |  4 ---
 .../etc/eidas-proxy/se/cfg/syslog.properties  | 25 +++++++++++++++++++
 .../eidas-proxy/se/cfg/application.properties |  4 ---
 .../etc/eidas-proxy/se/cfg/syslog.properties  | 17 +++++++++++++
 global/overlay/etc/puppet/cosmos-rules.yaml   |  4 +--
 5 files changed, 44 insertions(+), 10 deletions(-)
 create mode 100644 eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/syslog.properties
 create mode 100644 eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/syslog.properties

diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application.properties
index 71c33491..950c9d99 100644
--- a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application.properties
+++ b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application.properties
@@ -97,7 +97,3 @@ management.port=8444
 management.ssl.enabled=true
 
 proxy-service.syslog.active=true
-proxy-service.syslog.host=log-1.sveidas.se
-proxy-service.syslog.port=514
-proxy-service.syslog.bsd=true
-proxy-service.syslog.protocol=udp
diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/syslog.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/syslog.properties
new file mode 100644
index 00000000..ed7d0d60
--- /dev/null
+++ b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/syslog.properties
@@ -0,0 +1,25 @@
+# Parameters:
+# - host           : Arrray of hostname or IP adresses separated by comma.
+# - port           : TCP or UDP port
+# - protocol       : udp, tcp or ssl
+# - bsd            : Using message format RFC_3164 when set to true. Using RFC_5424 (UDP) or RFC_5425 (TCP) when false
+# - facility       : The syslog facility identifier (0-23)
+# - severity       : The syslog sverity code 0-7
+# - clienthostname : Name of the sending client host
+# - clientapp      : Name of the sending client application
+
+syslog.1.host=log-1.sveidas.se
+syslog.1.port=514
+syslog.1.protocol=udp
+syslog.1.bsd=false
+syslog.1.facility=19
+syslog.1.severity=6
+syslog.1.clientapp=eidas-proxy-service
+
+syslog.2.host=log-2.sveidas.se
+syslog.2.port=514
+syslog.2.protocol=udp
+syslog.2.bsd=false
+syslog.2.facility=19
+syslog.2.severity=6
+syslog.2.clientapp=eidas-proxy-service
diff --git a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties
index ae4a576b..bf2e6ea1 100644
--- a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties
+++ b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties
@@ -98,7 +98,3 @@ management.port=8444
 management.ssl.enabled=true
 
 proxy-service.syslog.active=true
-proxy-service.syslog.host=log.qa.sveidas.se
-proxy-service.syslog.port=514
-proxy-service.syslog.bsd=true
-proxy-service.syslog.protocol=udp
diff --git a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/syslog.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/syslog.properties
new file mode 100644
index 00000000..f96d46b1
--- /dev/null
+++ b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/syslog.properties
@@ -0,0 +1,17 @@
+# Parameters:
+# - host           : Arrray of hostname or IP adresses separated by comma.
+# - port           : TCP or UDP port
+# - protocol       : udp, tcp or ssl
+# - bsd            : Using message format RFC_3164 when set to true. Using RFC_5424 (UDP) or RFC_5425 (TCP) when false
+# - facility       : The syslog facility identifier (0-23)
+# - severity       : The syslog sverity code 0-7
+# - clienthostname : Name of the sending client host
+# - clientapp      : Name of the sending client application
+
+syslog.1.host=log.qa.sveidas.se
+syslog.1.port=514
+syslog.1.protocol=udp
+syslog.1.bsd=false
+syslog.1.facility=19
+syslog.1.severity=6
+syslog.1.clientapp=eidas-proxy-service
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 89f73c6a..be6cb8b4 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -635,7 +635,7 @@ md-eu1.qa.komreg.net:
    autoupdate:
    servicemonitor:
    eidas_proxy:
-      version: 1.1.8
+      version: 1.1.9
       hostname: proxy.eidas.swedenconnect.se
    sunet::frontend::register_sites:
      sites:
@@ -685,7 +685,7 @@ md-eu1.qa.komreg.net:
    autoupdate:
    servicemonitor:
    eidas_proxy:
-      version: 1.1.8
+      version: 1.1.9
       hostname: qa.proxy.eidas.swedenconnect.se
    sunet::frontend::register_sites:
      sites: