synit
/
synit
1
0
Fork 1
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

Updates from today's changes to supervision restart strategies

This commit is contained in:
Tony Garnock-Jones 2022-01-07 22:21:31 +01:00
parent aad2e2936e
commit 78c916e8ec
14 changed files with 36 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packaging/packages/syndicate-server/APKBUILD
View File

@ -1,7 +1,7 @@
# Contributor: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
# Maintainer: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
pkgname=syndicate-server
pkgver=0.17.0
pkgver=0.18.0
pkgrel=0
pkgdesc="Syndicate server"
url="https://syndicate-lang.org/"
@ -27,7 +27,7 @@ package() {
}
sha512sums="
df67e3f74261a965f4930ddb620870b4a9e6cb1f7092d172d0837ef4ba0ae7712974c5f15bf498746f245fb8d8ba63f0f5389fdc191467d67f684672764d542e syndicate-server.aarch64
211d06b272578e22d608ff9390e5492d045ad2ebad5990901c1d69d1aafb43d2c11698dd6d40358c37d508422754d9cf18ebf2747e388578d1a7c81639ea5334 syndicate-server.armv7
0434b289f927b3fa8d89468e8cd5ba6a89ce4dca843ce9878bde56a44c5839892b5c10be6135a3e23c8da40183a4efd028e60502b7a15315fe548092733e5ee2 syndicate-server.x86_64
1778c033ef250de0a2a30767c962245eb1f247d71958833ed7a7fe7fbfdfe730ade6c6562b2e83f76dec4a6c061b0e2ed78ee25f5362aceea537b08df7634469 syndicate-server.aarch64
80034a35ffb5e661e32bec63d81b22748ba5788546daa3472a0ba6cf5735cfae1812dcd24220aecd8088bbe9d94f35c01dd2cb514a4c9f1c812ab7f28154931d syndicate-server.armv7
8d7f34a6ceb5ee23ae14fb8d82a8a75ec07887fb80ed83cfd4d9de4f7a41435f9eb213fe2607bd9784fe04f2dc8222c9daf17209360bbedd28112a0d0c406d96 syndicate-server.x86_64
"

28
packaging/packages/synit-config/APKBUILD
View File

@ -1,8 +1,8 @@
# Contributor: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
# Maintainer: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
pkgname=synit-config
pkgver=0.0.1
pkgrel=0
pkgver=0.0.2
pkgrel=1
pkgdesc="synit system layer configuration"
url="https://synit.org/"
arch="noarch"
@ -20,10 +20,8 @@ depends="
subpackages="
$pkgname-docker:docker
"
makedepends=""
source="
$(ls *.pr)
synit-init.sh
makedepends="
rsync
"
builddir="$srcdir/"
options="!check"
@ -37,13 +35,9 @@ build() {
}
package() {
mkdir -p "$pkgdir/sbin"
cp -p synit-init.sh "$pkgdir/sbin/."
mkdir -p "$pkgdir"
rsync -a "$startdir/files/." "$pkgdir/."
ln -sf /sbin/synit-init.sh "$pkgdir/sbin/init"
mkdir -p "$pkgdir/etc/syndicate"
cp *.pr "$pkgdir/etc/syndicate/."
mkdir -p "$pkgdir/var/lock/synit"
}
@ -54,13 +48,3 @@ docker() {
amove etc/syndicate/docker.pr
}
sha512sums="
eabf4830fbb28980f2b3fe15f423e45f5b2f05f8ce65be7afe87b976edc433e94a7506366dfce6d5c207b4086e8dc4ce4bde6a4b248873692bcc8c904e073f67 configdirs.pr
e78bac08ec856aa695928e3121198fe1eaeb055a06f8b744cdcc7fec45af79142db83ed05a4d01e424bd3a4f1d493257231df98236d8a3dbf93a29b9fc951002 docker.pr
acdaa844079c5b32943503797ba5c7dda555a844533fe37a20f1ac3524e76a4126a587557f81adca69085c80af673392f458e7e66d6bc315bbd44ff0c1f7060f eudev.pr
a1224e97cfecf98566b215724b0a4e5da7141900cbed62b066528f2b99b5cd9715bdb33f67aa77f0f4d97ef21fb6ac2eacdfbf90accdf0ebeec8d0bc30455de3 hostname.pr
eb59d70953e9be0d77747ae29685596a89a744125b0e20935f3771e02d24c53f58aafc14168deadf8430be7a566c30b394bab5b8bfc76a2b944f56d3b77e8d69 network.pr
de12efb8ac776ee02cd75bd8da69b537ca8b9ab66016fa7c311a0714697c0b5df78f3b641c5b8b85cf69d00c348571ab971c41906aa5aa0ded01bdcf854b16a4 sshd.pr
932da0abc1ba965c57c35416ba5e3ebe3956a55acb64ce1881773fd0b579532b539a769038e6c3b99d6f42e6f9940094e34efaddbd132322acdcb6ccf2b47407 synit-init.sh
"

