comparison modules/vcs/manifests/init.pp @ 306:894390fdd6d7

Make sure that the right keyring back-ends are installed
author IBBoard <dev@ibboard.co.uk>
date Sat, 22 Feb 2020 16:22:57 +0000
parents c16c977760c3
children fa2747b27bb4
comparison
equal deleted inserted replaced
305:38e35360a390 306:894390fdd6d7
4 "git" 4 "git"
5 ]: 5 ]:
6 ensure => installed 6 ensure => installed
7 } 7 }
8 python::pip { 'mercurial-keyring': 8 python::pip { 'mercurial-keyring':
9 ensure => 'present',
10 }
11 # Alt keyrings are insecure, but a) we're on a limited access server and
12 # b) I share the Mecurial config with the desktop, which uses the system
13 # keyring rather than
14 #
15 # [backend]
16 # default-keyring=keyrings.alt.file.PlaintextKeyring
17 python::pip { 'keyrings.alt':
9 ensure => 'present', 18 ensure => 'present',
10 } 19 }
11 file { '/etc/bash_completion.d/git-prompt.sh': 20 file { '/etc/bash_completion.d/git-prompt.sh':
12 ensure => 'link', 21 ensure => 'link',
13 target => '/usr/share/git-core/contrib/completion/git-prompt.sh', 22 target => '/usr/share/git-core/contrib/completion/git-prompt.sh',
15 } 24 }
16 25
17 class vcs::client inherits vcs { 26 class vcs::client inherits vcs {
18 realize(Package["mercurial"], 27 realize(Package["mercurial"],
19 Python::Pip["mercurial-keyring"], 28 Python::Pip["mercurial-keyring"],
29 Python::Pip["keyrings.alt"],
20 Package["git"]) 30 Package["git"])
21 } 31 }
22 32
23 class vcs::server inherits vcs { 33 class vcs::server inherits vcs {
24 realize(Package["mercurial"], 34 realize(Package["mercurial"],