From 849a4b0f3e92d43828c29549e265f929f0bce5b2 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Oct 28 2020 22:36:18 +0000 Subject: Merge branch 'hellcp/pagure-bugs' into 'production' Fix config bugs See merge request infra/salt!446 --- diff --git a/pillar/role/pagure.sls b/pillar/role/pagure.sls index aeaa4e1..1b83633 100644 --- a/pillar/role/pagure.sls +++ b/pillar/role/pagure.sls @@ -10,8 +10,8 @@ sshd_config: type: User: git options: - AuthorizedKeysCommand /usr/lib/pagure/keyhelper.py "%u" "%h" "%t" "%f" - AuthorizedKeysCommandUser git + AuthorizedKeysCommand: /usr/lib/pagure/keyhelper.py "%u" "%h" "%t" "%f" + AuthorizedKeysCommandUser: git profile: pagure: diff --git a/salt/profile/pagure/files/pagure.cfg b/salt/profile/pagure/files/pagure.cfg index 373739c..282eb5b 100644 --- a/salt/profile/pagure/files/pagure.cfg +++ b/salt/profile/pagure/files/pagure.cfg @@ -183,7 +183,7 @@ IP_ALLOWED_INTERNAL = ['127.0.0.1', 'localhost', '::1'] # here what the URL of the eventsource server is, for example: # https://ev.pagure.io or https://pagure.io:8080 or whatever you are using # (Note: the urls sent to it start with a '/' so no need to add one yourself) -EVENTSOURCE_SOURCE = https://ev.opensuse.org +EVENTSOURCE_SOURCE = 'https://ev.opensuse.org' # Port where the event source server is running (maybe be the same port # as the one specified in EVENTSOURCE_SOURCE or a different one if you # have something running in front of the server such as apache or stunnel).