diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-02-10 18:15:23 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-02-10 18:15:23 +0100 |
commit | 8a304ef46e1ad221253f883a8a296a12018e3d30 (patch) | |
tree | a3b871bdcc72a8847d73141b6e845de0475dccaa /nixops | |
parent | cf2a9330da390784168ac758b8d4da41855809d9 (diff) | |
download | Nix-8a304ef46e1ad221253f883a8a296a12018e3d30.tar.gz Nix-8a304ef46e1ad221253f883a8a296a12018e3d30.tar.zst Nix-8a304ef46e1ad221253f883a8a296a12018e3d30.zip |
Add dilion server
Diffstat (limited to 'nixops')
-rw-r--r-- | nixops/Makefile | 5 | ||||
-rw-r--r-- | nixops/default.nix | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/nixops/Makefile b/nixops/Makefile index 02d34f8..1852e75 100644 --- a/nixops/Makefile +++ b/nixops/Makefile | |||
@@ -33,6 +33,9 @@ SSH_ARGS ?= | |||
33 | ssh-eldiron: | 33 | ssh-eldiron: |
34 | $(NIXOPS_PRIV) ssh eldiron -- $(SSH_ARGS) | 34 | $(NIXOPS_PRIV) ssh eldiron -- $(SSH_ARGS) |
35 | 35 | ||
36 | ssh-dilion: | ||
37 | $(NIXOPS_PRIV) ssh dilion -- $(SSH_ARGS) | ||
38 | |||
36 | ssh-backup-2: | 39 | ssh-backup-2: |
37 | $(NIXOPS_PRIV) ssh backup-2 -- $(SSH_ARGS) | 40 | $(NIXOPS_PRIV) ssh backup-2 -- $(SSH_ARGS) |
38 | 41 | ||
@@ -77,6 +80,7 @@ list-generations: | |||
77 | delete-generations: | 80 | delete-generations: |
78 | nix-env -p $(profile) --delete-generations $(GEN) | 81 | nix-env -p $(profile) --delete-generations $(GEN) |
79 | $(NIXOPS_PRIV) ssh eldiron -- nix-env -p /nix/var/nix/profiles/system --delete-generations $(GEN) | 82 | $(NIXOPS_PRIV) ssh eldiron -- nix-env -p /nix/var/nix/profiles/system --delete-generations $(GEN) |
83 | $(NIXOPS_PRIV) ssh dilion -- nix-env -p /nix/var/nix/profiles/system --delete-generations $(GEN) | ||
80 | $(NIXOPS_PRIV) ssh backup-2 -- nix-env -p /nix/var/nix/profiles/system --delete-generations $(GEN) | 84 | $(NIXOPS_PRIV) ssh backup-2 -- nix-env -p /nix/var/nix/profiles/system --delete-generations $(GEN) |
81 | $(NIXOPS_PRIV) ssh monitoring-1 -- nix-env -p /nix/var/nix/profiles/system --delete-generations $(GEN) | 85 | $(NIXOPS_PRIV) ssh monitoring-1 -- nix-env -p /nix/var/nix/profiles/system --delete-generations $(GEN) |
82 | .PHONY: delete-generations | 86 | .PHONY: delete-generations |
@@ -84,6 +88,7 @@ delete-generations: | |||
84 | cleanup: delete-generations | 88 | cleanup: delete-generations |
85 | nix-store --gc | 89 | nix-store --gc |
86 | $(NIXOPS_PRIV) ssh eldiron -- nix-store --gc | 90 | $(NIXOPS_PRIV) ssh eldiron -- nix-store --gc |
91 | $(NIXOPS_PRIV) ssh dilion -- nix-store --gc | ||
87 | $(NIXOPS_PRIV) ssh backup-2 -- nix-store --gc | 92 | $(NIXOPS_PRIV) ssh backup-2 -- nix-store --gc |
88 | $(NIXOPS_PRIV) ssh monitoring-1 -- nix-store --gc | 93 | $(NIXOPS_PRIV) ssh monitoring-1 -- nix-store --gc |
89 | .PHONY: cleanup | 94 | .PHONY: cleanup |
diff --git a/nixops/default.nix b/nixops/default.nix index 5f4f4d2..56b86e8 100644 --- a/nixops/default.nix +++ b/nixops/default.nix | |||
@@ -7,6 +7,7 @@ | |||
7 | 7 | ||
8 | # Used by hetzner cloud to provision machines | 8 | # Used by hetzner cloud to provision machines |
9 | resources.sshKeyPairs.ssh-key = {}; | 9 | resources.sshKeyPairs.ssh-key = {}; |
10 | dilion = import ../modules/private/system/dilion.nix { inherit privateFiles; }; | ||
10 | eldiron = import ../modules/private/system/eldiron.nix { inherit privateFiles; }; | 11 | eldiron = import ../modules/private/system/eldiron.nix { inherit privateFiles; }; |
11 | backup-2 = import ../modules/private/system/backup-2.nix { inherit privateFiles; }; | 12 | backup-2 = import ../modules/private/system/backup-2.nix { inherit privateFiles; }; |
12 | monitoring-1 = import ../modules/private/system/monitoring-1.nix { inherit privateFiles; }; | 13 | monitoring-1 = import ../modules/private/system/monitoring-1.nix { inherit privateFiles; }; |