diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-07-04 11:57:06 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-07-04 11:57:06 +0200 |
| commit | 698cdefadb8ee18e4c12511896380157aba32257 (patch) | |
| tree | ccc9d356ff1136a792836cd638cae3fa3e21b997 | |
| parent | c81442dc01690e2c471b0de4dc8fac60c5c5befa (diff) | |
| download | nixcfg-698cdefadb8ee18e4c12511896380157aba32257.tar.gz nixcfg-698cdefadb8ee18e4c12511896380157aba32257.zip | |
Update garage (repair task in comments)
| -rw-r--r-- | app/drone-ci/deploy/runner-docker.hcl | 2 | ||||
| -rw-r--r-- | app/garage-staging/deploy/garage.hcl | 37 | ||||
| -rw-r--r-- | ssh_known_hosts | 15 |
3 files changed, 36 insertions, 18 deletions
diff --git a/app/drone-ci/deploy/runner-docker.hcl b/app/drone-ci/deploy/runner-docker.hcl index 1f823bf..d7c6ef4 100644 --- a/app/drone-ci/deploy/runner-docker.hcl +++ b/app/drone-ci/deploy/runner-docker.hcl @@ -15,7 +15,7 @@ job "drone-runner" { image = "nixpkgs/nix:nixos-21.05" command = "sh" args = [ - "-c", "cp -rv /nix/{store,var} /mnt/" + "-c", "test -d /mnt/store || cp -rv /nix/{store,var} /mnt/" ] volumes = [ "/var/lib/drone/nix:/mnt", diff --git a/app/garage-staging/deploy/garage.hcl b/app/garage-staging/deploy/garage.hcl index 69c63c5..f103f6f 100644 --- a/app/garage-staging/deploy/garage.hcl +++ b/app/garage-staging/deploy/garage.hcl @@ -11,10 +11,6 @@ job "garage-staging" { } group "garage-staging" { - migrage { - max_parallel = 1 - } - network { port "s3" { static = 3990 } port "rpc" { static = 3991 } @@ -29,11 +25,42 @@ job "garage-staging" { healthy_deadline = "5m" } + # task "repair" { + # lifecycle { + # hook = "prestart" + # sidecar = false + # } + + # driver = "docker" + + # config { + # image = "dxflrs/amd64_garage:v0.7.99-k2v" + # command = "/garage" + # args = [ "offline-repair", "--yes", "object_counters" ] + # network_mode = "host" + # volumes = [ + # "/mnt/storage/garage-staging/data:/data", + # "/mnt/ssd/garage-staging/meta:/meta", + # "secrets/garage.toml:/etc/garage.toml", + # ] + # } + + # template { + # data = file("../config/garage.toml") + # destination = "secrets/garage.toml" + # } + + # resources { + # memory = 2000 + # cpu = 1000 + # } + # } + task "server" { driver = "docker" config { - image = "dxflrs/amd64_garage:v0.7.1-admin-k2v-2" + image = "dxflrs/amd64_garage:v0.7.99-k2v" command = "/garage" args = [ "server" ] network_mode = "host" diff --git a/ssh_known_hosts b/ssh_known_hosts index 68894da..cc907be 100644 --- a/ssh_known_hosts +++ b/ssh_known_hosts @@ -1,17 +1,8 @@ -10.42.0.2 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIORTjNdFaDbhto8kuMPB3hYkfnzdnceZVIELApUe5PPL -10.42.1.33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA -10.42.1.31 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR -10.42.1.32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G -10.42.2.2 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIORTjNdFaDbhto8kuMPB3hYkfnzdnceZVIELApUe5PPL -10.42.2.21 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPXTUrXRFhudJBESCqjHCOttzqYPyIzpPOMkI8+SwLRx -10.42.2.22 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMf/ioVSSb19Slu+HZLgKt4f1/XsL+K9uMxazSWb/+nQ -10.42.2.23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDsYD1gNmGyb6c9wjGR6tC69fHP6+FpPHTBT6laPTHeD 192.168.1.22 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMf/ioVSSb19Slu+HZLgKt4f1/XsL+K9uMxazSWb/+nQ 192.168.1.21 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPXTUrXRFhudJBESCqjHCOttzqYPyIzpPOMkI8+SwLRx -192.168.1.23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDsYD1gNmGyb6c9wjGR6tC69fHP6+FpPHTBT6laPTHeD -192.168.1.33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA 192.168.1.31 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR 192.168.1.32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G -2a06:a004:3024::22 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMf/ioVSSb19Slu+HZLgKt4f1/XsL+K9uMxazSWb/+nQ +192.168.1.33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA 2a06:a004:3024::21 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPXTUrXRFhudJBESCqjHCOttzqYPyIzpPOMkI8+SwLRx -2a06:a004:3024::23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDsYD1gNmGyb6c9wjGR6tC69fHP6+FpPHTBT6laPTHeD +2a06:a004:3024::22 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMf/ioVSSb19Slu+HZLgKt4f1/XsL+K9uMxazSWb/+nQ +192.168.1.23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE2QRbcclYmteMRLIaxOBBBQe/OGF1T+PtSAR249r4VM |