gentoo resync : 16.04.2022

3 files changed, 2 insertions, 41 deletions

diff --git a/net-wireless/unifi/files/unifi.initd-r1 b/net-wireless/unifi/files/unifi.initd-r1
deleted file mode 100644
index 2db36571dac0..000000000000
--- a/net-wireless/unifi/files/unifi.initd-r1
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 -Djava.library.path="
-UNIFI_PATH="/usr/lib/unifi"
-
-UNIFI_USER="unifi"
-UNIFI_GROUP="unifi"
-
-name="UniFi Controller"
-
-start_stop_daemon_args="--chdir ${UNIFI_PATH}"
-
-command="${DAEMON}"
-command_args="${JAVA_OPTS} -jar ${ACE_LIB} start"
-command_background=true
-pidfile="/run/${RC_SVCNAME}.pid"
-
-command_user="${UNIFI_USER}:${UNIFI_GROUP}"
-
-command_progress=true
-retry=TERM/60
diff --git a/net-wireless/unifi/files/unifi.service b/net-wireless/unifi/files/unifi.service
deleted file mode 100644
index 00c00d7f3c9e..000000000000
--- a/net-wireless/unifi/files/unifi.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=UniFi Controller
-After=network-online.target
-
-[Service]
-Type=simple
-User=unifi
-Group=unifi
-WorkingDirectory=/usr/lib/unifi
-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
diff --git a/net-wireless/unifi/files/unifi.service-r1 b/net-wireless/unifi/files/unifi.service-r2
index a9b98e25de41..40fff6c81797 100644
--- a/net-wireless/unifi/files/unifi.service-r1
+++ b/net-wireless/unifi/files/unifi.service-r2
@@ -1,6 +1,6 @@
 [Unit]
 Description=UniFi Controller
-After=network-online.target
+After=network.target
 
 [Service]
 Type=simple
@@ -11,4 +11,4 @@ ExecStart=/usr/bin/unifi start
 ExecStop=/usr/bin/unifi stop
 
 [Install]
-WantedBy=network.target
+WantedBy=multi-user.target