From 0a09e14abaebaf63e818b128f05262b23265d009 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Nov 17 2020 12:55:42 +0000 Subject: Merge branch 'hellcp/pagure-info' into 'production' Add ssh keys and admin email See merge request infra/salt!449 --- diff --git a/salt/profile/pagure/files/pagure.cfg b/salt/profile/pagure/files/pagure.cfg index 8d74a3f..200079a 100644 --- a/salt/profile/pagure/files/pagure.cfg +++ b/salt/profile/pagure/files/pagure.cfg @@ -29,6 +29,9 @@ FEDMSG_NOTIFICATIONS = False ### The FAS group in which the admin of pagure are #ADMIN_GROUP = ['sysadmin-main'] +# The publicly visible admin email address +ADMIN_EMAIL = 'admin@opensuse.org' + ### Hard-coded list of global admins PAGURE_ADMIN_USERS = ['hellcp', 'Pharaoh_Atem'] @@ -156,7 +159,13 @@ GL_BINDIR = None ### The ssh certificates of the git server to be provided to the user ### /!\ format is important -# SSH_KEYS = {'RSA': {'fingerprint': '', 'pubkey': ''}} +SSH_KEYS = { + 'RSA': { + 'fingerprint': '3072 5d:dc:89:7f:bf:02:5b:e9:ec:9d:5d:bc:ad:7e:5c:5e (RSA)', + 'pubkey': 'code.opensuse.org,195.135.221.140,2001:67c:2178:8:0:0:0:16 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDXCk+ToHsNvFMO1b0FrO4wiWLPtmNNiXkupXf2hjPGWSexe1FjjjLp2/zjQb8a8srzaF5AFGUX9cOFGRpXa0j53h/q91nNcUVpaiy0I3cCXQbLwVeiPBPmDYjpTbAl0cHYfVQvF8W++VU9SABUfe+yq/OADFKCYVMjYV8gTvtFFpqbIh6YGLELZ/SwHid9HgspA9TSS6jPjDuP89xkCb14m52P47a9h5n9wEHfdOvqcV3MJd2wprJAUM9Ulz+EXydHPh8cNE1wZu5H78yKAQgAHCeMqWy/6FNmp/dU6OJ/ARfkMCXDQwrJd0fm31Zer5bcVkZdALcGOeggL7d2P7+FC7cCkPa5aeU1kpNCMoOXcR5/zra9ssaskHUXwTRODOMlK3YpJON0vx5/NLr6SrN4EQv3dBJS1qrDEpqhxZCqMk1jY1i4ixGDyIEO0ESEI/J57SqhWOvGUNRpweWg/JNKRfdJ6gF7KJsjfOyDQzdyCBZiMu61roKXsG0/FPqPEHE=', + 'SHA256': 'SHA256:1Y2KdDQqRvkv+CGKU4+m4qpkZps0s/qFB5i7FndsBDA', + } +} @@ -220,7 +229,7 @@ REDIS_DB = 0 # Default: ``local``. PAGURE_AUTH = 'openid' -FAS_OPENID_ENDPOINT = 'https://id.opensuse.org/openid' +FAS_OPENID_ENDPOINT = 'https://www.opensuse.org/openid/' # When this is set to True, the session cookie will only be returned to the # server via ssl (https). If you connect to the server via plain http, the