Anpassungen fuer OpenHab 2.3

hcanIngo · Jun 2, 2018 · 845bc9f · 845bc9f
1 parent d6380e3
commit 845bc9f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/hcanhab2_mqtt/MakefileDefines.inc b/hcanhab2_mqtt/MakefileDefines.inc
@@ -1,7 +1,7 @@
 CONF = /home/ingo/Dropbox/HCAN/HI_SERVER/openhab2_conf_mqtt
 include $(CONF)/myconf.inc
 
-OPENHABVERSION = openhab-2.1.0
+OPENHABVERSION = openhab-2.3.0
 HCAN_INSTALLATION = installation.xml
 
 

diff --git a/hcanhab2_mqtt/bananapi/Makefile b/hcanhab2_mqtt/bananapi/Makefile
@@ -28,11 +28,12 @@ cleanZielOrdner:
 	$(_SSH) $(ZIEL_USER)@$(ZIEL_PC) rm -f -R /home/$(ZIEL_USER)/$(ZIEL_ORDNER)
 
 install_oracle_arm_jre:
-	@#cd $(OPENHABDOWNLOADS_DIR); tar xfvz $(OPENHABDOWNLOADS_DIR)/jdk-8u131-linux-arm32-vfp-hflt.tar.gz
-	cd $(OPENHABDOWNLOADS_DIR); tar xfvz $(OPENHABDOWNLOADS_DIR)/jdk-8u151-linux-arm32-vfp-hflt.tar.gz
+	$(_SSH) $(ZIEL_USER)@$(ZIEL_PC) rm -f -R /home/$(ZIEL_USER)/$(ZIEL_ORDNER)/../jdk1.8.0
 	$(_SSH) $(ZIEL_USER)@$(ZIEL_PC) mkdir -p /home/$(ZIEL_USER)/jdk1.8.0
-	#$(_SSH) $(ZIEL_USER)@$(ZIEL_PC) mkdir -p /home/$(ZIEL_USER)/myOpenHabInstallation
-	$(_SCP) $(OPENHABDOWNLOADS_DIR)/jdk1.8.0_151/* $(SCP_ZIEL_DIR)/../jdk1.8.0
+	@#
+	@# zuvor:                                                    jdk-8u151-linux-arm32-vfp-hflt.tar.gz
+	@# cd $(OPENHABDOWNLOADS_DIR); tar xfvz $(OPENHABDOWNLOADS_DIR)/jdk-8u171-linux-arm32-vfp-hflt.tar.gz
+	$(_SCP) $(OPENHABDOWNLOADS_DIR)/jdk1.8.0_171/* $(SCP_ZIEL_DIR)/../jdk1.8.0
 	# Falls noetig, auf dem Bananapi: sudo chmod 755 /home/tt/jdk1.8.0/*
 
 openhab_start_withScreen:

diff --git a/hcanhab2_mqtt/bananapi/Systemd/openhab.service b/hcanhab2_mqtt/bananapi/Systemd/openhab.service
@@ -1,17 +1,18 @@
 [Unit]
-Description=Starts and stops the openHAB Home Automation Bus
-Documentation=http://www.openhab.org
+Description=The openHAB 2 Home Automation Bus Solution
+Documentation=http://docs.openhab.org
 Wants=network-online.target
 After=network-online.target
 
 [Service]
 Type=simple
-GuessMainPID=yes
 User=tt
-ExecStart=/home/tt/myOpenHabInstallation/start.sh
-ExecStop=kill -SIGINT $MAINPID
-Restart=on-failure
+GuessMainPID=yes
 WorkingDirectory=/home/tt/myOpenHabInstallation
+#EnvironmentFile=/etc/default/openhab2
+ExecStart=/home/tt/myOpenHabInstallation/start.sh server
+ExecStop=/bin/kill -SIGINT $MAINPID
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target