Added a cleaner service file.

3 files changed, 33 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe1b789ef7aa..a1eeda6234cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = airsonic
 	pkgdesc = A free, web-based media streamer and jukebox.
 	pkgver = 10.2.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/Airsonic/airsonic/
 	arch = any
 	license = GPL3
@@ -9,13 +9,13 @@ pkgbase = airsonic
 	noextract = airsonic.war
 	backup = etc/airsonic/airsonic.conf
 	source = https://github.com/airsonic/airsonic/releases/download/v10.2.1/airsonic.war
-	source = https://raw.githubusercontent.com/airsonic/airsonic/master/contrib/airsonic.service
 	source = https://raw.githubusercontent.com/airsonic/airsonic/master/contrib/airsonic-systemd-env
+	source = airsonic.service
 	source = airsonic.sysusers
 	source = airsonic.tmpfiles
 	sha256sums = 9bd4e9651df1a15278fb6414d011bd5a45c037857e84eaeb1375b26c717a5ebe
-	sha256sums = 497624d9028e8234886283d97bab217da3acaac97f09afbd98365fccb002d8ae
 	sha256sums = 059a43fe100d95aaaae8091d1c312f4d3a2a2b4edc1969358dd7be35f6525930
+	sha256sums = 8178ae5396921739176e33ae8693d0fe5fb43709fc669e38cc87ab0d0e8bf2fb
 	sha256sums = 25af0b92b247df928db5ac8fec3fb4fa2cdc717e649729d5e0c059a5b81e058e
 	sha256sums = 952c15c8c6b53b9c63a96eb6b2402eae42bde56dc9c6c60484cf039a03a82963
 
diff --git a/PKGBUILD b/PKGBUILD
index b37fa8cda62b..ba60799201f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=airsonic
 pkgver=10.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A free, web-based media streamer and jukebox."
 arch=('any')
 url="https://github.com/Airsonic/airsonic/"
@@ -11,8 +11,8 @@ depends=('java-runtime-headless')
 backup=('etc/airsonic/airsonic.conf')
 noextract=(airsonic.war)
 source=(https://github.com/airsonic/airsonic/releases/download/v${pkgver}/airsonic.war
-        https://raw.githubusercontent.com/airsonic/airsonic/master/contrib/airsonic.service
         https://raw.githubusercontent.com/airsonic/airsonic/master/contrib/airsonic-systemd-env
+        "${pkgname}.service"
         "${pkgname}.sysusers"
         "${pkgname}.tmpfiles")
 
@@ -27,12 +27,6 @@ package() {
   sed -i 's/\/var\/airsonic/\/var\/lib\/airsonic/' airsonic-systemd-env  
   cp airsonic-systemd-env ${pkgdir}/etc/airsonic/airsonic.conf
   
-  sed -i 's/\/var\/airsonic/\/var\/lib\/airsonic/' airsonic.service
-  sed -i 's/\/etc\/sysconfig\/airsonic/\/etc\/airsonic\/airsonic.conf/' airsonic.service
-  
-  # Fix memory allocation JAVA
-  sed -i 's/MemoryDenyWriteExecute=yes/#MemoryDenyWriteExecute=yes/' airsonic.service  
-  
   install -Dm644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
   install -Dm644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
   install -Dm644 "${srcdir}/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
@@ -40,8 +34,7 @@ package() {
 }
 
 sha256sums=('9bd4e9651df1a15278fb6414d011bd5a45c037857e84eaeb1375b26c717a5ebe'
-            '497624d9028e8234886283d97bab217da3acaac97f09afbd98365fccb002d8ae'
             '059a43fe100d95aaaae8091d1c312f4d3a2a2b4edc1969358dd7be35f6525930'
+            '8178ae5396921739176e33ae8693d0fe5fb43709fc669e38cc87ab0d0e8bf2fb'
             '25af0b92b247df928db5ac8fec3fb4fa2cdc717e649729d5e0c059a5b81e058e'
-            '952c15c8c6b53b9c63a96eb6b2402eae42bde56dc9c6c60484cf039a03a82963'
-            )
+            '952c15c8c6b53b9c63a96eb6b2402eae42bde56dc9c6c60484cf039a03a82963')
diff --git a/airsonic.service b/airsonic.service
new file mode 100644
index 000000000000..12e403c8139e
--- /dev/null
+++ b/airsonic.service
@@ -0,0 +1,26 @@
+[Unit]
+Description=Airsonic Media Server
+After=remote-fs.target network.target
+AssertPathExists=/var/lib/airsonic
+
+[Service]
+Type=simple
+Environment="JAVA_JAR=/var/lib/airsonic/airsonic.war"
+Environment="JAVA_OPTS=-Xmx700m"
+Environment="AIRSONIC_HOME=/var/lib/airsonic"
+Environment="PORT=8080"
+Environment="CONTEXT_PATH=/airsonic"
+Environment="JAVA_ARGS="
+EnvironmentFile=-/etc/airsonic/airsonic.conf
+ExecStart=/usr/bin/java \
+          $JAVA_OPTS \
+          -Dairsonic.home=${AIRSONIC_HOME} \
+          -Dserver.context-path=${CONTEXT_PATH} \
+          -Dserver.port=${PORT} \
+          -jar ${JAVA_JAR} $JAVA_ARGS
+User=airsonic
+Group=airsonic
+
+[Install]
+WantedBy=multi-user.target
+