add generic isda worker service

5 files changed, 29 insertions, 42 deletions

diff --git a/isdad-git/PKGBUILD b/isdad-git/PKGBUILD
index d4728c5..72400e1 100644
--- a/isdad-git/PKGBUILD
+++ b/isdad-git/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=isdad-git
-pkgver=r20.6640da7
-pkgrel=3
-pkgdesc="Generic task queue server with scripts for downloading"
+pkgver=r38.edccef5
+pkgrel=1
+pkgdesc="Task queue server for isda"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 url="https://codeberg.org/metamuffin/isda"
 license=('AGPL3')
diff --git a/isdaw-git/PKGBUILD b/isdaw-git/PKGBUILD
index da497aa..1dd0c5f 100644
--- a/isdaw-git/PKGBUILD
+++ b/isdaw-git/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: metamuffin <metamuffin@disroot.org>
 
 pkgname=isdaw-git
-pkgver=r20.6640da7
-pkgrel=1
-pkgdesc="Generic task queue server with scripts for downloading"
+pkgver=r38.edccef5
+pkgrel=4
+pkgdesc="Worker scripts for isda"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 url="https://codeberg.org/metamuffin/isda"
 license=('AGPL3')
@@ -11,8 +11,12 @@ conflics=('isdaw')
 provides=('isdaw')
 depends=('deno')
 optdepends=('yt-dlp: for downloading from yt-dlp supported source')
-source=("git+https://codeberg.org/metamuffin/isda.git")
-sha256sums=("SKIP")
+source=("git+https://codeberg.org/metamuffin/isda.git"
+        "isdaw@.service"
+        "sysusers.conf")
+sha256sums=("SKIP"
+            "SKIP"
+            "SKIP")
 
 pkgver() {
     cd "isda"
@@ -20,7 +24,9 @@ pkgver() {
 }
 package() {
     for name in `ls isda/scripts`; do
-        install -Dm755 "isda/scripts/$name" "$pkgdir/usr/lib/isdaw/$name"
+        install -Dm644 "isda/scripts/$name" "$pkgdir/usr/lib/isdaw/$name"
     done
+    install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/isdaw.conf"
+    install -Dm644 isdaw@.service "$pkgdir/usr/lib/systemd/system/isdaw@.service"
     install -Dm644 isda/COPYING "$pkgdir/usr/share/licenses/isdaw/COPYING"
 }
diff --git a/isdaw-git/isdad.service b/isdaw-git/isdad.service
deleted file mode 100644
index 42ac404..0000000
--- a/isdaw-git/isdad.service
+++ /dev/null
@@ -1,32 +0,0 @@
-[Unit]
-Description=industrial-scale downloading agent daemon process
-After=network.target
-Wants=network-online.target
-
-[Service]
-ExecStart=/usr/bin/isdad /etc/isdad-worker-conf.yaml
-User=isda
-LockPersonality=yes
-MemoryDenyWriteExecute=yes
-NoNewPrivileges=yes
-PrivateDevices=true
-PrivateTmp=true
-ProtectClock=yes
-ProtectControlGroups=yes
-ProtectHome=true
-ProtectHostname=yes
-ProtectKernelLogs=yes
-ProtectKernelModules=yes
-ProtectKernelTunables=yes
-ProtectSystem=full
-RestrictAddressFamilies=~AF_PACKET AF_NETLINK
-RestrictNamespaces=yes
-RestrictSUIDSGID=yes
-RestrictRealtime=yes
-Restart=always
-SystemCallArchitectures=native
-SystemCallFilter=@system-service
-Type=simple
-
-[Install]
-WantedBy=multi-user.target
diff --git a/isdaw-git/isdaw@.service b/isdaw-git/isdaw@.service
new file mode 100644
index 0000000..c087642
--- /dev/null
+++ b/isdaw-git/isdaw@.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Generic isda worker service for typescript
+After=network.target
+Wants=network-online.target
+
+[Service]
+Type=simple
+User=isdaw
+ExecStart=deno run -A /usr/lib/isdaw/%i.ts $WORKERWS
+Environment=WORKERWS=ws://127.0.0.1:44794/worker_ws
+
+[Install]
+WantedBy=multi-user.target
diff --git a/isdaw-git/sysusers.conf b/isdaw-git/sysusers.conf
index dd9f78b..9f33766 100644
--- a/isdaw-git/sysusers.conf
+++ b/isdaw-git/sysusers.conf
@@ -1 +1 @@
-u isda - "industrial-scale downloading agent" - -
+u isdaw - "industrial-scale downloading workers" - -