diff options
| -rw-r--r-- | configuration/gitea.nix (renamed from roles/git-server.nix) | 9 | ||||
| -rw-r--r-- | files/id_tarrel.pub | 1 | ||||
| -rw-r--r-- | files/id_work.pub | 1 | ||||
| -rw-r--r-- | flake.nix | 5 | ||||
| -rw-r--r-- | roles/base.nix | 6 |
5 files changed, 15 insertions, 7 deletions
diff --git a/roles/git-server.nix b/configuration/gitea.nix index 935f75f..f9e48f4 100644 --- a/roles/git-server.nix +++ b/configuration/gitea.nix @@ -1,12 +1,16 @@ { ... }: { - services.openssh.settings.AllowUsers = [ "git" ]; users.groups.git = {}; users.users.git = { isSystemUser = true; group = "git"; hashedPassword = "$6$Rc//lmBr5orYHn.0$M9y3Zj4zCe723r8hYGIhPC5kPv5SVGHjF1FsjrT9IIx7trxuNTLtLDQVL9lhmR5/7bFMUFEf0CMx9w7.vgXgY0"; + openssh.authorizedKeys.keyFiles = [ + ../files/id_tarrel.pub + ../files/id_work.pub + ]; }; + services.gitea = { enable = true; appName = "JAP56 Git Server"; @@ -16,5 +20,8 @@ HTTP_PORT = 80; DOMAIN = "snorlax"; }; + useWizard = true; }; + + services.openssh.settings.AllowUsers = [ "git" ]; } diff --git a/files/id_tarrel.pub b/files/id_tarrel.pub new file mode 100644 index 0000000..d52bb07 --- /dev/null +++ b/files/id_tarrel.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOpAWpymOovrrdaNh43UHNIifi7hyRjtQZl24gqprUT/ jras@tarrel diff --git a/files/id_work.pub b/files/id_work.pub new file mode 100644 index 0000000..bc9457e --- /dev/null +++ b/files/id_work.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCiljUOLUIywzNfQpAGtIXwleFeLvb7Vk+Gsvzlr9Oq jras@work @@ -102,10 +102,9 @@ } ./hardware/snorlax-disks.nix - ./configuration/snorlax.nix - ./roles/server.nix - ./roles/git-server.nix + ./configuration/snorlax.nix + ./configuration/gitea.nix ]; }; }; diff --git a/roles/base.nix b/roles/base.nix index 4fe0692..da82c25 100644 --- a/roles/base.nix +++ b/roles/base.nix @@ -12,9 +12,9 @@ extraGroups = [ "wheel" ]; shell = pkgs.zsh; packages = with pkgs; [ git helix curl ]; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOpAWpymOovrrdaNh43UHNIifi7hyRjtQZl24gqprUT/ jras@tarrel" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCiljUOLUIywzNfQpAGtIXwleFeLvb7Vk+Gsvzlr9Oq jras@work" + openssh.authorizedKeys.keyFiles = [ + ../files/id_tarrel.pub + ../files/id_work.pub ]; }; |