summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kohler <bkohler@gentoo.org>2018-06-27 06:48:13 -0500
committerBen Kohler <bkohler@gentoo.org>2018-06-27 06:48:38 -0500
commit4a927a8c3ce5061438a42a3c9280f9c5195115d5 (patch)
tree824079a3da2e6fca14b25e21e3053809be13a39c /net-wireless/unifi/files
parentapp-admin/vault: Version bump to 0.10.3 (diff)
downloadgentoo-4a927a8c3ce5061438a42a3c9280f9c5195115d5.tar.gz
gentoo-4a927a8c3ce5061438a42a3c9280f9c5195115d5.tar.bz2
gentoo-4a927a8c3ce5061438a42a3c9280f9c5195115d5.zip
net-wireless/unifi: don't use tomcat-native anymore
Using tomcat-native seems to cause SSL problems on most unifi versions. Removing dep and also adjusting the service start commands to hide the system copy of tomcat-native in case it's already installed for other reasons. Closes: https://bugs.gentoo.org/659302 Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'net-wireless/unifi/files')
-rw-r--r--net-wireless/unifi/files/unifi.initd2
-rw-r--r--net-wireless/unifi/files/unifi.service4
2 files changed, 3 insertions, 3 deletions
diff --git a/net-wireless/unifi/files/unifi.initd b/net-wireless/unifi/files/unifi.initd
index 959aa58a42ce..87c798b5ecd3 100644
--- a/net-wireless/unifi/files/unifi.initd
+++ b/net-wireless/unifi/files/unifi.initd
@@ -4,7 +4,7 @@
ACE_LIB="lib/ace.jar"
DAEMON="${JAVA_HOME-/etc/java-config-2/current-system-vm}"/bin/java
-JAVA_OPTS="-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp"
+JAVA_OPTS="-Djava.library.path= -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp"
UNIFI_GROUP="unifi"
UNIFI_PATH="/usr/lib/unifi"
UNIFI_USER="unifi"
diff --git a/net-wireless/unifi/files/unifi.service b/net-wireless/unifi/files/unifi.service
index cee05d4d1536..00c00d7f3c9e 100644
--- a/net-wireless/unifi/files/unifi.service
+++ b/net-wireless/unifi/files/unifi.service
@@ -7,8 +7,8 @@ Type=simple
User=unifi
Group=unifi
WorkingDirectory=/usr/lib/unifi
-ExecStart=/usr/bin/java -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -jar /usr/lib/unifi/lib/ace.jar start
-ExecStop=/usr/bin/java -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -jar /usr/lib/unifi/lib/ace.jar stop
+ExecStart=/usr/bin/java -Djava.library.path= -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -jar /usr/lib/unifi/lib/ace.jar start
+ExecStop=/usr/bin/java -Djava.library.path= -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -jar /usr/lib/unifi/lib/ace.jar stop
[Install]
WantedBy=network.target