commit 8dd66dcc3c3d531572b76634ae58c2e0186ecdad Author: Richard Shaw <hobbes1069(a)gmail.com&gt; Date: Sat Jun 30 14:50:23 2018 -0500 Update to 5.8.23. .gitignore | 1 + mongod.sh | 5 +++++ sources | 2 +- unifi.service | 8 ++++---- unifi.spec | 19 ++++++++++++++++++- unifi.xml | 2 +- 6 files changed, 30 insertions(+), 7 deletions(-) --- diff --git a/.gitignore b/.gitignore index 8d36e69..557bb3d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /UniFi-5.7.20.unix.zip /UniFi-5.7.23.unix.zip +/UniFi-5.8.23.unix.zip diff --git a/mongod.sh b/mongod.sh new file mode 100755 index 0000000..4fe02b2 --- /dev/null +++ b/mongod.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# +# Workaround script for MongoDB 3.6 no longer accepting --nohttpinterface. +# +exec /usr/bin/mongod ${*//--nohttpinterface/} diff --git a/sources b/sources index 0cf8ffa..38624bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -33e1cda0836ce170c731cc03da3e6e97 UniFi-5.7.23.unix.zip +0468e7e612d84e76791323553cfb8618 UniFi-5.8.23.unix.zip diff --git a/unifi.service b/unifi.service index b370fca..ee71880 100644 --- a/unifi.service +++ b/unifi.service @@ -9,10 +9,10 @@ User=unifi WorkingDirectory=/usr/share/unifi # Has to be run though bash script due to java issue, see: # https://bugzilla.redhat.com/show_bug.cgi?id=1358476#c20 -ExecStart=/usr/sbin/unifi start -ExecStop=/usr/sbin/unifi stop -#ExecStart=/usr/bin/java -jar /usr/share/unifi/lib/ace.jar start -#ExecStop=/usr/bin/java -jar /usr/share/unifi/lib/ace.jar stop +#ExecStart=/usr/sbin/unifi start +#ExecStop=/usr/sbin/unifi stop +ExecStart=/usr/bin/java -jar /usr/share/unifi/lib/ace.jar start +ExecStop=/usr/bin/java -jar /usr/share/unifi/lib/ace.jar stop Restart=on-success [Install] diff --git a/unifi.spec b/unifi.spec index 46e6ca6..c23bd15 100644 --- a/unifi.spec +++ b/unifi.spec @@ -4,7 +4,7 @@ %global __strip /bin/true Name: unifi -Version: 5.7.23 +Version: 5.8.23 Release: 1%{?dist} Summary: Ubiquiti UniFi controller @@ -15,6 +15,7 @@ Source1: unifi.service Source3: unifi.xml Source4: unifi.logrotate Source5: unifi.sh +Source6: mongod.sh Source100: PERMISSION-1.html Source101: PERMISSION-2.html Source102: SETUP @@ -201,6 +202,15 @@ install %{SOURCE5} %{buildroot}%{_sbindir}/%{name} # Install forum messages giving permission to redistribute. install -p %{SOURCE100} %{SOURCE101} . +# +# Workaround script for MongoDB 3.6 no longer accepting --nohttpinterface. +# See: https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/m-p/232... +# +%if 0%{?fedora} >= 28 + install -pm 0755 %{SOURCE6} %{buildroot}%{_datadir}/unifi/bin/mongod +%endif + + %pre # Migrate UniFi log to the proper directory @@ -280,6 +290,13 @@ fi %changelog +* Sat Jun 30 2018 Richard Shaw <hobbes1069(a)gmail.com&gt; - 5.8.23-1 +- Update to 5.8.23. + +* Mon May 07 2018 Richard Shaw <hobbes1069(a)gmail.com&gt; - 5.7.23-2 +- Add workaround shell script to prevent --nohttpdinterface from being passed to + MongoDB. + * Tue Apr 17 2018 Richard Shaw <hobbes1069(a)gmail.com&gt; - 5.7.23-1 - Update to 5.7.23. diff --git a/unifi.xml b/unifi.xml index 69b08f5..bfd19be 100644 --- a/unifi.xml +++ b/unifi.xml @@ -9,5 +9,5 @@ <port port="8843" protocol="tcp"/> <port port="8880" protocol="tcp"/> <port port="10001" protocol="udp"/> - <port port="27117" protocol="tcp"/> +<!-- <port port="27117" protocol="tcp"/> --> </service>