summaryrefslogtreecommitdiffstats
path: root/infra/minimal-distribution/src/main/resources
diff options
context:
space:
mode:
authorMaros Marsalek <mmarsale@cisco.com>2016-08-17 11:47:46 +0200
committerMaros Marsalek <mmarsale@cisco.com>2016-08-19 12:49:56 +0200
commit672f0c90fdbf4b5dc60cbfaaaf262e16561fdb7a (patch)
treee6787fafc90f4b19ee387b1a16f1eaf8adfbe715 /infra/minimal-distribution/src/main/resources
parent77fa76b4b15ec6d74920349f9a066ec4597b2585 (diff)
HONEYCOMB-21 Add HTTPS for Restconf
Change-Id: If8bae91ce30592971584645b8dcecdbbeb4a0ddb Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Diffstat (limited to 'infra/minimal-distribution/src/main/resources')
-rw-r--r--infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystorebin0 -> 2296 bytes
-rw-r--r--infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/cert/honeycomb.pkcs12bin0 -> 2549 bytes
-rw-r--r--infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml21
-rw-r--r--infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json3
-rw-r--r--infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/logback.xml5
5 files changed, 4 insertions, 25 deletions
diff --git a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystore b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystore
new file mode 100644
index 000000000..27a263308
--- /dev/null
+++ b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystore
Binary files differ
diff --git a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/cert/honeycomb.pkcs12 b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/cert/honeycomb.pkcs12
new file mode 100644
index 000000000..e2f4fdd82
--- /dev/null
+++ b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/cert/honeycomb.pkcs12
Binary files differ
diff --git a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml
index 4a4adfbd8..7e59a1a7d 100644
--- a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml
+++ b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml
@@ -29,27 +29,6 @@
<load-on-startup>1</load-on-startup>
</servlet>
- <!-- FIXME-minimal configure SHIRO -->
- <!-- FIXME-minimal configure https -->
- <!--<context-param>-->
- <!--<param-name>shiroEnvironmentClass</param-name>-->
- <!--<param-value>org.opendaylight.aaa.shiro.web.env.KarafIniWebEnvironment</param-value>-->
- <!--</context-param>-->
-
- <!--<listener>-->
- <!--<listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class>-->
- <!--</listener>-->
-
- <!--<filter>-->
- <!--<filter-name>ShiroFilter</filter-name>-->
- <!--<filter-class>org.opendaylight.aaa.shiro.filters.AAAFilter</filter-class>-->
- <!--</filter>-->
-
- <!--<filter-mapping>-->
- <!--<filter-name>ShiroFilter</filter-name>-->
- <!--<url-pattern>/*</url-pattern>-->
- <!--</filter-mapping>-->
-
<servlet-mapping>
<servlet-name>JAXRSRestconf</servlet-name>
<url-pattern>/*</url-pattern>
diff --git a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json
index 606f44d8a..fdfb57f9a 100644
--- a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json
+++ b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json
@@ -7,7 +7,10 @@
"notification-service-queue-depth": 1,
"restconf-root-path": "/restconf",
+ "restconf-binding-address": "127.0.0.1",
"restconf-port": 8181,
+ "restconf-https-binding-address": "0.0.0.0",
+ "restconf-https-port": 8443,
"restconf-websocket-port": 7779,
"netconf-netty-threads": 2,
diff --git a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/logback.xml b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/logback.xml
index d3cdd6f1e..6dd4d4fc0 100644
--- a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/logback.xml
+++ b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/logback.xml
@@ -22,14 +22,11 @@
</encoder>
</appender>
- <root level="error">
+ <root level="warn">
<appender-ref ref="STDOUT" />
<appender-ref ref="honeycomb.log" />
</root>
<logger name="org.opendaylight" level="INFO"/>
<logger name="io.fd" level="INFO"/>
-
- <!-- Netty -->
- <logger name="io.netty" level="WARN"/>
</configuration>