From 5b3679958264327da2875ca2d0fd44f321cf9e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Mon, 11 Apr 2022 20:00:41 +0200
Subject: Replace systemd service with working, remove PKGBUILD.

---
 system/Makefile                  |  4 ++++
 system/PKGBUILD                  | 31 -------------------------------
 system/calp.service              |  7 -------
 system/systemd/user/calp.service | 12 ++++++++++++
 4 files changed, 16 insertions(+), 38 deletions(-)
 create mode 100644 system/Makefile
 delete mode 100644 system/PKGBUILD
 delete mode 100644 system/calp.service
 create mode 100644 system/systemd/user/calp.service

(limited to 'system')

diff --git a/system/Makefile b/system/Makefile
new file mode 100644
index 00000000..8c9e43ce
--- /dev/null
+++ b/system/Makefile
@@ -0,0 +1,4 @@
+.PHONY: install
+
+install:
+	install -m644 -D systemd/user/calp.service $(DESTDIR)/usr/lib/systemd/user/calp.service
diff --git a/system/PKGBUILD b/system/PKGBUILD
deleted file mode 100644
index adcf79b3..00000000
--- a/system/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-pkgname=calp
-pkgver=0.6.1
-pkgrel=1
-pkgdesc='Calendar program'
-arch=('any')
-url=https://git.hornquist.se/git/calp
-license=('AGPL')
-depends=('guile>=2.2')
-makedepends=('ruby-sass')
-optdepends=('vdirsyncer: Download calendar files')
-source=(
-	calp.service
-	config.scm
-	"https://github.com/HugoNikanor/$pkgname/archive/v$pkgver.tar.gz"
-)
-md5sums=('SKIP' 'SKIP' 'SKIP')
-
-build() {
-	make -C $pkgname-$pkgver
-}
-
-# check() {
-# 	make test
-# }
-
-package() {
-	make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
-	install -m 644 -D -t $pkgdir/usr/lib/systemd/system/ calp.service
-	install -m 644 -D -t $pkgdir/etc/calp/ config.scm
-}
-
diff --git a/system/calp.service b/system/calp.service
deleted file mode 100644
index 42777d96..00000000
--- a/system/calp.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Calendar server
-
-[Service]
-User=calp
-ExecStart=calp --config /etc/calp/config.scm -- server
-Restart=always
diff --git a/system/systemd/user/calp.service b/system/systemd/user/calp.service
new file mode 100644
index 00000000..2dcb1518
--- /dev/null
+++ b/system/systemd/user/calp.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Calendar server
+Documentation=info:calp
+Documentation=file:/usr/share/doc/calp/README
+
+[Service]
+Environment=SYSTEMD=true
+ExecStart=calp --config %E/calp/config.scm --repl %t/calp-production server --sigusr
+Restart=always
+
+[Install]
+WantedBy=default.target
-- 
cgit v1.2.3