tixie/nixcfg
1
0
Fork 0
forked from Deuxfleurs/nixcfg
Code Pull requests Activity

Deploy nixos 23.05 on staging and other staging fixes

Browse source
This commit is contained in:
Alex 2023-06-13 11:56:10 +02:00
parent 1d19bae7a1
commit 6c12a71ecb
5 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cluster/staging/app/core/deploy/d53.hcl
View file

@ -1,4 +1,4 @@
job "core:d53" { job "core-d53" {
datacenters = ["neptune", "jupiter", "corrin", "bespin"] datacenters = ["neptune", "jupiter", "corrin", "bespin"]
type = "service" type = "service"
priority = 90 priority = 90

2
cluster/staging/app/core/deploy/diplonat.hcl
View file

@ -1,4 +1,4 @@
job "core:diplonat" { job "core-diplonat" {
datacenters = ["neptune", "jupiter", "corrin", "bespin"] datacenters = ["neptune", "jupiter", "corrin", "bespin"]
type = "system" type = "system"
priority = 90 priority = 90

4
cluster/staging/app/core/deploy/tricot.hcl
View file

@ -1,4 +1,4 @@
job "core:tricot" { job "core-tricot" {
datacenters = ["neptune", "jupiter", "corrin", "bespin"] datacenters = ["neptune", "jupiter", "corrin", "bespin"]
type = "system" type = "system"
priority = 90 priority = 90
@ -25,7 +25,7 @@ job "core:tricot" {
config { config {
packages = [ packages = [
"git+https://git.deuxfleurs.fr/Deuxfleurs/tricot.git?ref=main&rev=f163d1d348c78a27bb19a86a6158f4b5d1287f6f" "git+https://git.deuxfleurs.fr/Deuxfleurs/tricot.git?ref=main&rev=3999723308da10e564c4634997c6ecf63f2839d4"
] ]
command = "tricot" command = "tricot"
# cap_add = [ "net_bind_service" ] # this doesn't work for whatever reason, so we need to put user = "root" instead # cap_add = [ "net_bind_service" ] # this doesn't work for whatever reason, so we need to put user = "root" instead

5
cluster/staging/cluster.nix
View file

@ -40,7 +40,7 @@
}; };
deuxfleurs.wgautomeshPort = 1667; deuxfleurs.wgautomeshPort = 1667;
services.wgautomesh.logLevel = "debug"; deuxfleurs.services.wgautomesh.logLevel = "debug";
# Bootstrap IPs for Consul cluster, # Bootstrap IPs for Consul cluster,
# these are IPs on the Wireguard overlay # these are IPs on the Wireguard overlay
@ -139,7 +139,8 @@
port = substituter_port; port = substituter_port;
openFirewall = false; openFirewall = false;
bindAddress = "0.0.0.0"; bindAddress = "0.0.0.0";
package = pkgs.haskellPackages.nix-serve-ng; #package = pkgs.haskellPackages.nix-serve-ng;
#package = pkgs.nix-serve-ng.override { nix = pkgs.nixVersions.nix_2_12; };
}; };
nix.settings.substituters = map nix.settings.substituters = map
({ address, ... }: "http://${address}:${builtins.toString substituter_port}") ({ address, ... }: "http://${address}:${builtins.toString substituter_port}")

4
upgrade_nixos
View file

@ -1,6 +1,10 @@
#!/usr/bin/env ./sshtool #!/usr/bin/env ./sshtool
if [ "$CLUSTER" = "staging" ]; then
cmd nix-channel --add https://nixos.org/channels/nixos-23.05 nixos
else
cmd nix-channel --add https://nixos.org/channels/nixos-22.11 nixos cmd nix-channel --add https://nixos.org/channels/nixos-22.11 nixos
fi
cmd nix-channel --update cmd nix-channel --update
cmd nixos-rebuild boot cmd nixos-rebuild boot