diff options
| author | Devaev Maxim | 2019-07-19 16:26:39 +0300 |
|---|---|---|
| committer | Devaev Maxim | 2019-07-19 16:26:39 +0300 |
| commit | b44f1baa9113873497d245b60573b8e4048418c3 (patch) | |
| tree | 092d1d203256da7b0020b8b3d712223a064b9d4c | |
| parent | 2037d74a38b8250c20d52bb211a1529394597cd5 (diff) | |
| download | aur-b44f1baa9113873497d245b60573b8e4048418c3.tar.gz | |
Update to 0.24-1
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | kvmd-webterm.install | 11 | ||||
| -rw-r--r-- | sysusers.conf | 6 |
4 files changed, 19 insertions, 12 deletions
@@ -1,6 +1,6 @@ pkgbase = kvmd-webterm pkgdesc = Pi-KVM - Web terminal - pkgver = 0.23 + pkgver = 0.24 pkgrel = 1 url = https://github.com/pi-kvm/kvmd-webterm install = kvmd-webterm.install @@ -10,6 +10,7 @@ pkgbase = kvmd-webterm depends = ttyd source = kvmd-webterm.install source = kvmd-webterm.service + source = sysusers.conf source = https://raw.githubusercontent.com/tsl0922/ttyd/master/src/index.html source = index.sed source = terminal.svg @@ -24,6 +25,7 @@ pkgbase = kvmd-webterm md5sums = SKIP md5sums = SKIP md5sums = SKIP + md5sums = SKIP pkgname = kvmd-webterm @@ -3,7 +3,7 @@ pkgname=kvmd-webterm -pkgver=0.23 +pkgver=0.24 pkgrel=1 pkgdesc="Pi-KVM - Web terminal" url="https://github.com/pi-kvm/kvmd-webterm" @@ -14,6 +14,7 @@ install=$pkgname.install source=( $pkgname.install $pkgname.service + sysusers.conf https://raw.githubusercontent.com/tsl0922/ttyd/master/src/index.html index.sed terminal.svg @@ -21,12 +22,15 @@ source=( nginx.ctx-server.conf manifest.yaml ) -md5sums=(SKIP SKIP SKIP SKIP SKIP SKIP SKIP SKIP) +md5sums=(SKIP SKIP SKIP SKIP SKIP SKIP SKIP SKIP SKIP) package() { mkdir -p "$pkgdir/usr/lib/systemd/system" - install -Dm644 kvmd-webterm.service "$pkgdir/usr/lib/systemd/system/kvmd-webterm.service" + cp kvmd-webterm.service "$pkgdir/usr/lib/systemd/system/kvmd-webterm.service" + + mkdir -p "$pkgdir/usr/lib/sysusers.d" + cp sysusers.conf "$pkgdir/usr/lib/sysusers.d/kvmd-webterm.conf" mkdir -p "$pkgdir/usr/share/kvmd/web/extras/webterm" cp terminal.svg "$pkgdir/usr/share/kvmd/web/extras/webterm" diff --git a/kvmd-webterm.install b/kvmd-webterm.install index c5ac9995f508..20c0ade8a36a 100644 --- a/kvmd-webterm.install +++ b/kvmd-webterm.install @@ -1,13 +1,8 @@ post_install() { - id kvmd-webterm &>/dev/null || useradd -r -m -c "Pi-KVM - Web terminal (ttyd)" -s /bin/bash kvmd-webterm - (groupmems -l -g kvmd | grep kvmd-webterm >/dev/null) || groupmems -g kvmd -a kvmd-webterm - (groupmems -l -g kvmd-webterm | grep kvmd-nginx >/dev/null) || groupmems -g kvmd-webterm -a kvmd-nginx + post_upgrade } post_upgrade() { - post_install -} - -post_remove() { - userdel -r kvmd-webterm &>/dev/null + echo "==> Ensuring KVMD-Webterm users and groups ..." + systemd-sysusers /usr/lib/sysusers.d/kvmd-webterm.conf } diff --git a/sysusers.conf b/sysusers.conf new file mode 100644 index 000000000000..b4b8888b5b7f --- /dev/null +++ b/sysusers.conf @@ -0,0 +1,6 @@ +g kvmd-webterm - - + +u kvmd-webterm - "Pi-KVM - Web terminal" /home/kvmd-webterm /bin/bash + +m kvmd-webterm kvmd +m kvmd-nginx kvmd-webterm |