Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Compare commits

base: Toast:319550e7181f875cd535f4c4a60b56ee70e875e7
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05
..
compare: Toast:be5fb3bc2425902ec5e36f635e6e3d9b6ea6ef30
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05

3 commits
319550e718 ... be5fb3bc24

Author SHA1 Message Date
Toast
be5fb3bc24 Common/git: add forgejo's public key to known hosts 2024-04-23 13:48:15 +02:00
Toast
c603df28bf Server/forgejo: use ssh host key from secrets 2024-04-23 13:47:41 +02:00
Toast
3d439c4893 Flake: update secrets 2024-04-23 13:47:27 +02:00
3 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flake.lock generated
View file

@ -377,11 +377,11 @@
"secrets": { "secrets": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713776544, "lastModified": 1713863887,
"narHash": "sha256-EQW8P1TfkYQV0EEK1n3Gh9wRp9KlC0EbidH2j+niCaE=", "narHash": "sha256-TwlNZjJloyZ0/5KCPeSWrnyDfEFokayovRPQY7xqq1g=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "61410d68f15b3b970067a3fdd39667fdd9a89edd", "rev": "b8c66d7b0ca9fc21bc5332801b0203033cc3a772",
"revCount": 12, "revCount": 13,
"type": "git", "type": "git",
"url": "ssh://forgejo@git.everest.sable-pancake.ts.net:4222/Toast/nix-secrets" "url": "ssh://forgejo@git.everest.sable-pancake.ts.net:4222/Toast/nix-secrets"
}, },

5
roles/common/programs/git.nix
View file

@ -1,4 +1,9 @@
{...}: { {...}: {
programs.ssh.knownHosts = {
"[git.everest.sable-pancake.ts.net]:4222".publicKey = ''
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKoUcWx56NZ3kqydN3d0gLNz6SlBm1ArkHhqR9Fwd8qs
'';
};
home-manager.users.toast = { home-manager.users.toast = {
programs.git = { programs.git = {
enable = true; enable = true;

22
roles/server/forgejo.nix
View file

@ -1,8 +1,26 @@
{ {
config, config,
lib, lib,
flakeSelf,
... ...
}: { }: let
hostSecrets = "${flakeSelf.inputs.secrets}/" + config.networking.hostName + "/";
in {
age.secrets = {
forgejo-host-key = {
file = hostSecrets + "forgejoPrivateKey.age";
mode = "0400";
owner = "forgejo";
group = "forgejo";
};
"forgejo-host-key.pub" = {
file = hostSecrets + "forgejoPublicKey.age";
mode = "0400";
owner = "forgejo";
group = "forgejo";
};
};
specialisation.forgejoEnableRegistration.configuration.services.forgejo.settings.service.DISABLE_REGISTRATION = false; specialisation.forgejoEnableRegistration.configuration.services.forgejo.settings.service.DISABLE_REGISTRATION = false;
services.forgejo = { services.forgejo = {
enable = true; enable = true;
@ -14,6 +32,8 @@
ROOT_URL = "http://git.everest.sable-pancake.ts.net"; ROOT_URL = "http://git.everest.sable-pancake.ts.net";
START_SSH_SERVER = true; START_SSH_SERVER = true;
SSH_PORT = 4222; SSH_PORT = 4222;
SSH_SERVER_HOST_KEYS = config.age.secrets.forgejo-host-key.path;
SSH_SERVER_HOST_KEY = "forgejo-host-key";
}; };
repository = { repository = {
ENABLE_PUSH_CREATE_USER = true; ENABLE_PUSH_CREATE_USER = true;