diff --git a/domoticz.conf b/domoticz.conf index 7c0deee..6155ad4 100644 --- a/domoticz.conf +++ b/domoticz.conf @@ -5,7 +5,7 @@ SSLPASS="" SSLMETHOD="" SSLOPTIONS="" SSLDHPARAM="" -WWW_ROOT="/usr/share/domoticz/www" +APP_ROOT="/usr/share/domoticz" DBASE="/var/lib/domoticz/domoticz.db" USERDATA="/var/lib/domoticz/" LOG="/var/log/domoticz.log" diff --git a/domoticz.service b/domoticz.service index 1d5ff2e..2d160b8 100644 --- a/domoticz.service +++ b/domoticz.service @@ -5,7 +5,7 @@ Description=Domoticz Home Automation Server User=domoticz Group=domoticz EnvironmentFile=/etc/sysconfig/domoticz -ExecStart=/usr/bin/domoticz -www $WWW_PORT -sslwww $SSL_PORT -sslcert $SSLCERT -sslpass $SSLPASS -sslmethod $SSLMETHOD -ssloptions $SSLOPTIONS -ssldhparam $SSLDHPARAM -wwwroot $WWW_ROOT -dbase $DBASE -userdata $USERDATA -log $LOG -loglevel $LOGLEVEL +ExecStart=/usr/bin/domoticz -www $WWW_PORT -sslwww $SSL_PORT -sslcert $SSLCERT -sslpass $SSLPASS -sslmethod $SSLMETHOD -ssloptions $SSLOPTIONS -ssldhparam $SSLDHPARAM -approot $APP_ROOT -dbase $DBASE -userdata $USERDATA -log $LOG -loglevel $LOGLEVEL WorkingDirectory=/usr/share/domoticz # Give the right to open priviliged ports. This allows you to run on a port <1024 without root permissions (user/group setting above) #CapabilityBoundingSet=CAP_NET_BIND_SERVICE diff --git a/domoticz.spec b/domoticz.spec index b63f866..4cf4240 100644 --- a/domoticz.spec +++ b/domoticz.spec @@ -3,7 +3,7 @@ Name: domoticz Version: 2020.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open source Home Automation System License: GPLv3+ and ASL 2.0 and Boost and BSD and MIT @@ -124,6 +124,9 @@ make %{?_smp_mflags} %install %make_install +# remove bundled OpenZWave configuration files so system files are used +rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/Config/ + # remove docs, we grab them in files below rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/*.txt @@ -156,8 +159,11 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element-dark/fonts/DroidSans ln -s %{_fontdir}/google-droid/DroidSans.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element-dark/fonts/ -# Link default plugins and scripts to userdata directory +# Workaround lookup path for dzVents +ln -s %{_datadir}/%{name}/scripts/lua/JSON.lua \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/dzVents/runtime/JSON.lua +# Link default plugins and scripts to userdata directory ln -s %{_datadir}/%{name}/scripts/dzVents/data/README.md \ $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/scripts/dzVents/data/README.md ln -s %{_datadir}/%{name}/scripts/dzVents/generated_scripts/README.md \ @@ -223,6 +229,9 @@ usermod -G domoticz,dialout domoticz %changelog +* Tue Apr 21 2020 Michael Cronenworth - 2020.1-2 +- Fix dzVents (RHBZ#1759558) + * Tue Mar 24 2020 Michael Cronenworth - 2020.1-1 - New stable release