9
packaging/packages/synit-config/eudev.pr
View File

@ -1,9 +0,0 @@
<depends-on <milestone core> <service-state <daemon eudev> ready>>
<depends-on <milestone core> <service-state <daemon eudev-initial-scan> complete>>
<core-service <daemon eudev>>
<daemon eudev ["/sbin/udevd", "--children-max=5"]>
<core-service <daemon eudev-initial-scan>>
<depends-on <daemon eudev-initial-scan> <service-state <daemon eudev> ready>>
<daemon eudev-initial-scan "echo '' > /proc/sys/kernel/hotplug && udevadm trigger --type=subsystems --action=add && udevadm trigger --type=devices --action=add && udevadm settle --timeout=30">

0
packaging/packages/synit-config/configdirs.pr → packaging/packages/synit-config/files/etc/syndicate/configdirs.pr
View File

5
packaging/packages/synit-config/docker.pr → packaging/packages/synit-config/files/etc/syndicate/docker.pr
View File

@ -1,7 +1,4 @@
<require-service <daemon docker>>
<depends-on <daemon docker> <service-state <milestone network> ready>>
<daemon docker {
argv: "/usr/bin/dockerd --experimental"
restart: always
}>
<daemon docker "/usr/bin/dockerd --experimental">

9
packaging/packages/synit-config/files/etc/syndicate/eudev.pr Normal file
View File

@ -0,0 +1,9 @@
<depends-on <milestone system-layer> <service-state <daemon eudev> ready>>
<depends-on <milestone system-layer> <service-state <daemon eudev-initial-scan> complete>>
<system-layer-service <daemon eudev>>
<daemon eudev <one-shot ["/sbin/udevd", "--children-max=5"]>>
<system-layer-service <daemon eudev-initial-scan>>
<depends-on <daemon eudev-initial-scan> <service-state <daemon eudev> ready>>
<daemon eudev-initial-scan <one-shot "echo '' > /proc/sys/kernel/hotplug && udevadm trigger --type=subsystems --action=add && udevadm trigger --type=devices --action=add && udevadm settle --timeout=30">>

3
packaging/packages/synit-config/files/etc/syndicate/hostname.pr Normal file
View File

@ -0,0 +1,3 @@
<depends-on <milestone system-layer> <service-state <daemon hostname> complete>>
<system-layer-service <daemon hostname>>
<daemon hostname <one-shot "hostname $(cat /etc/hostname)">>

5
packaging/packages/synit-config/network.pr → packaging/packages/synit-config/files/etc/syndicate/network.pr
View File

@ -21,8 +21,5 @@
]
? <run-service <daemon <udhcpc ?ifname>>> [
<daemon <udhcpc $ifname> {
argv: ["udhcpc" "-i" $ifname "-fR"],
restart: always
}>
<daemon <udhcpc $ifname> ["udhcpc" "-i" $ifname "-fR"]>
]

