From 164991bfca7ee91bbda1e0bfe53024ee08b39fce Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Mon, 14 Mar 2022 16:52:06 +0100 Subject: [PATCH] set save_private_admin_key_on_server as false Removed the 'dehydrated' part from local.yaml file as it is not needed --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 2 +- r1.komreg.net/overlay/etc/hiera/data/local.yaml | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index c5b7a6c2..edd44d97 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -294,7 +294,7 @@ class md_repo_server($hostname) { managehome => false, shell => '/bin/bash' }) - class {'sunet::gitolite': } + class {'sunet::gitolite': save_private_admin_key_on_server=>false } sunet::snippets::add_user_to_group { 'add_www_data_to_git': username => 'www-data', group => 'git' diff --git a/r1.komreg.net/overlay/etc/hiera/data/local.yaml b/r1.komreg.net/overlay/etc/hiera/data/local.yaml index 6c89cb4e..897aa934 100644 --- a/r1.komreg.net/overlay/etc/hiera/data/local.yaml +++ b/r1.komreg.net/overlay/etc/hiera/data/local.yaml @@ -1,7 +1,2 @@ --- -gitolite-admin-ssh-key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVvB4gdJ6EWRmx8xUSxrhoUNnWxEf8ZwAqhzC1+7XBY/hSd/cbEotLB9gxgqt0CLW56VU4FPLTw8snD8tgsyZN6KH1Da7UXno8oMk8tJdwLQM0Ggx3aWuztItkDfBc3Lfvq5T07YfphqJO7rcSGbS4QQdflXuOM9JLi6NStVao0ia4aE6Tj68pVVb3++XYvqvbU6NtEICvkTxEY93YpnRSfeAi64hsbaqSTN4kpeltzoSD1Rikz2aQFtFXE03ZC48HtGGhdMFA/Ade6KWBDaXxHGARVQ9/UccfhaR2XSjVxSZ8FBNOzNsH4k9cQIb2ndkEOXZXnjF5ZjdI4ZU0F+t7 leifj+00060AD478D6@sunet.se -dehydrated: - domains: - - r1.komreg.net: - names: - - r1.komreg.net +gitolite-initial-public-admin-key:: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVvB4gdJ6EWRmx8xUSxrhoUNnWxEf8ZwAqhzC1+7XBY/hSd/cbEotLB9gxgqt0CLW56VU4FPLTw8snD8tgsyZN6KH1Da7UXno8oMk8tJdwLQM0Ggx3aWuztItkDfBc3Lfvq5T07YfphqJO7rcSGbS4QQdflXuOM9JLi6NStVao0ia4aE6Tj68pVVb3++XYvqvbU6NtEICvkTxEY93YpnRSfeAi64hsbaqSTN4kpeltzoSD1Rikz2aQFtFXE03ZC48HtGGhdMFA/Ade6KWBDaXxHGARVQ9/UccfhaR2XSjVxSZ8FBNOzNsH4k9cQIb2ndkEOXZXnjF5ZjdI4ZU0F+t7 leifj+00060AD478D6@sunet.se