Update to 0.2.3

5 files changed, 18 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index baa650cf402d..af8a06c03340 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wiretrustee
 	pkgdesc = Connect your devices into a single secure private WireGuard®-based mesh network
-	pkgver = 0.0.8
-	pkgrel = 2
+	pkgver = 0.2.3
+	pkgrel = 1
 	url = https://wiretrustee.com
 	arch = x86_64
 	arch = aarch64
@@ -13,15 +13,11 @@ pkgbase = wiretrustee
 	depends = glibc
 	provides = wiretrustee
 	conflicts = wiretrustee
-	source = wiretrustee-0.0.8.tar.gz::https://github.com/wiretrustee/wiretrustee/archive/refs/tags/v0.0.8-hotfix-1.tar.gz
-	source = config_readme
+	source = wiretrustee-0.2.3.tar.gz::https://github.com/wiretrustee/wiretrustee/archive/refs/tags/v0.2.3.tar.gz
 	source = environment
 	source = wiretrustee@.service
-	source = wiretrustee-signal.service
-	sha256sums = b2014190dc883e1e6a866ccd16a594552ae0e8bd65a64dd7daae015d1a7266a6
-	sha256sums = e6e2bb1687510b9381202d95beb27b1bfbe30033f4f038e4bdde61e7a3f65f22
-	sha256sums = c72c3f27ee2f2fbb232108781e38f41d7f04272d11a42f59938541ac591bd393
+	sha256sums = cbe816f7d5f5188db46a26134644a5b57e13f2e7c3e92f0ec5e002d658f50e97
+	sha256sums = 185d92f240e92c8d58dde91bb45d73d09ea22fc48090f30330596f12e6d265e7
 	sha256sums = 672235231a73743878d77e94827c5aba326464dae63457f94cd51708ac84ba58
-	sha256sums = 79cae90dff3bb3177762b9d3a9c69e69ef79ced3dc3a85529ff5050bf17bcd85
 
 pkgname = wiretrustee
diff --git a/PKGBUILD b/PKGBUILD
index 3855f50cdbb8..b33b83348c4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: tarball <bootctl@gmail.com>
 
 pkgname=wiretrustee
-pkgver=0.0.8
-pkgrel=2
+pkgver=0.2.3
+pkgrel=1
 pkgdesc='Connect your devices into a single secure private WireGuard®-based mesh network'
 url='https://wiretrustee.com'
 arch=(x86_64 aarch64 armv7h armv7l armv6h)
@@ -15,22 +15,18 @@ makedepends=(go)
 optdepends=()
 
 source=(
-  "$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/refs/tags/v$pkgver-hotfix-1.tar.gz"
-  'config_readme'
+  "$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/refs/tags/v$pkgver.tar.gz"
   'environment'
   'wiretrustee@.service'
-  'wiretrustee-signal.service'
 )
 sha256sums=(
-  'b2014190dc883e1e6a866ccd16a594552ae0e8bd65a64dd7daae015d1a7266a6'
-  'e6e2bb1687510b9381202d95beb27b1bfbe30033f4f038e4bdde61e7a3f65f22'
-  'c72c3f27ee2f2fbb232108781e38f41d7f04272d11a42f59938541ac591bd393'
+  'cbe816f7d5f5188db46a26134644a5b57e13f2e7c3e92f0ec5e002d658f50e97'
+  '185d92f240e92c8d58dde91bb45d73d09ea22fc48090f30330596f12e6d265e7'
   '672235231a73743878d77e94827c5aba326464dae63457f94cd51708ac84ba58'
-  '79cae90dff3bb3177762b9d3a9c69e69ef79ced3dc3a85529ff5050bf17bcd85'
 )
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver-hotfix-1"
+  cd "$srcdir/$pkgname-$pkgver"
   mkdir -p build
 
   go mod download
@@ -38,32 +34,29 @@ prepare() {
 
 build() {
   export GOFLAGS='-buildmode=pie -trimpath -mod=readonly -modcacherw'
-  cd "$srcdir/$pkgname-$pkgver-hotfix-1"
+  cd "$srcdir/$pkgname-$pkgver"
 
   go build \
     -ldflags "-s -w -linkmode=external -extldflags \"$LDFLAGS\"" \
-    -o build/ \
-    .
+    -o build/"$pkgname" \
+    client/main.go
 }
 
 package() {
-  _source="$srcdir/$pkgname-$pkgver-hotfix-1"
+  _source="$srcdir/$pkgname-$pkgver"
 
   # binary
   install -Dm755 "$_source/build/$pkgname" "$pkgdir/usr/bin/$pkgname"
 
   # config directory
   install -Ddm755 -o root -g root "$pkgdir/etc/$pkgname"
-  install -Dm644 "config_readme" "$pkgdir/etc/$pkgname/README"
 
   # environment file
   install -Dm644 environment "$pkgdir/etc/default/$pkgname"
 
-  # systemd units
-  for kind in @ -signal; do
-    install -Dm644 "$pkgname$kind.service" \
-      "$pkgdir/usr/lib/systemd/system/$pkgname$kind.service"
-  done
+  # systemd unit
+  install -Dm644 "$pkgname@.service" \
+    "$pkgdir/usr/lib/systemd/system/$pkgname@.service"
 
   # license
   install -Dm644 "$_source/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/config_readme b/config_readme
deleted file mode 100644
index b494dc9a0a31..000000000000
--- a/config_readme
+++ /dev/null
@@ -1,16 +0,0 @@
-Configure your Wiretrustee instance by running:
-
-# wiretrustee init \
-  --config /etc/wiretrustee/main.json \
-  --stunURLs stun:stun.wiretrustee.com:3468,stun:stun.l.google.com:19302 \
-  --turnURLs <TURN User>:<TURN password>@turn:stun.wiretrustee.com:3468  \
-  --signalAddr signal.wiretrustee.com:10000  \
-  --wgLocalAddr 10.30.30.1/24  \
-  --log-level info
-
-Then enable and start the service:
-
-# systemctl enable --now wiretrustee@main
-
-Read more at https://github.com/wiretrustee/wiretrustee
-
diff --git a/environment b/environment
index ea6f1dd95a32..e448e9c50970 100644
--- a/environment
+++ b/environment
@@ -5,6 +5,3 @@ WIRETRUSTEE_ARGS="--log-level info"
 # additional options to pass to wiretrustee clients
 WIRETRUSTEE_CLIENT_ARGS="${WIRETRUSTEE_ARGS}"
 
-# additional options to pass to wiretrustee signal service
-WIRETRUSTEE_SIGNAL_ARGS="${WIRETRUSTEE_ARGS} --port 10000"
-
diff --git a/wiretrustee-signal.service b/wiretrustee-signal.service
deleted file mode 100644
index 4bf2cce98951..000000000000
--- a/wiretrustee-signal.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description = Wiretrustee Signal Service
-Documentation = https://github.com/wiretrustee/wiretrustee#readme
-After = multi-user.target network-online.target
-Wants = network-online.target
-
-[Service]
-Type = simple
-EnvironmentFile = -/etc/default/wiretrustee
-ExecStart = /usr/bin/wiretrustee signal $WIRETRUSTEE_SIGNAL_ARGS
-Restart = on-failure
-RestartSec = 5
-TimeoutStopSec = 5
-
-[Install]
-WantedBy = multi-user.target
-