From 627dc95eaf71520b27b7893b96eff318925a099a Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 22 Jun 2017 19:14:04 +0200 Subject: [PATCH] ud-generate: Create all ssh-gitolite individually ud-generate: Do not create a global ssh-gitolite. Instead create them per-host where needed so we can accomodate per-host ssh authorized-keys. --- debian/changelog | 3 +++ ud-generate | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0781405..35dd065 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ userdir-ldap (0.3.90) UNRELEASED; urgency=medium [ Peter Palfrader ] * Replace RSA authentication with public-key authentication in welcome messages. + * ud-generate: Do not create a global ssh-gitolite. Instead create + them per-host where needed so we can accomodate per-host ssh + authorized-keys. -- Paul Wise Sat, 17 Jun 2017 14:38:00 +0800 diff --git a/ud-generate b/ud-generate index 3dac331..a4a74b5 100755 --- a/ud-generate +++ b/ud-generate @@ -1226,7 +1226,6 @@ def generate_all(global_dir, ldap_conn): GenMarkers(accounts, global_dir + "markers") GenSSHKnown(host_attrs, global_dir + "ssh_known_hosts") GenHosts(host_attrs, global_dir + "debianhosts") - GenSSHGitolite(accounts, host_attrs, global_dir + "ssh-gitolite") GenDNS(accounts, global_dir + "dns-zone") GenZoneRecords(host_attrs, global_dir + "dns-sshfp") @@ -1321,7 +1320,7 @@ def generate_host(host, global_dir, all_accounts, all_hosts, ssh_userkeys): DoLink(global_dir, OutDir, "debian-private") if 'GITOLITE' in ExtraList: - DoLink(global_dir, OutDir, "ssh-gitolite") + GenSSHGitolite(all_accounts, all_hosts, OutDir + "ssh-gitolite", current_host=current_host) if 'exportOptions' in host[1]: for entry in host[1]['exportOptions']: v = entry.split('=',1) -- 2.20.1