From 5f7bd7bba6977e6c1c0c117b5a5a8a673964a4a2 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Tue, 17 Oct 2017 09:41:56 +0100 Subject: [PATCH] Remove buggy git submodule --- .gitmodules | 3 --- modules/config/manifests/git.pp | 12 +++++++----- modules/git | 1 - 3 files changed, 7 insertions(+), 9 deletions(-) delete mode 160000 modules/git diff --git a/.gitmodules b/.gitmodules index d9f62ae..d6fbe9b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,3 @@ [submodule "modules/stdlib"] path = modules/stdlib url = https://github.com/puppetlabs/puppetlabs-stdlib -[submodule "modules/git"] - path = modules/git - url = https://github.com/puppetlabs/puppetlabs-git diff --git a/modules/config/manifests/git.pp b/modules/config/manifests/git.pp index b53e244..951f6f3 100644 --- a/modules/config/manifests/git.pp +++ b/modules/config/manifests/git.pp @@ -1,13 +1,15 @@ class config::git { - file { '/home/jake/.gitignore_global': + $global_gitignore = '/home/jake/.config/.gitignore' + + file { $global_gitignore: ensure => file, mode => '0644', source => 'puppet:///modules/config/gitignore_global' } - git::config { 'global ignore' : - key => 'core.excludesfile', - value => '/home/jake/.gitignore_global', - user => 'jake' + -> exec { "install global git config": + command => "git config --global core.excludesfile '$global_gitignore'", + user => 'jake', + unless => 'git config --global core.excludesfile' } } diff --git a/modules/git b/modules/git deleted file mode 160000 index 4e4498e..0000000 --- a/modules/git +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4e4498e3db218cefc27e40b7eb4e442177ccab28