From a487c74e3d47a949324edba95ce52ff7f05108b9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 15 May 2015 23:19:35 +0200 Subject: desktop-base: use sshkeys.nix --- modules/lass/desktop-base.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/lass/desktop-base.nix b/modules/lass/desktop-base.nix index 8b8da653..7c3b4c41 100644 --- a/modules/lass/desktop-base.nix +++ b/modules/lass/desktop-base.nix @@ -1,6 +1,9 @@ { config, pkgs, ... }: { + imports = [ + ./sshkeys.nix + ]; boot.tmpOnTmpfs = true; # see tmpfiles.d(5) systemd.tmpfiles.rules = [ @@ -65,9 +68,7 @@ services.gitolite = { enable = true; dataDir = "/home/gitolite"; - adminPubkey = '' - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAp83zynhIueJJsWlSEykVSBrrgBFKq38+vT8bRfa+csqyjZBl2SQFuCPo+Qbh49mwchpZRshBa9jQEIGqmXxv/PYdfBFQuOFgyUq9ZcTZUXqeynicg/SyOYFW86iiqYralIAkuGPfQ4howLPVyjTZtWeEeeEttom6p6LMY5Aumjz2em0FG0n9rRFY2fBzrdYAgk9C0N6ojCs/Gzknk9SGntA96MDqHJ1HXWFMfmwOLCnxtE5TY30MqSmkrJb7Fsejwjoqoe9Y/mCaR0LpG2cStC1+37GbHJNH0caCMaQCX8qdfgMVbWTVeFWtV6aWOaRgwLrPDYn4cHWQJqTfhtPrNQ== lass@mors - ''; + adminPubkey = config.sshKeys.lass.pub; }; services.journald.extraConfig = '' -- cgit v1.2.3