X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;h=91c9baebbb82e81dccefbd13784d690c0344179a;hb=2f7cd5306fd779e6194554c4137ac18b3efe6632;hp=3dfc0f51426f27d7224f962f4c683d500799fc30;hpb=05549b0607b711ac7b51eb05fed77f364979035f;p=max%2Fsaltfiles.git

diff --git a/states/git/init.sls b/states/git/init.sls
index 3dfc0f5..91c9bae 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -8,7 +8,6 @@ include:
   'color.status': 'always',
   'color.interactive': 'always',
   'color.diff': 'true',
-  'diff.external': 'difft',
   'user.name': 'Maximilian Friedersdorff',
   'user.email': 'max@friedersdorff.com',
   'user.signingkey': 'F5E7FCB3',
@@ -49,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