summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD14
-rw-r--r--cc.deb.PKGBUILD7
-rw-r--r--cc.dev.PKGBUILD7
-rw-r--r--skywire-ar.service14
-rw-r--r--skywire-dmsg.service14
-rw-r--r--skywire-dmsgd.service14
-rw-r--r--skywire-rf.service14
-rw-r--r--skywire-sd.service14
-rw-r--r--skywire-sn.service14
-rw-r--r--skywire-tpd.service14
11 files changed, 142 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7855a9f660fb..07accf41589e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = skywire-bin
pkgdesc = Skywire: Building a new Internet. Skycoin.com
pkgver = 1.3.18
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/skycoin/skywire
install = skywire.install
arch = i686
@@ -17,6 +17,9 @@ pkgbase = skywire-bin
arch = arm
arch = riscv64
license = license-free
+ optdepends = redis: required by address-resolver transport-discovery dmsg-discovery service-discovery
+ optdepends = postgresql: required by transport-discovery route-finder service-discovery
+ optdepends = jq: config generation for setup-node.service
provides = skywire
conflicts = skywire
backup = opt/skywire/{users.db,skywire.json,local}
@@ -27,6 +30,13 @@ pkgbase = skywire-bin
source = skywire.png
source = skywire.service
source = skywire-autoconfig.service
+ source = skywire-sn.service
+ source = skywire-ar.service
+ source = skywire-rf.service
+ source = skywire-tpd.service
+ source = skywire-dmsgd.service
+ source = skywire-dmsg.service
+ source = skywire-sd.service
source = https://raw.githubusercontent.com/skycoin/skywire/develop/dmsghttp-config.json
source = https://raw.githubusercontent.com/skycoin/skywire/develop/services-config.json
sha256sums = 9257dc9cf98b382049b500f646c0005950077cedb83abbb62984983e4dda0874
@@ -36,6 +46,13 @@ pkgbase = skywire-bin
sha256sums = a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495
sha256sums = bf2876b7c41b204452cca141600af39e5a4e17486e9f09e20069d8f4316e6063
sha256sums = 8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3
+ sha256sums = 104f74b445830871fe12f4a179a601d8ea98e731b818a61a2de5df0e51498422
+ sha256sums = 947c1751c4bdd79b74f3a691b9f5c1de55cc05802c9d5e4859385cb241a5a45b
+ sha256sums = f24132456c5bcf0b7acb4e70b477740b19cecb32dea5022967ae13921508badb
+ sha256sums = a2c457c8373c2c85df4110ec15080f802ba621ad53e69ad01b34a196bf08864b
+ sha256sums = 45ed6049df988f042c9a0352d33fef88fc9018398d09252aa4698948ce783c11
+ sha256sums = b3a9a422e146fa0583482dc83a0f4e9ae25995ea1cc4fdfebc14c80dc1c596a5
+ sha256sums = 763c5a4251e819b944cfefeafa56e3d2bdfdd2e7e1198fdf1d369f3143990b5a
sha256sums = d1bbd2b6d141cee8499fe2ae0c8429325d2d80ea895cce3db2db11f0629cc740
sha256sums = e3a1a975138e6778a1e3ea47e98da94088c7c2d945295cd4ccbd0c992d6346c6
source_x86_64 = https://github.com/skycoin/skywire/releases/download/v1.3.18/skywire-deployment-v1.3.18-linux-amd64.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index c26aa4c55343..36ca5dd319cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _pkgname=${pkgname/-bin/}
_githuborg=skycoin
pkgdesc="Skywire: Building a new Internet. Skycoin.com"
pkgver='1.3.18'
-pkgrel='2'
+pkgrel='3'
_rc=''
#_rc='-pr1'
_pkgver="${pkgver}${_rc}"
@@ -14,13 +14,16 @@ arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'arm
url="https://${_pkggopath}"
provides=( 'skywire' )
conflicts=( 'skywire' )
+optdepends=('redis: required by address-resolver transport-discovery dmsg-discovery service-discovery'
+'postgresql: required by transport-discovery route-finder service-discovery'
+'jq: config generation for setup-node.service')
license=('license-free')
install=skywire.install
backup=("opt/${_pkgname}/{users.db,skywire.json,local}")
_script=("skywire-autoconfig")
_desktop=("skywire.desktop" "skywirevpn.desktop")
_icon=("skywirevpn.png" "skywire.png")
-_service=("skywire.service" "skywire-autoconfig.service")
+_service=("skywire.service" "skywire-autoconfig.service" "skywire-sn.service" "skywire-ar.service" "skywire-rf.service" "skywire-tpd.service" "skywire-dmsgd.service" "skywire-dmsg.service" "skywire-sd.service")
_source=("${_script[@]}"
"${_desktop[@]}"
"${_icon[@]}"
@@ -38,6 +41,13 @@ sha256sums=('9257dc9cf98b382049b500f646c0005950077cedb83abbb62984983e4dda0874'
'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495'
'bf2876b7c41b204452cca141600af39e5a4e17486e9f09e20069d8f4316e6063'
'8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3'
+ '104f74b445830871fe12f4a179a601d8ea98e731b818a61a2de5df0e51498422'
+ '947c1751c4bdd79b74f3a691b9f5c1de55cc05802c9d5e4859385cb241a5a45b'
+ 'f24132456c5bcf0b7acb4e70b477740b19cecb32dea5022967ae13921508badb'
+ 'a2c457c8373c2c85df4110ec15080f802ba621ad53e69ad01b34a196bf08864b'
+ '45ed6049df988f042c9a0352d33fef88fc9018398d09252aa4698948ce783c11'
+ 'b3a9a422e146fa0583482dc83a0f4e9ae25995ea1cc4fdfebc14c80dc1c596a5'
+ '763c5a4251e819b944cfefeafa56e3d2bdfdd2e7e1198fdf1d369f3143990b5a'
'd1bbd2b6d141cee8499fe2ae0c8429325d2d80ea895cce3db2db11f0629cc740'
'e3a1a975138e6778a1e3ea47e98da94088c7c2d945295cd4ccbd0c992d6346c6')
sha256sums_x86_64=('6c0428fa382e2e15e20d621a5caffd82a7b6c1dbfd81128d8fe8c843de4c6621')
diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index 67f5038b28bc..0ef88420b3da 100644
--- a/cc.deb.PKGBUILD
+++ b/cc.deb.PKGBUILD
@@ -32,6 +32,13 @@ sha256sums=('9257dc9cf98b382049b500f646c0005950077cedb83abbb62984983e4dda0874'
'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495'
'bf2876b7c41b204452cca141600af39e5a4e17486e9f09e20069d8f4316e6063'
'8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3'
+ '104f74b445830871fe12f4a179a601d8ea98e731b818a61a2de5df0e51498422'
+ '947c1751c4bdd79b74f3a691b9f5c1de55cc05802c9d5e4859385cb241a5a45b'
+ 'f24132456c5bcf0b7acb4e70b477740b19cecb32dea5022967ae13921508badb'
+ 'a2c457c8373c2c85df4110ec15080f802ba621ad53e69ad01b34a196bf08864b'
+ '45ed6049df988f042c9a0352d33fef88fc9018398d09252aa4698948ce783c11'
+ 'b3a9a422e146fa0583482dc83a0f4e9ae25995ea1cc4fdfebc14c80dc1c596a5'
+ '763c5a4251e819b944cfefeafa56e3d2bdfdd2e7e1198fdf1d369f3143990b5a'
'd1bbd2b6d141cee8499fe2ae0c8429325d2d80ea895cce3db2db11f0629cc740'
'e3a1a975138e6778a1e3ea47e98da94088c7c2d945295cd4ccbd0c992d6346c6'
'fb9b9cca7d7a748ad2ebaedbad83a45e58aa9b9f818e73f7d99818f6277605c3'
diff --git a/cc.dev.PKGBUILD b/cc.dev.PKGBUILD
index 217ddb38697f..44791b841ddd 100644
--- a/cc.dev.PKGBUILD
+++ b/cc.dev.PKGBUILD
@@ -21,6 +21,13 @@ sha256sums=('SKIP'
'a6941680b5858ca3e0c85d9bf5824455a0c95524b61e42352462f2abbb750495'
'bf2876b7c41b204452cca141600af39e5a4e17486e9f09e20069d8f4316e6063'
'8519d027325dcb34877bb5b0fb0c3c035d7589c0046b53935e2b949d436c4be3'
+ '104f74b445830871fe12f4a179a601d8ea98e731b818a61a2de5df0e51498422'
+ '947c1751c4bdd79b74f3a691b9f5c1de55cc05802c9d5e4859385cb241a5a45b'
+ 'f24132456c5bcf0b7acb4e70b477740b19cecb32dea5022967ae13921508badb'
+ 'a2c457c8373c2c85df4110ec15080f802ba621ad53e69ad01b34a196bf08864b'
+ '45ed6049df988f042c9a0352d33fef88fc9018398d09252aa4698948ce783c11'
+ 'b3a9a422e146fa0583482dc83a0f4e9ae25995ea1cc4fdfebc14c80dc1c596a5'
+ '763c5a4251e819b944cfefeafa56e3d2bdfdd2e7e1198fdf1d369f3143990b5a'
'd1bbd2b6d141cee8499fe2ae0c8429325d2d80ea895cce3db2db11f0629cc740'
'e3a1a975138e6778a1e3ea47e98da94088c7c2d945295cd4ccbd0c992d6346c6')
diff --git a/skywire-ar.service b/skywire-ar.service
new file mode 100644
index 000000000000..2a981df8bf26
--- /dev/null
+++ b/skywire-ar.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Skywire address-resolver service
+Wants=network-online.target redis.service
+
+[Service]
+Type=simple
+ExecStartPre=/bin/bash -c '[[ ! -f /etc/skywire-ar.conf ]] && skywire cli config gen-keys | tee /etc/skywire-ar.conf || true'
+ExecStart=/bin/bash -c "skywire svc ar --sk $$(tail -n1 /etc/skywire-ar.conf)"
+Restart=always
+RestartSec=20
+TimeoutSec=30
+
+[Install]
+WantedBy=multi-user.target
diff --git a/skywire-dmsg.service b/skywire-dmsg.service
new file mode 100644
index 000000000000..3d911ccc1556
--- /dev/null
+++ b/skywire-dmsg.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Skywire dmsg server
+Wants=network-online.target
+
+[Service]
+Type=simple
+ExecStartPre=/bin/bash -c '[[ ! -f /etc/skywire-dmsg.json ]] && skywire dmsg server config gen -o /etc/skywire-dmsg.json || true'
+ExecStart=/bin/skywire dmsg server start /etc/skywire-dmsgd.conf
+Restart=always
+RestartSec=20
+TimeoutSec=30
+
+[Install]
+WantedBy=multi-user.target
diff --git a/skywire-dmsgd.service b/skywire-dmsgd.service
new file mode 100644
index 000000000000..81ba486187bf
--- /dev/null
+++ b/skywire-dmsgd.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Skywire dmsg-discovery service
+Wants=network-online.target redis.service
+
+[Service]
+Type=simple
+ExecStartPre=/bin/bash -c '[[ ! -f /etc/skywire-dmsgd.conf ]] && skywire cli config gen-keys | tee /etc/skywire-dmsgd.conf || true'
+ExecStart=/bin/bash -c "skywire dmsg disc --sk $$(tail -n1 /etc/skywire-dmsgd.conf)"
+Restart=always
+RestartSec=20
+TimeoutSec=30
+
+[Install]
+WantedBy=multi-user.target
diff --git a/skywire-rf.service b/skywire-rf.service
new file mode 100644
index 000000000000..92617c64e5e0
--- /dev/null
+++ b/skywire-rf.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Skywire route-finder service
+Wants=network-online.target postgresql.service
+
+[Service]
+Type=simple
+ExecStartPre=/bin/bash -c '[[ ! -f /etc/skywire-rf.conf ]] && skywire cli config gen-keys | tee /etc/skywire-rf.conf || true'
+ExecStart=/bin/bash -c "skywire svc rf --sk $$(tail -n1 /etc/skywire-rf.conf)"
+Restart=always
+RestartSec=20
+TimeoutSec=30
+
+[Install]
+WantedBy=multi-user.target
diff --git a/skywire-sd.service b/skywire-sd.service
new file mode 100644
index 000000000000..55a244d0f2e5
--- /dev/null
+++ b/skywire-sd.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Skywire service-discovery service
+Wants=network-online.target redis.service postgresql.service
+
+[Service]
+Type=simple
+ExecStartPre=/bin/bash -c '[[ ! -f /etc/skywire-sd.conf ]] && skywire cli config gen-keys | tee /etc/skywire-sd.conf || true'
+ExecStart=/bin/bash -c 'skywire svc sd --sk $$(tail -n1 /etc/skywire-sd.conf)'
+Restart=always
+RestartSec=20
+TimeoutSec=30
+
+[Install]
+WantedBy=multi-user.target
diff --git a/skywire-sn.service b/skywire-sn.service
new file mode 100644
index 000000000000..ce02d76a6182
--- /dev/null
+++ b/skywire-sn.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Skywire route setup-node service
+Wants=network-online.target
+
+[Service]
+Type=simple
+ExecStartPre=/bin/bash -c '[[ ! -f /etc/skywire-sn.json ]] && skywire cli config gen -n --loglvl debug | jq \'{public_key: .pk, secret_key: .sk, dmsg: {discovery: .dmsg.discovery, sessions_count: .dmsg.sessions_count, servers: .dmsg.servers}, transport_discovery: .transport.discovery, log_level: .log_level}\' | tee skywire-sn.json || true'
+ExecStart=/bin/skywire svc sn /etc/skywire-sn.json
+Restart=always
+RestartSec=20
+TimeoutSec=30
+
+[Install]
+WantedBy=multi-user.target
diff --git a/skywire-tpd.service b/skywire-tpd.service
new file mode 100644
index 000000000000..ddba50756e97
--- /dev/null
+++ b/skywire-tpd.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Skywire transport-discovery service
+Wants=network-online.target redis.service postgresql.service
+
+[Service]
+Type=simple
+ExecStartPre=/bin/bash -c '[[ ! -f /etc/skywire-tpd.conf ]] && skywire cli config gen-keys | tee /etc/skywire-tpd.conf || true'
+ExecStart=/bin/bash -c "skywire svc tpd --sk $(tail -n1 /etc/skywire-tpd.conf)"
+Restart=always
+RestartSec=20
+TimeoutSec=30
+
+[Install]
+WantedBy=multi-user.target