clan/clan-infra
10
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix backup

Browse Source
This commit is contained in:
Jörg Thalheim 2023-09-19 13:49:10 +02:00
parent a074658482
commit 3bb4da0b18
4 changed files with 47 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
flake.lock
View File

@ -19,15 +19,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694874693, "lastModified": 1694703716,
"narHash": "sha256-xMqT5csfPAbLghUr6OXCpOTM9Fk/Azwg7xYnEYCEsaQ=", "narHash": "sha256-J1nyeRArZlQPAnmJ1suKrhYOgVEixNGeqbpVTI+gilE=",
"ref": "refs/heads/main", "ref": "lassulus-pass-secrets",
"rev": "4a1dcc16395a5423023ac10d4be3640d1bb88fdc", "rev": "1c07f990a89edfd3f268cad4155f29b86a554484",
"revCount": 690, "revCount": 665,
"type": "git", "type": "git",
"url": "https://git.clan.lol/clan/clan-core" "url": "https://git.clan.lol/clan/clan-core"
}, },
"original": { "original": {
"ref": "lassulus-pass-secrets",
"type": "git", "type": "git",
"url": "https://git.clan.lol/clan/clan-core" "url": "https://git.clan.lol/clan/clan-core"
} }

14
flake.nix
View File

@ -24,7 +24,7 @@
# Use the version of nixpkgs that has been tested to work with SrvOS # Use the version of nixpkgs that has been tested to work with SrvOS
srvos.inputs.nixpkgs.follows = "nixpkgs"; srvos.inputs.nixpkgs.follows = "nixpkgs";
clan-core.url = "git+https://git.clan.lol/clan/clan-core"; clan-core.url = "git+https://git.clan.lol/clan/clan-core?ref=lassulus-pass-secrets";
clan-core.inputs.flake-parts.follows = "flake-parts"; clan-core.inputs.flake-parts.follows = "flake-parts";
clan-core.inputs.nixpkgs.follows = "nixpkgs"; clan-core.inputs.nixpkgs.follows = "nixpkgs";
clan-core.inputs.treefmt-nix.follows = "treefmt-nix"; clan-core.inputs.treefmt-nix.follows = "treefmt-nix";
@ -44,7 +44,7 @@
./modules/flake-module.nix ./modules/flake-module.nix
./pkgs/flake-module.nix ./pkgs/flake-module.nix
]; ];
perSystem = { perSystem = ({ lib, self', ... }: {
treefmt = { treefmt = {
projectRootFile = ".git/config"; projectRootFile = ".git/config";
programs.terraform.enable = true; programs.terraform.enable = true;
@ -56,6 +56,14 @@
"composition.nix" "composition.nix"
]; ];
}; };
}; checks =
let
nixosMachines = lib.mapAttrs' (name: config: lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel) ((lib.filterAttrs (_: config: config.pkgs.system == system)) self.nixosConfigurations);
packages = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") self'.packages;
devShells = lib.mapAttrs' (n: lib.nameValuePair "devShell-${n}") self'.devShells;
homeConfigurations = lib.mapAttrs' (name: config: lib.nameValuePair "home-manager-${name}" config.activation-script) (self'.legacyPackages.homeConfigurations or { });
in
nixosMachines // packages // devShells // homeConfigurations;
});
}; };
} }

4
modules/web01/borgbackup.nix
View File

@ -41,7 +41,9 @@
"/var/tmp" "/var/tmp"
"/var/log" "/var/log"
]; ];
repo = "u359378@u359378.your-storagebox.de:/./borgbackup"; # $ ssh-keygen -y -f /run/secrets/hetzner-borgbackup-ssh > /tmp/hetzner-borgbackup-ssh.pub
# $ cat /tmp/hetzner-borgbackup-ssh.pub | ssh -p23 u366395@u366395.your-storagebox.de install-ssh-key
repo = "u366395@u366395.your-storagebox.de:/./borgbackup";
# Disaster recovery: # Disaster recovery:
# get the backup passphrase and ssh key from the sops and store them in /tmp # get the backup passphrase and ssh key from the sops and store them in /tmp

222
targets/web01/terraform.tfstate
View File

File diff suppressed because one or more lines are too long