Merge pull request #6 from ebotzol/ssl_verification
Ssl verification option
diff --git a/README.rst b/README.rst
index 30a03d9..838165b 100644
--- a/README.rst
+++ b/README.rst
@@ -28,6 +28,19 @@
name: jdoe
email: j@doe.com
+GIT with user and SSL setup
+
+.. code-block:: yaml
+
+ git:
+ client:
+ disable_ssl_verification: True
+ enabled: true
+ user:
+ - user:
+ name: jdoe
+ email: j@doe.com
+
Reclass with GIT with user setup
.. code-block:: yaml
@@ -38,6 +51,18 @@
user:
- user: ${linux:system:user:jdoe}
+Reclass with GIT with user and SSL setup
+
+.. code-block:: yaml
+
+ git:
+ client:
+ disable_ssl_verification: True
+ enabled: true
+ user:
+ - user: ${linux:system:user:jdoe}
+
+
Read more
=========
diff --git a/git/client.sls b/git/client.sls
index e457770..a3c1900 100644
--- a/git/client.sls
+++ b/git/client.sls
@@ -34,6 +34,19 @@
{%- endif %}
+{%- if client.disable_ssl_verification == True %}
+
+set_git_ssl_verification_off:
+ git.config.set:
+ - user: {{ user.user.name }}
+ - name: http.sslVerify
+ - value: "false"
+ - global: True
+ - require:
+ - user: system_user_{{ user.user.name }}
+
+{%- endif %}
+
{%- endfor %}
{%- endif %}
diff --git a/git/map.jinja b/git/map.jinja
index fc3f51e..7a84819 100644
--- a/git/map.jinja
+++ b/git/map.jinja
@@ -1,23 +1,22 @@
{%- set client = salt['grains.filter_by']({
+ 'default': {
+ 'disable_ssl_verification': False,
+ 'user': [],
+ },
'Arch': {
'pkgs': ['git'],
- 'user': [],
},
'Debian': {
'pkgs': ['git-core'],
- 'user': [],
},
'Gentoo': {
'pkgs': ['dev-vcs/git'],
- 'user': [],
},
'MacOS': {
'pkgs': ['git'],
- 'user': [],
},
'RedHat': {
'pkgs': ['git'],
- 'user': [],
},
-}, merge=salt['pillar.get']('git:client')) %}
+}, merge=salt['pillar.get']('git:client'), base='default') %}
diff --git a/tests/pillar/client_single.sls b/tests/pillar/client_single.sls
index b4a0035..87507ec 100644
--- a/tests/pillar/client_single.sls
+++ b/tests/pillar/client_single.sls
@@ -1,6 +1,7 @@
git:
client:
enabled: true
+ disable_ssl_verification: True
user:
- user:
name: jdoe