fixed dynamic user

4 files changed, 33 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 190cba8cf341..913953c624fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = navidrome-bin
 	pkgdesc = Music Server and Streamer compatible with Subsonic/Airsonic
-	pkgver = 0.45.0
+	pkgver = 0.45.1
 	pkgrel = 1
 	url = https://www.navidrome.org/
 	arch = x86_64
@@ -14,29 +14,29 @@ pkgbase = navidrome-bin
 	conflicts = navidrome
 	conflicts = navidrome-systemd
 	backup = var/lib/navidrome/navidrome.toml
-	source_x86_64 = https://github.com/navidrome/navidrome/releases/download/v0.45.0/navidrome_0.45.0_Linux_x86_64.tar.gz
+	source_x86_64 = https://github.com/navidrome/navidrome/releases/download/v0.45.1/navidrome_0.45.1_Linux_x86_64.tar.gz
 	source_x86_64 = navidrome.service
 	source_x86_64 = navidrome.toml
-	sha256sums_x86_64 = a5028580afe74b882ac611fa08be93c215320bf7939acfadfd0aac5e834346c7
-	sha256sums_x86_64 = 5b7a98ffbef452eda01688d2d59a6113eba92296cfd379ca44a39c7fac51a9b2
+	sha256sums_x86_64 = 4d9717ab9d6c2a878b3e6711a6fe1520b0e64ba76c4bb971949cd30c7d2d1163
+	sha256sums_x86_64 = 54d2e07865168bc5f3ed09c274f593688b05c51afd715cfec359344df3cf553d
 	sha256sums_x86_64 = 5ac4183b961438c8f838d82d8772b856d97ea7aeed2ab4ac4d5fc69559da43d4
-	source_armv6h = https://github.com/navidrome/navidrome/releases/download/v0.45.0/navidrome_0.45.0_Linux_armv6.tar.gz
+	source_armv6h = https://github.com/navidrome/navidrome/releases/download/v0.45.1/navidrome_0.45.1_Linux_armv6.tar.gz
 	source_armv6h = navidrome.service
 	source_armv6h = navidrome.toml
-	sha256sums_armv6h = 3a6ac2a1c9bd984691490c948941c2187620322b89da68d5c8016a67d82df567
-	sha256sums_armv6h = 5b7a98ffbef452eda01688d2d59a6113eba92296cfd379ca44a39c7fac51a9b2
+	sha256sums_armv6h = 49b752ef6b7078b0ae12e6b8ef5aa936abc3cba26499aa4ea6aea448aa9053c8
+	sha256sums_armv6h = 54d2e07865168bc5f3ed09c274f593688b05c51afd715cfec359344df3cf553d
 	sha256sums_armv6h = 5ac4183b961438c8f838d82d8772b856d97ea7aeed2ab4ac4d5fc69559da43d4
-	source_armv7h = https://github.com/navidrome/navidrome/releases/download/v0.45.0/navidrome_0.45.0_Linux_armv7.tar.gz
+	source_armv7h = https://github.com/navidrome/navidrome/releases/download/v0.45.1/navidrome_0.45.1_Linux_armv7.tar.gz
 	source_armv7h = navidrome.service
 	source_armv7h = navidrome.toml
-	sha256sums_armv7h = a5d59d262ec727398f304d0b36128abe6d4b6aec47f89aa4b42c57567972533d
-	sha256sums_armv7h = 5b7a98ffbef452eda01688d2d59a6113eba92296cfd379ca44a39c7fac51a9b2
+	sha256sums_armv7h = baa86452c8d7a48d67145b22eb4fcfa56042172dc4a9f1d3a2328b7d2076e7d1
+	sha256sums_armv7h = 54d2e07865168bc5f3ed09c274f593688b05c51afd715cfec359344df3cf553d
 	sha256sums_armv7h = 5ac4183b961438c8f838d82d8772b856d97ea7aeed2ab4ac4d5fc69559da43d4
-	source_aarch64 = https://github.com/navidrome/navidrome/releases/download/v0.45.0/navidrome_0.45.0_Linux_arm64.tar.gz
+	source_aarch64 = https://github.com/navidrome/navidrome/releases/download/v0.45.1/navidrome_0.45.1_Linux_arm64.tar.gz
 	source_aarch64 = navidrome.service
 	source_aarch64 = navidrome.toml
