Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

basessh: Make keyhelper explicit

Browse source 
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
This commit is contained in:
Patrick Uiterwijk 2019-04-08 18:56:01 +02:00
parent 4f3c609815
commit 27a21881d4
4 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inventory/group_vars/all
View file

@ -258,6 +258,7 @@ ipa_admin_password: "{{ ipa_prod_admin_password }}"
# Normal default sshd port is 22 # Normal default sshd port is 22
sshd_port: 22 sshd_port: 22
sshd_keyhelper: false
# List of names under which the host is available # List of names under which the host is available
ssh_hostnames: [] ssh_hostnames: []

1
inventory/group_vars/pagure
View file

@ -19,6 +19,7 @@ stunnel_source_port: 8088
stunnel_destination_port: 8080 stunnel_destination_port: 8080
sshd_config: ssh/sshd_config.pagure sshd_config: ssh/sshd_config.pagure
sshd_keyhelper: true
# These are consumed by a task in roles/fedmsg/base/main.yml # These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs: fedmsg_certs:

1
inventory/group_vars/pagure-stg
View file

@ -18,6 +18,7 @@ stunnel_source_port: 8088
stunnel_destination_port: 8080 stunnel_destination_port: 8080
sshd_config: ssh/sshd_config.pagure sshd_config: ssh/sshd_config.pagure
sshd_keyhelper: true
# These are consumed by a task in roles/fedmsg/base/main.yml # These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs: fedmsg_certs:

2
roles/basessh/templates/sshd_config
View file

@ -39,7 +39,7 @@ AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
AcceptEnv LC_IDENTIFICATION LC_ALL LANGUAGE AcceptEnv LC_IDENTIFICATION LC_ALL LANGUAGE
AcceptEnv XMODIFIERS AcceptEnv XMODIFIERS
{% if sshd_config == "pagure" %} {% if sshd_keyhelper %}
# For repospanner/git # For repospanner/git
AuthorizedKeysCommandUser git AuthorizedKeysCommandUser git
AuthorizedKeysCommand /usr/libexec/pagure/keyhelper.py "%u" "%h" "%t" "%f" AuthorizedKeysCommand /usr/libexec/pagure/keyhelper.py "%u" "%h" "%t" "%f"