diff options
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | PKGBUILD | 27 | ||||
-rw-r--r-- | config_readme | 16 | ||||
-rw-r--r-- | environment | 3 | ||||
-rw-r--r-- | wiretrustee-signal.service | 17 |
5 files changed, 19 insertions, 66 deletions
@@ -1,7 +1,7 @@ pkgbase = wiretrustee-bin 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 @@ -9,19 +9,15 @@ pkgbase = wiretrustee-bin license = BSD provides = wiretrustee conflicts = wiretrustee - source = config_readme source = environment source = wiretrustee@.service - source = wiretrustee-signal.service - sha256sums = e6e2bb1687510b9381202d95beb27b1bfbe30033f4f038e4bdde61e7a3f65f22 - sha256sums = c72c3f27ee2f2fbb232108781e38f41d7f04272d11a42f59938541ac591bd393 + sha256sums = 185d92f240e92c8d58dde91bb45d73d09ea22fc48090f30330596f12e6d265e7 sha256sums = 672235231a73743878d77e94827c5aba326464dae63457f94cd51708ac84ba58 - sha256sums = 79cae90dff3bb3177762b9d3a9c69e69ef79ced3dc3a85529ff5050bf17bcd85 - source_x86_64 = wiretrustee-bin-0.0.8.tar.gz::https://github.com/wiretrustee/wiretrustee/releases/download/v0.0.8-hotfix-1/wiretrustee_0.0.8-hotfix-1_linux_amd64.tar.gz - sha256sums_x86_64 = 8f5a764108d6730ce357b17eff14ddd9a3357fb36f071dd110ff59cc330616ce - source_aarch64 = wiretrustee-bin-0.0.8.tar.gz::https://github.com/wiretrustee/wiretrustee/releases/download/v0.0.8-hotfix-1/wiretrustee_0.0.8-hotfix-1_linux_arm64.tar.gz - sha256sums_aarch64 = d70e5180a82f56f22580231e973c16d4a408ddf4aa161f0c556295966dc7ab2b - source_armv6h = wiretrustee-bin-0.0.8.tar.gz::https://github.com/wiretrustee/wiretrustee/releases/download/v0.0.8-hotfix-1/wiretrustee_0.0.8-hotfix-1_linux_armv6.tar.gz - sha256sums_armv6h = 5f7784a3bb1f51344aa221fb619989a4f7e0ecd072e1e9973438895e8f9dfb95 + source_x86_64 = wiretrustee-bin-0.2.3.tar.gz::https://github.com/wiretrustee/wiretrustee/releases/download/v0.2.3/wiretrustee_0.2.3_linux_amd64.tar.gz + sha256sums_x86_64 = d0a49fdf2939e590f73ff371ce54007533747b8b49180efb06f0abafce7c13eb + source_aarch64 = wiretrustee-bin-0.2.3.tar.gz::https://github.com/wiretrustee/wiretrustee/releases/download/v0.2.3/wiretrustee_0.2.3_linux_arm64.tar.gz + sha256sums_aarch64 = 75edde0df04b35f7a039636dd7e005e4bfb89bf06fc7c278e4b34bfd24fad36c + source_armv6h = wiretrustee-bin-0.2.3.tar.gz::https://github.com/wiretrustee/wiretrustee/releases/download/v0.2.3/wiretrustee_0.2.3_linux_armv6.tar.gz + sha256sums_armv6h = 3c9f8b51f9301c24433c9dad5bf9d6ff9a9a656251e1019bacd4cee655405dcc pkgname = wiretrustee-bin @@ -2,8 +2,8 @@ pkgname='wiretrustee-bin' _pkgname="${pkgname%-bin}" -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 armv6h) @@ -16,28 +16,24 @@ makedepends=() optdepends=() source=( - 'config_readme' 'environment' 'wiretrustee@.service' - 'wiretrustee-signal.service' ) sha256sums=( - 'e6e2bb1687510b9381202d95beb27b1bfbe30033f4f038e4bdde61e7a3f65f22' - 'c72c3f27ee2f2fbb232108781e38f41d7f04272d11a42f59938541ac591bd393' + '185d92f240e92c8d58dde91bb45d73d09ea22fc48090f30330596f12e6d265e7' '672235231a73743878d77e94827c5aba326464dae63457f94cd51708ac84ba58' - '79cae90dff3bb3177762b9d3a9c69e69ef79ced3dc3a85529ff5050bf17bcd85' ) -_base_url="https://github.com/${_pkgname}/${_pkgname}/releases/download/v${pkgver}-hotfix-1/${_pkgname}_${pkgver}-hotfix-1_linux" +_base_url="https://github.com/${_pkgname}/${_pkgname}/releases/download/v${pkgver}/${_pkgname}_${pkgver}_linux" source_x86_64=("${pkgname}-${pkgver}.tar.gz::${_base_url}_amd64.tar.gz") -sha256sums_x86_64=('8f5a764108d6730ce357b17eff14ddd9a3357fb36f071dd110ff59cc330616ce') +sha256sums_x86_64=('d0a49fdf2939e590f73ff371ce54007533747b8b49180efb06f0abafce7c13eb') source_aarch64=("${pkgname}-${pkgver}.tar.gz::${_base_url}_arm64.tar.gz") -sha256sums_aarch64=('d70e5180a82f56f22580231e973c16d4a408ddf4aa161f0c556295966dc7ab2b') +sha256sums_aarch64=('75edde0df04b35f7a039636dd7e005e4bfb89bf06fc7c278e4b34bfd24fad36c') source_armv6h=("${pkgname}-${pkgver}.tar.gz::${_base_url}_armv6.tar.gz") -sha256sums_armv6h=('5f7784a3bb1f51344aa221fb619989a4f7e0ecd072e1e9973438895e8f9dfb95') +sha256sums_armv6h=('3c9f8b51f9301c24433c9dad5bf9d6ff9a9a656251e1019bacd4cee655405dcc') package() { # binary @@ -45,16 +41,13 @@ package() { # 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 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 - |