summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJimmy Xu2019-11-22 23:12:50 +0000
committerJimmy Xu2019-11-22 23:12:50 +0000
commit32ee917cb1a46948f2a053b19c653f1423fa8b25 (patch)
treed5e5a3600624144b5dd667407092feaa9640b6e5
parent80928a88e0f02ef86f35a6fdd31c4dc032eb068f (diff)
downloadaur-32ee917cb1a46948f2a053b19c653f1423fa8b25.tar.gz
flightradar24: Cleanup service files
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD12
-rw-r--r--flightradar24.install4
-rw-r--r--flightradar24.sysusers2
-rw-r--r--flightradar24.tmpfiles2
-rw-r--r--fr24feed.service13
6 files changed, 18 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d9b5af64f23..faf8b9b9cc4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = flightradar24
pkgdesc = Feeder software for Flightradar24.com (fr24feed)
pkgver = 1.0.24
- pkgrel = 9
+ pkgrel = 10
url = https://www.flightradar24.com/share-your-data
install = flightradar24.install
arch = x86_64
@@ -10,16 +10,14 @@ pkgbase = flightradar24
arch = armv7h
license = custom
depends = bash
- optdepends = dump1090-git: for dump1090 in RasppberyPi
+ depends = dump1090
backup = etc/fr24feed.ini
source = fr24feed.service
- source = flightradar24.tmpfiles
source = flightradar24.sysusers
source = fr24feed-status.patch
source = hostname
- sha256sums = 5cdf6942b28d59bb06ceebce2eb2062f77723b2127065070278b52a2e1f8db68
- sha256sums = 32f6f289efe8e3e303767239b2a276405b2d7c0fcbbde8ed9473ee6889b676ff
- sha256sums = 7e5e1a28769559a2e2e1312894a1f9d315c4812bb34e2f1c45b2f877e4f4eeb0
+ sha256sums = 857383cd88daac429f25579d40cc5c4f3c4468f2af406cba70d3d7e9fe825cd3
+ sha256sums = a018c751e431fcde72e709917fdfe663a5c74040af80b56d1a4658ba962c95e5
sha256sums = ebcf31ecb62aef650b0984f978318f7e716078f520efb165306dca592c0821bb
sha256sums = 32ae61984ae0123690fea0bf67f2b5f1ee1155f6a2b3a9d0ff7c5431d902ddee
source_x86_64 = https://repo-feed.flightradar24.com/linux_x86_64_binaries/fr24feed_1.0.24-5_amd64.deb
diff --git a/PKGBUILD b/PKGBUILD
index c2d648e1483..9e96a2000d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,19 +5,17 @@
pkgname=flightradar24
_pkgname=fr24feed
pkgver=1.0.24
-pkgrel=9
+pkgrel=10
_pkgver=1.0.24-5
_pkgverarm=1.0.24-7
pkgdesc='Feeder software for Flightradar24.com (fr24feed)'
arch=('x86_64' 'i686' 'armv6h' 'armv7h')
url='https://www.flightradar24.com/share-your-data'
license=('custom')
-depends=('bash')
-optdepends=('dump1090-git: for dump1090 in RasppberyPi')
+depends=('bash' 'dump1090')
backup=(etc/fr24feed.ini)
install=flightradar24.install
source=('fr24feed.service'
- 'flightradar24.tmpfiles'
'flightradar24.sysusers'
'fr24feed-status.patch'
'hostname')
@@ -26,9 +24,8 @@ source_i686=("https://repo-feed.flightradar24.com/linux_x86_binaries/${_pkgname}
source_armv6h=("https://repo-feed.flightradar24.com/rpi_binaries/${_pkgname}_${_pkgverarm}_armhf.deb")
source_armv7h=("https://repo-feed.flightradar24.com/rpi_binaries/${_pkgname}_${_pkgverarm}_armhf.deb")
-sha256sums=('5cdf6942b28d59bb06ceebce2eb2062f77723b2127065070278b52a2e1f8db68'
- '32f6f289efe8e3e303767239b2a276405b2d7c0fcbbde8ed9473ee6889b676ff'
- '7e5e1a28769559a2e2e1312894a1f9d315c4812bb34e2f1c45b2f877e4f4eeb0'
+sha256sums=('857383cd88daac429f25579d40cc5c4f3c4468f2af406cba70d3d7e9fe825cd3'
+ 'a018c751e431fcde72e709917fdfe663a5c74040af80b56d1a4658ba962c95e5'
'ebcf31ecb62aef650b0984f978318f7e716078f520efb165306dca592c0821bb'
'32ae61984ae0123690fea0bf67f2b5f1ee1155f6a2b3a9d0ff7c5431d902ddee')
sha256sums_x86_64=('757815ef7880652d667a085eaa54772669e85b54202312c68b203c01aac4a4c7')
@@ -47,7 +44,6 @@ package() {
install -Dm644 -t "$pkgdir/etc" etc/fr24feed.ini
install -Dm644 -t "$pkgdir/usr/lib/systemd/system" fr24feed.service
- install -Dm644 flightradar24.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
install -Dm644 flightradar24.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
# hostname: invalid option -- 'I'
diff --git a/flightradar24.install b/flightradar24.install
index 7733abcab53..5ac88c8d137 100644
--- a/flightradar24.install
+++ b/flightradar24.install
@@ -1,6 +1,4 @@
post_install() {
- echo "==> If you install on Raspberry-pi, you need to install dump1090-git from AUR"
echo "==> To signup and configure fr24feed, run"
- echo "==> "
- echo "==> sudo -u fr24 fr24feed --signup --config-file=/etc/fr24feed.ini"
+ echo "==> sudo fr24feed --signup --config-file=/etc/fr24feed.ini"
}
diff --git a/flightradar24.sysusers b/flightradar24.sysusers
index 3407ca4101a..ea23c6ec634 100644
--- a/flightradar24.sysusers
+++ b/flightradar24.sysusers
@@ -1 +1 @@
-u fr24 - "FlightRadar24 Client"
+u fr24 - "Flightradar24 Decoder & Feeder"
diff --git a/flightradar24.tmpfiles b/flightradar24.tmpfiles
deleted file mode 100644
index 86f54a6ec87..00000000000
--- a/flightradar24.tmpfiles
+++ /dev/null
@@ -1,2 +0,0 @@
-D /var/log/fr24feed 0755 fr24 fr24 -
-D /etc/fr24feed 0755 fr24 fr24 -
diff --git a/fr24feed.service b/fr24feed.service
index 9066dbedc5e..de155e27b0a 100644
--- a/fr24feed.service
+++ b/fr24feed.service
@@ -1,15 +1,18 @@
[Unit]
-Description=Flightradar24 decoder and feeder
-After=network.target
+Description=Flightradar24 Decoder & Feeder
+After=network-online.target
[Service]
+Type=simple
Restart=on-failure
User=fr24
+Group=fr24
ProtectSystem=full
-ProtectHome=true
+ProtectHome=yes
RuntimeDirectory=fr24feed
-ExecStart=/usr/bin/fr24feed --config-file=/etc/fr24feed.ini --logfile=/var/log/fr24feed.log
+LogsDirectory=fr24feed
+ExecStart=/usr/bin/fr24feed --config-file=/etc/fr24feed.ini --logfile=/var/log/fr24feed/fr24feed.log
Environment=PATH=/usr/lib/flightradar24:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
[Install]
-WantedBy=network.target
+WantedBy=multi-user.target