Skip to content

Commit

Permalink
Changed configurationPids
Browse files Browse the repository at this point in the history
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
  • Loading branch information
cweitkamp committed Jan 1, 2020
1 parent 3b268a8 commit 4949e94
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 35 deletions.
22 changes: 11 additions & 11 deletions distributions/openhab/src/main/resources/conf/services/runtime.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,47 @@
# The ISO 639 alpha-2 or alpha-3 language code (if there is no alpha-2 one).
# Example: "en" (English), "de" (German), "ja" (Japanese), "kok" (Konkani)
#
#org.openhab.core.i18n:language=
#org.openhab.i18n:language=

# The region that should be used.
# ISO 3166 alpha-2 country code or UN M.49 numeric-3 area code.
# Example: "US" (United States), "DE" (Germany), "FR" (France), "029" (Caribbean)
#
#org.openhab.core.i18n:region=
#org.openhab.i18n:region=

################ PERSISTENCE ####################

# The persistence service to use if no other is specified.
#
#org.openhab.core.persistence:default=
#org.openhab.persistence:default=

################### AUDIO #######################

# This parameter defines the default audio source to use (if not set, the first available one will be used.
#
#org.openhab.core.audio:defaultSource=
#org.openhab.audio:defaultSource=

# This parameter defines the default audio sink to use (if not set, the first available one will be used.
#
#org.openhab.core.audio:defaultSink=
#org.openhab.audio:defaultSink=

##################### VOICE #####################

# This parameter defines the default text-to-speech service to use (if not set, the first available one will be used.
#
#org.openhab.core.voice:defaultTTS=
#org.openhab.voice:defaultTTS=

# This parameter defines the default speech-to-text service to use (if not set, the first available one will be used.
#
#org.openhab.core.voice:defaultSTT=
#org.openhab.voice:defaultSTT=

# The default voice to use if no specific TTS service or voice is specified.
#
#org.openhab.core.voice:defaultVoice=
#org.openhab.voice:defaultVoice=

# The default human language interpreter to use if no other is specified.
#
#org.openhab.core.voice:defaultHLI=
#org.openhab.voice:defaultHLI=

################### EPHEMERIS ###################

Expand Down Expand Up @@ -76,11 +76,11 @@ org.openhab.ephemeris:dayset-school=[MONDAY,TUESDAY,WEDNESDAY,THURSDAY,FRIDAY]
# Setting this to true will automatically approve all inbox entries and create Things for them,
# so that they are immediately available in the system (default is false)
#
#org.openhab.core.inbox:autoApprove=true
#org.openhab.inbox:autoApprove=true

# This setting allows to switch between a "simple" and an "advanced" mode for item management.
# In simple mode (autoLinks=true), links and their according items are automatically created for new Things.
# In advanced mode (autoLinks=false), the user has the full control about which items channels are linked to.
# Existing links will remain untouched. (default is true)
#
#org.openhab.core.links:autoLinks=false
#org.openhab.links:autoLinks=false
20 changes: 10 additions & 10 deletions distributions/openhab/src/main/resources/runtime/services.cfg
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# This file defines required service configurations.
# It can be overridden by user specific configurations in conf/services folder.

org.openhab.core.folder:items=items
org.openhab.core.folder:sitemaps=sitemap
org.openhab.core.folder:rules=rules
org.openhab.core.folder:scripts=script
org.openhab.core.folder:persistence=persist
org.openhab.core.folder:things=things
org.openhab.folder:items=items
org.openhab.folder:sitemaps=sitemap
org.openhab.folder:rules=rules
org.openhab.folder:scripts=script
org.openhab.folder:persistence=persist
org.openhab.folder:things=things

# Configuration of thread pool sizes
org.openhab.core.threadpool:thingHandler=5
org.openhab.core.threadpool:discovery=5
org.openhab.core.threadpool:safeCall=10
org.openhab.threadpool:thingHandler=5
org.openhab.threadpool:discovery=5
org.openhab.threadpool:safeCall=10

org.openhab.core.autoupdate:sendOptimisticUpdates=true
org.openhab.autoupdate:sendOptimisticUpdates=true
8 changes: 4 additions & 4 deletions features/distro/src/main/feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<configfile finalname="${openhab.conf}/services/basicui.cfg" override="false">mvn:${project.groupId}/distro-resources/${project.version}/cfg/services-basicui</configfile>
<configfile finalname="${openhab.conf}/services/classicui.cfg" override="false">mvn:${project.groupId}/distro-resources/${project.version}/cfg/services-classicui</configfile>
<configfile finalname="${openhab.conf}/services/logging.cfg" override="false">mvn:${project.groupId}/distro-resources/${project.version}/cfg/services-logging</configfile>
<config name="org.openhab.core.persistence">
<config name="org.openhab.persistence">
default = rrd4j
</config>
<config name="org.openhab.addons" append="true">
Expand All @@ -40,7 +40,7 @@
ui = paper,habpanel
misc = ruleengine
</config>
<config name="org.openhab.core.links">
<config name="org.openhab.links">
autoLinks = true
</config>
</feature>
Expand All @@ -51,7 +51,7 @@
package = standard
ui = basic,paper,habpanel,homebuilder
</config>
<config name="org.openhab.core.links">
<config name="org.openhab.links">
autoLinks = false
</config>
</feature>
Expand All @@ -63,7 +63,7 @@
ui = classic,basic,paper,habpanel,habmin,restdocs
transformation = map,regex,xslt,exec,javascript,scale,xpath,jsonpath
</config>
<config name="org.openhab.core.links">
<config name="org.openhab.links">
autoLinks = false
</config>
</feature>
Expand Down
20 changes: 10 additions & 10 deletions launch/app/runtime/conf/smarthome.cfg
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
org.openhab.core.folder:items=items
org.openhab.core.folder:sitemaps=sitemap
org.openhab.core.folder:rules=rules
org.openhab.core.folder:scripts=script
org.openhab.core.folder:persistence=persist
org.openhab.core.folder:things=things
org.openhab.folder:items=items
org.openhab.folder:sitemaps=sitemap
org.openhab.folder:rules=rules
org.openhab.folder:scripts=script
org.openhab.folder:persistence=persist
org.openhab.folder:things=things

org.openhab.classicui:defaultSitemap=demo

Expand All @@ -21,9 +21,9 @@ com.eclipsesource.jaxrs.swagger.config:swagger.info.title=openHAB REST API
com.eclipsesource.jaxrs.swagger.config:swagger.info.version=1.0

# Uncomment to enable rest api CORS requests
# org.openhab.core.cors:enable=true
# org.openhab.cors:enable=true

# Configuration of thread pool sizes
org.openhab.core.threadpool:thingHandler=3
org.openhab.core.threadpool:discovery=3
org.openhab.core.threadpool:safeCall=3
org.openhab.threadpool:thingHandler=3
org.openhab.threadpool:discovery=3
org.openhab.threadpool:safeCall=3

0 comments on commit 4949e94

Please sign in to comment.