X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;h=f4a119af1e93741c5b61cb4c39643aa42983c898;hb=cc380a1eeb2fd611cfb96574b44dd00e2e168b92;hp=9f64fd2209f8b48d48eaaace155dcd21ec05f846;hpb=df1daf91deb0cfd7bced1de96aac4358455138b1;p=max%2Fsaltfiles.git diff --git a/states/git/init.sls b/states/git/init.sls index 9f64fd2..f4a119a 100644 --- a/states/git/init.sls +++ b/states/git/init.sls @@ -15,6 +15,7 @@ include: 'core.excludesfile': '/home/' + grains['user'] + '/.gitignore', 'merge.tool': 'diffuse', 'merge.ff': 'true', + 'pull.rebase': 'false', 'push.default': 'simple', 'alias.lg': 'log --graph --pretty=format:\'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset\' --date=short', 'alias.hist': 'log --graph --full-history --all --pretty=format:\'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset\' --date=short', @@ -31,6 +32,10 @@ include: 'alias.r': 'rebase', 'alias.m': 'merge', 'alias.pa': '!git remote | xargs -L1 git push --all', + 'sendemail.smtpserver': 'mail.friedersdorff.com', + 'sendemail.smtpuser': 'max', + 'sendemail.smtpencryption': 'tls', + 'sendemail.smtpserverport': '587', } %} @@ -43,6 +48,24 @@ include: - user: {{ grains['user'] }} {% endfor %} +{% if grains['host'] in ["barium"] %} +work_email: + git.config_set: + - name: user.email + - value: >- + maximilian.friedersdorff@envsys.co.uk + - global: True + - user: {{ grains['user'] }} + +work_gpg: + git.config_set: + - name: user.signingkey + - value: >- + B3030EB2 + - global: True + - user: {{ grains['user'] }} +{% endif %} + global gitignore: file.managed: - name: {{ grains['homedir'] }}/.gitignore @@ -50,3 +73,14 @@ global gitignore: - mode: 644 - user: {{ grains['user'] }} - group: {{ grains['user'] }} + +git-prompt: + file.managed: + - name: {{ grains['homedir'] }}/.git-prompt.sh + - source: https://raw.githubusercontent.com/git/git/master/contrib/completion/git-prompt.sh + - mode: 644 + - user: {{ grains['user'] }} + - group: {{ grains['user'] }} + - skip_verify: True + +