phfroidmont/self-hosting
1
0
Fork 0
mirror of https://github.com/phfroidmont/self-hosting.git synced 2025-12-25 05:36:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update packages and deploy using deploy-rs

Browse source
This commit is contained in:
Paul-Henri Froidmont 2021-11-25 00:33:28 +01:00
parent 7a2c069046
commit f174228d9f
Signed by: phfroidmont
GPG key ID: BE948AFD7E7873BE
5 changed files with 172 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -10,3 +10,4 @@ terraform.tfstate.backup
terraform.tfvars terraform.tfvars
.direnv .direnv
.vscode .vscode
result

16
dns.tf
View file

@ -14,6 +14,22 @@ resource "hetznerdns_record" "banditlair_hcloud_a" {
ttl = 600 ttl = 600
} }
resource "hetznerdns_record" "backend1_a" {
zone_id = data.hetznerdns_zone.banditlair_zone.id
name = "backend1"
value = hcloud_server.backend1.ipv4_address
type = "A"
ttl = 600
}
resource "hetznerdns_record" "db1_a" {
zone_id = data.hetznerdns_zone.banditlair_zone.id
name = "db1"
value = hcloud_server.db1.ipv4_address
type = "A"
ttl = 600
}
resource "hetznerdns_record" "banditlair_dedicated_a" { resource "hetznerdns_record" "banditlair_dedicated_a" {
zone_id = data.hetznerdns_zone.banditlair_zone.id zone_id = data.hetznerdns_zone.banditlair_zone.id
name = "*" name = "*"

76
flake.lock generated
View file

@ -1,12 +1,64 @@
{ {
"nodes": { "nodes": {
"deploy-rs": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": "nixpkgs",
"utils": "utils"
},
"locked": {
"lastModified": 1632822684,
"narHash": "sha256-lt7eayYmgsD5OQwpb1XYfHpxttn43bWo7G7hIJs+zJw=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "9a02de4373e0ec272d08a417b269a28ac8b961b4",
"type": "github"
},
"original": {
"owner": "serokell",
"repo": "deploy-rs",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1627913399,
"narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1630248577, "lastModified": 1632086102,
"narHash": "sha256-9d/yq96TTrnF7qjA6wPYk+rYjWAXwfUmwk3qewezSeg=", "narHash": "sha256-wVTcf0UclFS+zHtfPToB13jIO7n0U9N50MuRbPjQViE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e0ce3c683ae677cf5aab597d645520cddd13392b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1637595801,
"narHash": "sha256-LkIMwVFKCuEqidaUdg8uxwpESAXjsPo4oCz3eJ7RaRw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8d8a28b47b7c41aeb4ad01a2bd8b7d26986c3512", "rev": "263ef4cc4146c9fab808085487438c625d4426a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,7 +70,23 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "deploy-rs": "deploy-rs",
"nixpkgs": "nixpkgs_2"
}
},
"utils": {
"locked": {
"lastModified": 1631561581,
"narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
} }
} }
}, },

24
flake.nix
View file

@ -1,7 +1,8 @@
{ {
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
inputs.deploy-rs.url = "github:serokell/deploy-rs";
outputs = { self, nixpkgs }: outputs = { self, nixpkgs, deploy-rs }:
let let
pkgs = nixpkgs.legacyPackages.x86_64-linux; pkgs = nixpkgs.legacyPackages.x86_64-linux;
@ -20,6 +21,7 @@
terraform terraform
terraform-ls terraform-ls
sops sops
deploy-rs.packages."x86_64-linux".deploy-rs
]; ];
}; };
@ -76,5 +78,25 @@
}; };
}; };
deploy.nodes = {
db1 = {
hostname = "db1.banditlair.com";
profiles.system = {
user = "root";
sshUser = "root";
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.db1;
};
};
backend1 = {
hostname = "backend1.banditlair.com";
profiles.system = {
user = "root";
sshUser = "root";
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.backend1;
};
};
};
checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
}; };
} }

3
modules/nextcloud.nix
View file

@ -41,7 +41,7 @@ in
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud21; package = pkgs.nextcloud22;
hostName = "cloud.${config.networking.domain}"; hostName = "cloud.${config.networking.domain}";
config = { config = {
dbtype = "pgsql"; dbtype = "pgsql";
@ -52,6 +52,7 @@ in
adminpassFile = "/var/keys/nextcloud-admin-pass"; adminpassFile = "/var/keys/nextcloud-admin-pass";
adminuser = "root"; adminuser = "root";
overwriteProtocol = "https"; overwriteProtocol = "https";
defaultPhoneRegion = "BE";
}; };
}; };
users.users.nextcloud.extraGroups = [ "keys" ]; users.users.nextcloud.extraGroups = [ "keys" ];