ddns-go: 6.3.2-2

5 files changed, 26 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0906ff0747d7..e70102a7f029 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ddns-go
-	pkgdesc = A simple, easy-to-use ddns service | 简单好用的DDNS
+	pkgdesc = A simple, easy-to-use ddns service
 	pkgver = 6.3.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/jeessy2/ddns-go
 	install = ddns-go.install
 	arch = i686
@@ -22,12 +22,14 @@ pkgbase = ddns-go
 	source = ddns-go::git+https://github.com/jeessy2/ddns-go.git#tag=v6.3.2
 	source = ddns-go.env
 	source = ddns-go.service
-	source = ddns-go.sysusers
 	source = ddns-go.user.service
+	source = ddns-go.sysusers
+	source = ddns-go.tmpfiles
 	sha256sums = a737c175ce2466e11edd7091d39a3092332ea2d6eac0b113823a9c66e8a21c3d
 	sha256sums = adc5116f5b965e642a826dd2ac5680a112b85b89963658dae18242cffb9224dc
 	sha256sums = f1d7ee4f2ef6c13270ff7e3b9f17a35c5faba76e7601a81cc0ac75da9e27f724
+	sha256sums = 9f7130bfaf2e1cd48803ca1fe18708c425e2336ad7d90051d121ca1948d6e6f1
 	sha256sums = 558a170cae11f423591c5487dfe5f5e72f4aa88aaf62055f79a6656b6a98235a
-	sha256sums = e6f40c329735dca3d1bd4597ffe0545c81db814499f4363a2df033f4e41a371d
+	sha256sums = 757ef7494cdb32dd2f8eb086862f48ebe25bac180658b2c4ad18920e07ed2a71
 
 pkgname = ddns-go
diff --git a/PKGBUILD b/PKGBUILD
index d5b7ba968ca6..64e486d85705 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname="ddns-go"
 pkgver=6.3.2
-pkgrel=1
-pkgdesc="A simple, easy-to-use ddns service | 简单好用的DDNS"
+pkgrel=2
+pkgdesc="A simple, easy-to-use ddns service"
 license=('MIT')
 arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv7h' 'armv6h' 'aarch64' 'riscv64')
 url="https://github.com/jeessy2/${pkgname}"
@@ -16,13 +16,15 @@ makedepends=("git" "go")
 source=("${pkgname}::git+${url}.git#tag=v${pkgver}"
         "${pkgname}.env"
         "${pkgname}.service"
+        "${pkgname}.user.service"
         "${pkgname}.sysusers"
-        "${pkgname}.user.service")
+        "${pkgname}.tmpfiles")
 sha256sums=('a737c175ce2466e11edd7091d39a3092332ea2d6eac0b113823a9c66e8a21c3d'
             'adc5116f5b965e642a826dd2ac5680a112b85b89963658dae18242cffb9224dc'
             'f1d7ee4f2ef6c13270ff7e3b9f17a35c5faba76e7601a81cc0ac75da9e27f724'
+            '9f7130bfaf2e1cd48803ca1fe18708c425e2336ad7d90051d121ca1948d6e6f1'
             '558a170cae11f423591c5487dfe5f5e72f4aa88aaf62055f79a6656b6a98235a'
-            'e6f40c329735dca3d1bd4597ffe0545c81db814499f4363a2df033f4e41a371d')
+            '757ef7494cdb32dd2f8eb086862f48ebe25bac180658b2c4ad18920e07ed2a71')
 
 build() {
     cd "${pkgname}"
@@ -46,12 +48,12 @@ build() {
 }
 
 package() {
-    install -Dm755 "${pkgname}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" 
-    install -Dm644 "${pkgname}/README.md" "${pkgdir}/usr/share/doc/${pkgname}/README.md"
-    install -Dm644 "${pkgname}.env" "${pkgdir}/etc/${pkgname}/${pkgname}.env"
-    install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+    install -Dm755 "${pkgname}/${pkgname}"   "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm644 "${pkgname}/LICENSE"      "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm644 "${pkgname}/README.md"    "${pkgdir}/usr/share/doc/${pkgname}/README.md"
+    install -Dm644 "${pkgname}.env"          "${pkgdir}/etc/${pkgname}/${pkgname}.env"
+    install -Dm644 "${pkgname}.service"      "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
     install -Dm644 "${pkgname}.user.service" "${pkgdir}/usr/lib/systemd/user/${pkgname}.service"
-    install -Dm644 "${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
-    touch "${pkgdir}/etc/${pkgname}/config.yml"
+    install -Dm644 "${pkgname}.sysusers"     "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+    install -Dm644 "${pkgname}.tmpfiles"     "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
 }
diff --git a/ddns-go.install b/ddns-go.install
index 7d49cb331017..245598167ac5 100644
--- a/ddns-go.install
+++ b/ddns-go.install
@@ -11,7 +11,6 @@ note() {
 }
 
 post_install() {
-    chown -R "ddns-go:ddns-go" "/etc/$_pkgname"
     if [[ $LANG == "zh_CN.UTF-8" ]]; then
         note "从 6.0.1-1 开始，不再以 root 权限运行 $_pkgname ...
           可以以普通用户启用 $_pkgname: 'systemctl enable --user --now $_pkgname.service'...
diff --git a/ddns-go.tmpfiles b/ddns-go.tmpfiles
new file mode 100644
index 000000000000..f64dad97a5e3
--- /dev/null
+++ b/ddns-go.tmpfiles
@@ -0,0 +1,4 @@
+f /etc/ddns-go/config.yml  0775 root ddns-go -
+z /etc/ddns-go             0775 root ddns-go -
+z /etc/ddns-go/config.yml  0664 root ddns-go -
+z /etc/ddns-go/ddns-go.env 0664 root ddns-go -
\ No newline at end of file
diff --git a/ddns-go.user.service b/ddns-go.user.service
index 065711198530..ebd70ec65fd9 100644
--- a/ddns-go.user.service
+++ b/ddns-go.user.service
@@ -4,8 +4,9 @@ Wants = network-online.target
 After = network-online.target
 
 [Service]
-ExecStart = /usr/bin/ddns-go -c .config/ddns-go/config.yml
-ExecStartPost = /usr/bin/mkdir -p .config/ddns-go
+EnvironmentFile = -%h/.config/ddns-go/ddns-go.env
+ExecStartPre = /usr/bin/mkdir -p %h/.config/ddns-go ; /usr/bin/touch %h/.config/ddns-go/config.yml
+ExecStart = /usr/bin/ddns-go -c %h/.config/ddns-go/config.yml $EXTRA_OPTS
 Restart = always
 RestartSec = 5