X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;h=f4a119af1e93741c5b61cb4c39643aa42983c898;hb=73ca00607698df08e68a808e3a1addeb3c569a1d;hp=9d03b7d686b03545c04ed876a1765219c58d836d;hpb=3aa318a7dd5bb1751e53d397b4cf602c1633604e;p=max%2Fsaltfiles.git

diff --git a/states/git/init.sls b/states/git/init.sls
index 9d03b7d..f4a119a 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -32,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',
 }
 %}
 
@@ -44,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
@@ -51,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
+
+