summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD20
-rw-r--r--signal-web-gateway.install10
-rw-r--r--signal-web-gateway.service6
-rw-r--r--signal-web-gateway.sysusers1
-rw-r--r--signal-web-gateway.tmpfiles1
6 files changed, 26 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 16f452f75852..2b7242ca77af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
pkgbase = signal-web-gateway-git
pkgdesc = Use Signal as a web gateway for other apps (reporting, monitoring, etc.)
pkgver = 0.1
- pkgrel = 5
+ pkgrel = 6
url = https://gitlab.com/morph027/signal-web-gateway
- install = signal-web-gateway.install
arch = x86_64
license = MIT
makedepends = go
@@ -13,8 +12,12 @@ pkgbase = signal-web-gateway-git
backup = etc/webapps/signal-web-gateway/config.yml
source = git+https://github.com/morph027/textsecure.git
source = signal-web-gateway.service
+ source = signal-web-gateway.tmpfiles
+ source = signal-web-gateway.sysusers
sha512sums = SKIP
- sha512sums = aa0c5e8eae19bc8da8374827de993b5dace5e9d84a02a51f01903a99a55816eab448905e8d8b552f28b2cfd8e0f2e263839b0b12b58df477c3910d6f73d961a8
+ sha512sums = 55d05974f9e07f8849d7ea0b68ea1bd408c1e247801ff1236bbf0183ead0a1133bd5be1613d0e6ca64010525402c7ec2957274d8fd88a3c12c4389c77d76e5fa
+ sha512sums = 139dc026505c124520c922fbe975c19052dee82fbe5195ac2c1016d09a1e78ff9aae0b62173a0238d2d1a734a25237cec048fd2210435401ec97ffa4010c4dc8
+ sha512sums = ac42a4350a6c3e5f77189f41a906ce2b0144d8e6bee930b1897db0e50968b38986b9e937e009160a40e8568bffddf8ad6e67bddf0d69aa19f63831b04e23826d
pkgname = signal-web-gateway-git
diff --git a/PKGBUILD b/PKGBUILD
index f6f2f70119d7..1c36004d6ead 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,20 @@
pkgname=signal-web-gateway-git
pkgver=0.1
-pkgrel=5
+pkgrel=6
pkgdesc="Use Signal as a web gateway for other apps (reporting, monitoring, etc.)"
arch=('x86_64')
url="https://gitlab.com/morph027/signal-web-gateway"
license=('MIT')
makedepends=('go' 'mercurial')
source=('git+https://github.com/morph027/textsecure.git'
- 'signal-web-gateway.service')
+ 'signal-web-gateway.service'
+ 'signal-web-gateway.tmpfiles'
+ 'signal-web-gateway.sysusers')
sha512sums=('SKIP'
- 'aa0c5e8eae19bc8da8374827de993b5dace5e9d84a02a51f01903a99a55816eab448905e8d8b552f28b2cfd8e0f2e263839b0b12b58df477c3910d6f73d961a8')
-install="signal-web-gateway.install"
+ '55d05974f9e07f8849d7ea0b68ea1bd408c1e247801ff1236bbf0183ead0a1133bd5be1613d0e6ca64010525402c7ec2957274d8fd88a3c12c4389c77d76e5fa'
+ '139dc026505c124520c922fbe975c19052dee82fbe5195ac2c1016d09a1e78ff9aae0b62173a0238d2d1a734a25237cec048fd2210435401ec97ffa4010c4dc8'
+ 'ac42a4350a6c3e5f77189f41a906ce2b0144d8e6bee930b1897db0e50968b38986b9e937e009160a40e8568bffddf8ad6e67bddf0d69aa19f63831b04e23826d')
conflicts=("signal-web-gateway")
provides=("signal-web-gateway")
backup=("etc/webapps/signal-web-gateway/config.yml")
@@ -27,8 +30,7 @@ backup=("etc/webapps/signal-web-gateway/config.yml")
prepare() {
export GOPATH="${srcdir}"
mkdir -p "${srcdir}/src/github.com/morph027"
- rm -r "${srcdir}/src/github.com/morph027/textsecure"
- mv "${srcdir}/textsecure" "${srcdir}/src/github.com/morph027/textsecure"
+ cp -r "${srcdir}/textsecure" "${srcdir}/src/github.com/morph027/textsecure"
cd "${srcdir}/src/github.com/morph027/textsecure"
go get -v
go get -v github.com/sirupsen/logrus
@@ -41,8 +43,10 @@ build() {
}
package() {
- install -Dm755 "${srcdir}/src/github.com/morph027/textsecure/cmd/textsecure/textsecure" "${pkgdir}/usr/bin/signal-web-gateway"
- install -Dm644 "${srcdir}/signal-web-gateway.service" "${pkgdir}/usr/lib/systemd/system/signal-web-gateway.service"
+ install -Dm 755 "${srcdir}/src/github.com/morph027/textsecure/cmd/textsecure/textsecure" "${pkgdir}/usr/bin/signal-web-gateway"
+ install -Dm 644 "${srcdir}/signal-web-gateway.service" "${pkgdir}/usr/lib/systemd/system/signal-web-gateway.service"
+ install -Dm 644 "${srcdir}/signal-web-gateway.sysusers" "${pkgdir}/usr/lib/sysusers.d/signal-web-gateway.conf"
+ install -Dm 644 "${srcdir}/signal-web-gateway.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/signal-web-gateway.conf"
install -D "${srcdir}/src/github.com/morph027/textsecure/COPYING" "${pkgdir}/usr/share/licenses/signal-web-gateway/LICENSE"
mkdir -p "${pkgdir}/var/lib/signal-web-gateway"
cp -r "${srcdir}/src/github.com/morph027/textsecure/cmd/textsecure/.config" "${pkgdir}/var/lib/signal-web-gateway/.config"
diff --git a/signal-web-gateway.install b/signal-web-gateway.install
deleted file mode 100644
index 7a16cac08e94..000000000000
--- a/signal-web-gateway.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
- getent passwd signal > /dev/null || useradd -d /var/lib/signal-web-gateway signal > /dev/null
- getent group signal > /dev/null || groupadd -r signal > /dev/null
- chown -R signal:signal /var/lib/signal-web-gateway
-}
-
-post_remove() {
- userdel -rf signal
- groupdel signal
-}
diff --git a/signal-web-gateway.service b/signal-web-gateway.service
index ec7c8e9934c5..4646766e2194 100644
--- a/signal-web-gateway.service
+++ b/signal-web-gateway.service
@@ -9,7 +9,13 @@ Group=signal
RuntimeDirectory=signal-web-gateway
WorkingDirectory=/var/lib/signal-web-gateway/
ExecStart=/usr/bin/signal-web-gateway -gateway
+LimitNOFILE=1048576
+LimitNPROC=64
PrivateTmp=true
+PrivateDevices=true
+ProtectHome=true
+ProtectSystem=strict
+ReadWritePaths=/var/lib/signal-web-gateway
[Install]
WantedBy=multi-user.target
diff --git a/signal-web-gateway.sysusers b/signal-web-gateway.sysusers
new file mode 100644
index 000000000000..e2e2ce343351
--- /dev/null
+++ b/signal-web-gateway.sysusers
@@ -0,0 +1 @@
+u signal - "Signal Web Gateway" / /sbin/nologin
diff --git a/signal-web-gateway.tmpfiles b/signal-web-gateway.tmpfiles
new file mode 100644
index 000000000000..a636f0917ef3
--- /dev/null
+++ b/signal-web-gateway.tmpfiles
@@ -0,0 +1 @@
+d /var/lib/signal-web-gateway 0750 signal signal -