Revert to clean install to start over
This commit is contained in:
@@ -1 +1 @@
|
||||
root=/rest
|
||||
root=/rest
|
||||
@@ -248,11 +248,6 @@ org.ops4j.pax.url.mvn.requireConfigAdminConfig=true
|
||||
#
|
||||
karaf.delay.console=false
|
||||
|
||||
#
|
||||
# Generated command shutdown
|
||||
#
|
||||
karaf.shutdown.command = b39dad51-f162-4919-9f2f-8f8b7b27d5f2
|
||||
|
||||
#
|
||||
# Enable native Karaf support for systemd's watchdog.
|
||||
#
|
||||
|
||||
@@ -1,119 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<!--
|
||||
Licensed to the Apache Software Foundation (ASF) under one
|
||||
or more contributor license agreements. See the NOTICE file
|
||||
distributed with this work for additional information
|
||||
regarding copyright ownership. The ASF licenses this file
|
||||
to you under the Apache License, Version 2.0 (the
|
||||
"License"); you may not use this file except in compliance
|
||||
with the License. You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing,
|
||||
software distributed under the License is distributed on an
|
||||
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
KIND, either express or implied. See the License for the
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
|
||||
|
||||
<Configure id="Server" class="org.eclipse.jetty.server.Server">
|
||||
|
||||
<!-- =========================================================== -->
|
||||
<!-- Set connectors -->
|
||||
<!-- =========================================================== -->
|
||||
<!-- One of each type! -->
|
||||
<!-- =========================================================== -->
|
||||
|
||||
<!-- Use this connector for many frequently idle connections and for
|
||||
threadless continuations. -->
|
||||
<New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
|
||||
<Set name="secureScheme">https</Set>
|
||||
<Set name="securePort">
|
||||
<Property name="jetty.secure.port" default="8443" />
|
||||
</Set>
|
||||
<Set name="outputBufferSize">32768</Set>
|
||||
<Set name="requestHeaderSize">8192</Set>
|
||||
<Set name="responseHeaderSize">8192</Set>
|
||||
<Set name="sendServerVersion">true</Set>
|
||||
<Set name="sendDateHeader">false</Set>
|
||||
<Set name="headerCacheSize">512</Set>
|
||||
</New>
|
||||
|
||||
<!-- =========================================================== -->
|
||||
<!-- Special server connectors -->
|
||||
<!-- =========================================================== -->
|
||||
<!-- This is a sample for alternative connectors, enable if needed -->
|
||||
<!-- =========================================================== -->
|
||||
<!--
|
||||
<Call name="addConnector">
|
||||
<Arg>
|
||||
<New class="org.eclipse.jetty.server.ServerConnector">
|
||||
<Arg name="server">
|
||||
<Ref refid="Server" />
|
||||
</Arg>
|
||||
<Arg name="factories">
|
||||
<Array type="org.eclipse.jetty.server.ConnectionFactory">
|
||||
<Item>
|
||||
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
|
||||
<Arg name="config">
|
||||
<Ref refid="httpConfig" />
|
||||
</Arg>
|
||||
</New>
|
||||
</Item>
|
||||
</Array>
|
||||
</Arg>
|
||||
<Set name="host">
|
||||
<Property name="jetty.host" default="localhost" />
|
||||
</Set>
|
||||
<Set name="port">
|
||||
<Property name="jetty.port" default="8282" />
|
||||
</Set>
|
||||
<Set name="idleTimeout">
|
||||
<Property name="http.timeout" default="30000" />
|
||||
</Set>
|
||||
<Set name="name">jettyConn1</Set>
|
||||
</New>
|
||||
</Arg>
|
||||
</Call>
|
||||
-->
|
||||
|
||||
<!-- =========================================================== -->
|
||||
<!-- Configure Authentication Realms -->
|
||||
<!-- Realms may be configured for the entire server here, or -->
|
||||
<!-- they can be configured for a specific web app in a context -->
|
||||
<!-- configuration (see $(jetty.home)/contexts/test.xml for an -->
|
||||
<!-- example). -->
|
||||
<!-- =========================================================== -->
|
||||
<Call name="addBean">
|
||||
<Arg>
|
||||
<New class="org.eclipse.jetty.jaas.JAASLoginService">
|
||||
<Set name="name">karaf</Set>
|
||||
<Set name="loginModuleName">karaf</Set>
|
||||
<Set name="roleClassNames">
|
||||
<Array type="java.lang.String">
|
||||
<Item>org.apache.karaf.jaas.boot.principal.RolePrincipal
|
||||
</Item>
|
||||
</Array>
|
||||
</Set>
|
||||
</New>
|
||||
</Arg>
|
||||
</Call>
|
||||
<Call name="addBean">
|
||||
<Arg>
|
||||
<New class="org.eclipse.jetty.jaas.JAASLoginService">
|
||||
<Set name="name">default</Set>
|
||||
<Set name="loginModuleName">karaf</Set>
|
||||
<Set name="roleClassNames">
|
||||
<Array type="java.lang.String">
|
||||
<Item>org.apache.karaf.jaas.boot.principal.RolePrincipal
|
||||
</Item>
|
||||
</Array>
|
||||
</Set>
|
||||
</New>
|
||||
</Arg>
|
||||
</Call>
|
||||
|
||||
</Configure>
|
||||
@@ -37,4 +37,4 @@ uninstall = admin
|
||||
update(java.lang.String)[/([1-4])?[0-9]/] = admin
|
||||
update(java.lang.String,java.lang.String)[/([1-4])?[0-9]/,/.*/] = admin
|
||||
update = manager
|
||||
|
||||
|
||||
@@ -51,4 +51,4 @@ update(java.lang.String,java.util.Map)[/jmx[.]acl.*/,/.*/] = admin
|
||||
update(java.lang.String,java.util.Map)[/org[.]apache[.]karaf[.]command[.]acl.+/,/.*/] = admin
|
||||
update(java.lang.String,java.util.Map)[/org[.]apache[.]karaf[.]service[.]acl.+/,/.*/] = admin
|
||||
update(java.lang.String,java.util.Map) = manager
|
||||
|
||||
|
||||
Binary file not shown.
@@ -1,66 +0,0 @@
|
||||
#*******************************************************
|
||||
# openHAB2-wrapper.conf for Windows Service Installation
|
||||
#*******************************************************
|
||||
|
||||
# openHAB installation dir (Adapt this first setting to your system)
|
||||
set.default.OPENHAB_HOME=C:\openHAB-2.4.0
|
||||
|
||||
# Wrapper Properties
|
||||
set.default.OPENHAB_CONF=%OPENHAB_HOME%\conf
|
||||
set.default.OPENHAB_RUNTIME=%OPENHAB_HOME%\runtime
|
||||
set.default.OPENHAB_USERDATA=%OPENHAB_HOME%\userdata
|
||||
set.default.OPENHAB_LOGDIR=%OPENHAB_USERDATA%\logs
|
||||
set.default.KARAF_HOME=%OPENHAB_RUNTIME%
|
||||
set.default.KARAF_BASE=%OPENHAB_USERDATA%
|
||||
set.default.KARAF_DATA=%OPENHAB_USERDATA%
|
||||
set.default.KARAF_ETC=%OPENHAB_USERDATA%\etc
|
||||
set.default.PATH=%PATH%;%KARAF_BASE%\lib;%KARAF_HOME%\lib
|
||||
|
||||
# Java Application
|
||||
wrapper.working.dir=%KARAF_BASE%
|
||||
wrapper.java.command=%JAVA_HOME%\bin\java
|
||||
wrapper.java.mainclass=org.apache.karaf.wrapper.internal.service.Main
|
||||
wrapper.java.classpath.1=%KARAF_HOME%\lib\boot\*.jar
|
||||
wrapper.java.classpath.2=%KARAF_DATA%\lib\wrapper\*.jar
|
||||
wrapper.java.library.path.1=%KARAF_DATA%\lib\wrapper\
|
||||
|
||||
# Java Parameters
|
||||
wrapper.java.additional.1=-Dkaraf.home="%KARAF_HOME%"
|
||||
wrapper.java.additional.2=-Dkaraf.base="%KARAF_BASE%"
|
||||
wrapper.java.additional.3=-Dkaraf.data="%KARAF_DATA%"
|
||||
wrapper.java.additional.4=-Dkaraf.etc="%KARAF_ETC%"
|
||||
wrapper.java.additional.5=-Dcom.sun.management.jmxremote
|
||||
wrapper.java.additional.6=-Dkaraf.startLocalConsole=false
|
||||
wrapper.java.additional.7=-Dkaraf.startRemoteShell=true
|
||||
wrapper.java.additional.8=-Djava.endorsed.dirs="%JAVA_HOME%\jre\lib\endorsed;%JAVA_HOME%\lib\endorsed;%KARAF_HOME%\lib\endorsed"
|
||||
wrapper.java.additional.9=-Djava.ext.dirs="%JAVA_HOME%\jre\lib\ext;%JAVA_HOME%\lib\ext;%KARAF_HOME%\lib\ext"
|
||||
wrapper.java.additional.10=-Dopenhab.home="%OPENHAB_HOME%"
|
||||
wrapper.java.additional.11=-Dopenhab.conf="%OPENHAB_HOME%\conf"
|
||||
wrapper.java.additional.12=-Dopenhab.runtime="%OPENHAB_HOME%\runtime"
|
||||
wrapper.java.additional.13=-Dopenhab.userdata="%OPENHAB_HOME%\userdata"
|
||||
wrapper.java.additional.14=-Dopenhab.logdir="%OPENHAB_USERDATA%\logs"
|
||||
wrapper.java.additional.15=-Dfelix.cm.dir="%OPENHAB_HOME%\userdata\config"
|
||||
wrapper.java.additional.16=-Dorg.osgi.service.http.port=8080
|
||||
wrapper.java.additional.17=-Dorg.osgi.service.http.port.secure=8443
|
||||
wrapper.java.additional.18=-Djava.util.logging.config.file="%KARAF_ETC%\java.util.logging.properties"
|
||||
wrapper.java.additional.19=-Dkaraf.logs="%OPENHAB_LOGDIR%"
|
||||
wrapper.java.maxmemory=512
|
||||
|
||||
# Wrapper Logging Properties
|
||||
wrapper.console.format=PM
|
||||
wrapper.console.loglevel=INFO
|
||||
wrapper.logfile=%OPENHAB_USERDATA%\logs\wrapper.log
|
||||
wrapper.logfile.format=LPTM
|
||||
wrapper.logfile.loglevel=INFO
|
||||
wrapper.logfile.maxsize=10m
|
||||
wrapper.logfile.maxfiles=5
|
||||
wrapper.syslog.loglevel=NONE
|
||||
|
||||
# Wrapper Windows Properties
|
||||
wrapper.console.title=openHAB2
|
||||
wrapper.ntservice.name=openHAB2
|
||||
wrapper.ntservice.displayname=openHAB2
|
||||
wrapper.ntservice.description=openHAB 2 Service
|
||||
wrapper.ntservice.dependency.1=
|
||||
wrapper.ntservice.starttype=AUTO_START
|
||||
wrapper.ntservice.interactive=false
|
||||
@@ -43,4 +43,4 @@ uninstall = manager
|
||||
update[/.*[-][f].*/] = admin
|
||||
update = manager
|
||||
watch = admin
|
||||
|
||||
|
||||
@@ -43,4 +43,4 @@ property-set[/.*jmx[.]acl.*/] = admin
|
||||
property-set[/.*org[.]apache[.]karaf[.]command[.]acl[.].+/] = admin
|
||||
property-set[/.*org[.]apache[.]karaf[.]service[.]acl[.].+/] = admin
|
||||
update = manager
|
||||
|
||||
|
||||
@@ -26,4 +26,4 @@ uninstall = admin
|
||||
start = admin
|
||||
stop = admin
|
||||
update = admin
|
||||
|
||||
|
||||
@@ -22,4 +22,4 @@
|
||||
# This configuration file defines the ACLs for commands in the jaas subshell
|
||||
# Jaas commands commands have no effect until update is called.
|
||||
update = admin
|
||||
|
||||
|
||||
@@ -26,4 +26,4 @@
|
||||
#
|
||||
install = admin
|
||||
uninstall = admin
|
||||
|
||||
|
||||
@@ -26,4 +26,4 @@ shutdown = admin
|
||||
start-level[/.*[1-9][0-9][0-9]+.*/] = manager # manager can set startlevels above 100
|
||||
start-level[/[^0-9]*/] = viewer # viewer can obtain the current start level
|
||||
start-level = admin # admin can set any start level, including < 100
|
||||
|
||||
|
||||
@@ -29,5 +29,5 @@
|
||||
# and modifiable via the JAAS command group. These users reside in a JAAS domain
|
||||
# with the name "karaf".
|
||||
#
|
||||
openhab = {CRYPT}4F61A0FD056BC0FD8231899EC4D9F9CA06AF0DEC895B2A3B0773F6FBC1C99776{CRYPT},_g_:admingroup
|
||||
_g_\:admingroup = group,admin,manager,viewer,systembundles
|
||||
openhab = habopen,_g_:admingroup
|
||||
_g_\:admingroup = group,admin,manager,viewer,systembundles
|
||||
Reference in New Issue
Block a user