-	sha256sums_aarch64 = 768cc98a2f24e51c3868e2408f0f2897713fd10b8a22f37b911a849302c3feaf
-	sha256sums_aarch64 = 5b7a98ffbef452eda01688d2d59a6113eba92296cfd379ca44a39c7fac51a9b2
+	sha256sums_aarch64 = 55ad034a67a68fc86c6b2c283fa58aa3fc7e410cd23701c2a54e155ace65a5b2
+	sha256sums_aarch64 = 54d2e07865168bc5f3ed09c274f593688b05c51afd715cfec359344df3cf553d
 	sha256sums_aarch64 = 5ac4183b961438c8f838d82d8772b856d97ea7aeed2ab4ac4d5fc69559da43d4
 
 pkgname = navidrome-bin
diff --git a/PKGBUILD b/PKGBUILD
index a8de5cb5a976..68257e5eafeb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase='navidrome-bin'
 pkgname=(navidrome-bin)
-pkgver='0.45.0'
+pkgver='0.45.1'
 pkgrel=1
 pkgdesc='Music Server and Streamer compatible with Subsonic/Airsonic'
 url='https://www.navidrome.org/'
@@ -12,39 +12,38 @@ provides=('navidrome')
 conflicts=('navidrome' 'navidrome-systemd')
 backup=('var/lib/navidrome/navidrome.toml')
 depends=('glibc' 'ffmpeg')