8
packaging/packages/synit-config/sshd.pr → packaging/packages/synit-config/files/etc/syndicate/sshd.pr
View File

@ -2,9 +2,5 @@
<depends-on <daemon sshd> <service-state <milestone network> ready>>
<depends-on <daemon sshd> <service-state <daemon ssh-host-keys> complete>>
<daemon sshd {
argv: "/usr/sbin/sshd -D"
restart: always
}>
<daemon ssh-host-keys "ssh-keygen -A">
<daemon sshd "/usr/sbin/sshd -D">
<daemon ssh-host-keys <one-shot "ssh-keygen -A">>

0
packaging/packages/synit-config/synit-init.sh → packaging/packages/synit-config/files/sbin/synit-init.sh
View File

3
packaging/packages/synit-config/hostname.pr
View File

@ -1,3 +0,0 @@
<depends-on <milestone core> <service-state <daemon hostname> complete>>
<core-service <daemon hostname>>
<daemon hostname "hostname $(cat /etc/hostname)">

8
packaging/packages/synit-pid1/APKBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
pkgname=synit-pid1
pkgver=0.0.1
pkgrel=2
pkgrel=3
pkgdesc="synit pid 1 program"
url="https://synit.org/"
arch="all"
@ -27,7 +27,7 @@ package() {
}
sha512sums="
046fe93a05985c986074f847b46acaee8a59dd70bf02647a44fa056a945a1bb6967343813f95c73ac1ebf7c92319380744b435a1d598070d70794f080808a391 synit-pid1.aarch64
dc810b48f58348c48a5d11ff809efcddd61469114a8270c0355a3cc64339b513edf8c747ff58621eda1d40e306d063dde3b78aaa1de8624b8144b659c935333b synit-pid1.armv7
b641a2c4f7b6825f7c588ff37fa841da3c7c1e43d8c17a550adfae7dc79b169da52fd7f30002502dd76240d9730ad556c6ddfa4ba94b47050560f4b0594e8ad9 synit-pid1.x86_64
e4aa3c352701f56cf0d877a565106f62fff555b529b7b6bf439a9d6b6b7e153b5a4f7749b27cc8278d78e48efa9373d4c71a22a95e26a1d59e8e4da9789f3b6d synit-pid1.aarch64
f286e403b944a2364d4ed74dd2c02e2a26de2c68908969600c353f03b523faf7daa11ea5f482fa32d83a112487a4af383e10235c1acdc0e332bf1176a1113f4b synit-pid1.armv7
791b9b65e72ff863308748d26bb77492b129769c611b1b70975ff67a7f24c5eda34b432ff34c4b576f7e26f51a6ce305f2bc20689eba1334f08499ba8fb28185 synit-pid1.x86_64
"

8
synit-pid1/Cargo.lock generated
View File

@ -899,9 +899,9 @@ dependencies = [
[[package]]
name = "syndicate"
version = "0.17.0"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0a090820538636d7d18983ce42f0516a12ced12133fb07ea64d1ea03522c4d8"
checksum = "12854f41b90be673c32ca455b1a6047e83e4a725d81fe4d2087487cddc10d882"
dependencies = [
"bytes",
"futures",
@ -921,9 +921,9 @@ dependencies = [
[[package]]
name = "syndicate-macros"
version = "0.12.0"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb8a4dd7952f409196d1cc6dc4f579efabb6b31670408e01168007b3de017cac"
checksum = "6b61a69894916594933893e04f96c9d683a22c11c775a9fa148044316958d1db"
dependencies = [
"proc-macro2",
"quote",

4
synit-pid1/Cargo.toml
View File

@ -23,8 +23,8 @@ strip = true
# syndicate-macros = { path = "localdev/syndicate-rs/syndicate-macros" }
[dependencies]
syndicate = "0.17"
syndicate-macros = "0.12"
syndicate = "0.18"
syndicate-macros = "0.13"
clap = "3.0.0-beta.2"
clap_generate = "3.0.0-beta.2"