From 312427e47a7bd555a1000adce1df32c8d2bd7886 Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Mon, 3 Jul 2017 11:05:37 +0200 Subject: HONEYCOMB-373 - Move configuration to minimal-distribution-core Change-Id: Iee0644e01ad21f20adbc36fb8ace556e5ce4a8c4 Signed-off-by: Jan Srnicek --- .../cert/honeycomb-keystore | Bin 0 -> 2296 bytes .../config/WEB-INF/web.xml | 74 +++++++++++++++++++++ .../config/activation.json | 4 ++ .../config/honeycomb.json | 39 +++++++++++ .../honeycomb-minimal-resources/config/logback.xml | 32 +++++++++ 5 files changed, 149 insertions(+) create mode 100644 infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystore create mode 100644 infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml create mode 100644 infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/activation.json create mode 100644 infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json create mode 100644 infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/logback.xml (limited to 'infra/minimal-distribution-core/src') diff --git a/infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystore b/infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystore new file mode 100644 index 000000000..27a263308 Binary files /dev/null and b/infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystore differ diff --git a/infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml b/infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml new file mode 100644 index 000000000..6cf487170 --- /dev/null +++ b/infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml @@ -0,0 +1,74 @@ + + + + + + + JAXRSRestconf + com.sun.jersey.spi.container.servlet.ServletContainer + + javax.ws.rs.Application + org.opendaylight.netconf.sal.rest.impl.RestconfApplication + + 1 + + + + JAXRSRestconf + /* + + + cross-origin-restconf + org.eclipse.jetty.servlets.CrossOriginFilter + + allowedOrigins + * + + + allowedMethods + GET,POST,OPTIONS,DELETE,PUT,HEAD + + + allowedHeaders + origin, content-type, accept, authorization + + + exposedHeaders + location + + + + cross-origin-restconf + /* + + + + + NB api + /* + POST + GET + PUT + PATCH + DELETE + HEAD + + + + diff --git a/infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/activation.json b/infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/activation.json new file mode 100644 index 000000000..8dd168702 --- /dev/null +++ b/infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/activation.json @@ -0,0 +1,4 @@ +{ + "modules-resource-path": "../modules/", + "yang-modules-index-path": "../yang-mapping/" +} \ No newline at end of file diff --git a/infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json b/infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json new file mode 100644 index 000000000..a5a18bd6d --- /dev/null +++ b/infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json @@ -0,0 +1,39 @@ + { + "persist-context": "true", + "persisted-context-path": "/var/lib/honeycomb/persist/context/data.json", + "persisted-context-restoration-type": "Merge", + "persist-config": "true", + "persisted-config-path": "/var/lib/honeycomb/persist/config/data.json", + "persisted-config-restoration-type": "Merge", + + "notification-service-queue-depth": 1, + + "restconf-http-enabled": "true", + "restconf-root-path": "/restconf", + "restconf-binding-address": "127.0.0.1", + "restconf-port": 8183, + "restconf-https-enabled": "true", + "restconf-https-binding-address": "0.0.0.0", + "restconf-https-port": 8445, + "restconf-keystore": "/honeycomb-keystore", + "restconf-keystore-password": "OBF:1v9s1unr1unn1vv51zlk1t331vg91x1b1vgl1t331zly1vu51uob1uo71v8u", + "restconf-keystore-manager-password": "OBF:1v9s1unr1unn1vv51zlk1t331vg91x1b1vgl1t331zly1vu51uob1uo71v8u", + "restconf-truststore": "/honeycomb-keystore", + "restconf-truststore-password": "OBF:1v9s1unr1unn1vv51zlk1t331vg91x1b1vgl1t331zly1vu51uob1uo71v8u", + "restconf-websocket-port": 7779, + "restconf-pool-max-size": 10, + "restconf-pool-min-size": 1, + "restconf-acceptors-size": 1, + "restconf-selectors-size": 1, + "restconf-https-acceptors-size": 1, + "restconf-https-selectors-size": 1, + + "netconf-netty-threads": 2, + "netconf-tcp-enabled" : "true", + "netconf-tcp-binding-address": "127.0.0.1", + "netconf-tcp-binding-port": 7777, + "netconf-ssh-enabled" : "true", + "netconf-ssh-binding-address": "0.0.0.0", + "netconf-ssh-binding-port": 2831, + "netconf-notification-stream-name": "honeycomb" +} \ No newline at end of file diff --git a/infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/logback.xml b/infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/logback.xml new file mode 100644 index 000000000..6dd4d4fc0 --- /dev/null +++ b/infra/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/logback.xml @@ -0,0 +1,32 @@ + + + + + %date{"yyyy-MM-dd HH:mm:ss.SSS z"} [%thread] %-5level %logger{36} - %msg%n + + + + /var/log/honeycomb/honeycomb.log + + + /var/log/honeycomb/logs/honeycomb.%d.log.zip + 1 + + + + 10MB + + + + %date{"yyyy-MM-dd HH:mm:ss.SSS z"} [%thread] %-5level %logger{35} - %msg%n + + + + + + + + + + + -- cgit 1.2.3-korg