-source_x86_64=('https://github.com/navidrome/navidrome/releases/download/v0.45.0/navidrome_0.45.0_Linux_x86_64.tar.gz'
+source_x86_64=('https://github.com/navidrome/navidrome/releases/download/v0.45.1/navidrome_0.45.1_Linux_x86_64.tar.gz'
                'navidrome.service'
                'navidrome.toml'
               )
-source_armv6h=('https://github.com/navidrome/navidrome/releases/download/v0.45.0/navidrome_0.45.0_Linux_armv6.tar.gz'
+source_armv6h=('https://github.com/navidrome/navidrome/releases/download/v0.45.1/navidrome_0.45.1_Linux_armv6.tar.gz'
                'navidrome.service'
                'navidrome.toml'
               )
-source_armv7h=('https://github.com/navidrome/navidrome/releases/download/v0.45.0/navidrome_0.45.0_Linux_armv7.tar.gz'
+source_armv7h=('https://github.com/navidrome/navidrome/releases/download/v0.45.1/navidrome_0.45.1_Linux_armv7.tar.gz'
                'navidrome.service'
                'navidrome.toml'
               )
-source_aarch64=('https://github.com/navidrome/navidrome/releases/download/v0.45.0/navidrome_0.45.0_Linux_arm64.tar.gz'
+source_aarch64=('https://github.com/navidrome/navidrome/releases/download/v0.45.1/navidrome_0.45.1_Linux_arm64.tar.gz'
                 'navidrome.service'
                 'navidrome.toml'
               )
-sha256sums_x86_64=('a5028580afe74b882ac611fa08be93c215320bf7939acfadfd0aac5e834346c7'
-                   '5b7a98ffbef452eda01688d2d59a6113eba92296cfd379ca44a39c7fac51a9b2'
+sha256sums_x86_64=('4d9717ab9d6c2a878b3e6711a6fe1520b0e64ba76c4bb971949cd30c7d2d1163'
+                   '54d2e07865168bc5f3ed09c274f593688b05c51afd715cfec359344df3cf553d'
                    '5ac4183b961438c8f838d82d8772b856d97ea7aeed2ab4ac4d5fc69559da43d4')
-sha256sums_armv6h=('3a6ac2a1c9bd984691490c948941c2187620322b89da68d5c8016a67d82df567'
-                   '5b7a98ffbef452eda01688d2d59a6113eba92296cfd379ca44a39c7fac51a9b2'
+sha256sums_armv6h=('49b752ef6b7078b0ae12e6b8ef5aa936abc3cba26499aa4ea6aea448aa9053c8'
+                   '54d2e07865168bc5f3ed09c274f593688b05c51afd715cfec359344df3cf553d'
                    '5ac4183b961438c8f838d82d8772b856d97ea7aeed2ab4ac4d5fc69559da43d4')
-sha256sums_armv7h=('a5d59d262ec727398f304d0b36128abe6d4b6aec47f89aa4b42c57567972533d'
-                   '5b7a98ffbef452eda01688d2d59a6113eba92296cfd379ca44a39c7fac51a9b2'
+sha256sums_armv7h=('baa86452c8d7a48d67145b22eb4fcfa56042172dc4a9f1d3a2328b7d2076e7d1'
+                   '54d2e07865168bc5f3ed09c274f593688b05c51afd715cfec359344df3cf553d'
                    '5ac4183b961438c8f838d82d8772b856d97ea7aeed2ab4ac4d5fc69559da43d4')
-sha256sums_aarch64=('768cc98a2f24e51c3868e2408f0f2897713fd10b8a22f37b911a849302c3feaf'
-                    '5b7a98ffbef452eda01688d2d59a6113eba92296cfd379ca44a39c7fac51a9b2'
+sha256sums_aarch64=('55ad034a67a68fc86c6b2c283fa58aa3fc7e410cd23701c2a54e155ace65a5b2'
+                    '54d2e07865168bc5f3ed09c274f593688b05c51afd715cfec359344df3cf553d'
                     '5ac4183b961438c8f838d82d8772b856d97ea7aeed2ab4ac4d5fc69559da43d4')
 
 package() {
-  install -d -o navidrome -g navidrome "${pkgdir}/var/lib/navidrome"
   install -Dm 755 "${srcdir}/navidrome" -t "${pkgdir}/usr/bin/"
   install -Dm 644 "${srcdir}/navidrome.service" -t "${pkgdir}/usr/lib/systemd/system"
-  install -Dm 644 "${srcdir}/navidrome.toml" -t "${pkgdir}/var/lib/navidrome"
+  install -Dm 644 "${srcdir}/navidrome.toml" -t "${pkgdir}/etc/navidrome"
 }
 
diff --git a/navidrome.service b/navidrome.service
index 0be745e85ee1..0cf52377c66f 100644
--- a/navidrome.service
+++ b/navidrome.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Navidrome Music Server and Streamer compatible with Subsonic/Airsonic
 After=remote-fs.target network.target
-AssertPathExists=/var/lib/navidrome
+AssertPathExists=/etc/navidrome
 
 [Install]
 WantedBy=multi-user.target
@@ -9,11 +9,11 @@ WantedBy=multi-user.target
 [Service]
 User=navidrome
 Group=navidrome
-DynamicUser=true
-Environment=PATH=/usr/bin:/usr/bin/navidrome
-Type=simple
-ExecStart=/usr/bin/navidrome --configfile "/var/lib/navidrome/navidrome.toml"
+DynamicUser=yes
+ExecStart=/usr/bin/navidrome --configfile "/etc/navidrome/navidrome.toml"
+StateDirectory=navidrome
 WorkingDirectory=/var/lib/navidrome
+Environment=HOME=/var/lib/navidrome
 TimeoutStopSec=20
 KillMode=process
 Restart=on-failure
diff --git a/update.sh b/update.sh
index 7a79447208bf..4752d2229421 100755
--- a/update.sh
+++ b/update.sh
@@ -55,10 +55,9 @@ sha512sums_armv7h=()
 sha512sums_aarch64=()
 
 package() {
-  install -d -o navidrome -g navidrome \"\${pkgdir}/var/lib/${EXECUTABLE_NAME}\"
   install -Dm 755 \"\${srcdir}/navidrome\" -t \"\${pkgdir}/usr/bin/\"
   install -Dm 644 \"\${srcdir}/navidrome.service\" -t \"\${pkgdir}/usr/lib/systemd/system\"
-  install -Dm 644 \"\${srcdir}/navidrome.toml\" -t \"\${pkgdir}/var/lib/${EXECUTABLE_NAME}\"
+  install -Dm 644 \"\${srcdir}/navidrome.toml\" -t \"\${pkgdir}/etc/${EXECUTABLE_NAME}\"
 }
 " >> PKGBUILD