Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/309608
Change subject: puppetmaster: Ship a gitconfig file ...................................................................... puppetmaster: Ship a gitconfig file We want to have denyCurrentBranch set to ignore on frontend puppetmasters, Change-Id: I1d3bc687e128ee2ff9208e4591f8840b30b7356e --- A modules/puppetmaster/files/git/private/gitconfig-master M modules/puppetmaster/manifests/gitclone.pp 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/08/309608/1 diff --git a/modules/puppetmaster/files/git/private/gitconfig-master b/modules/puppetmaster/files/git/private/gitconfig-master new file mode 100644 index 0000000..7310488 --- /dev/null +++ b/modules/puppetmaster/files/git/private/gitconfig-master @@ -0,0 +1,7 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true +[receive] + denyCurrentBranch = ignore diff --git a/modules/puppetmaster/manifests/gitclone.pp b/modules/puppetmaster/manifests/gitclone.pp index ea98407..5852c3e 100644 --- a/modules/puppetmaster/manifests/gitclone.pp +++ b/modules/puppetmaster/manifests/gitclone.pp @@ -129,6 +129,13 @@ mode => '0550', require => File['/srv/private'] } + file { '/srv/private/.git/config': + source => 'puppet:///modules/puppetmaster/git/private/git-config-master', + owner => 'gitpuppet', + group => 'gitpuppet', + mode => '0550', + require => File['/srv/private'] + } } else { puppetmaster::gitprivate { '/srv/private': bare => true, -- To view, visit https://gerrit.wikimedia.org/r/309608 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d3bc687e128ee2ff9208e4591f8840b30b7356e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits