saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added SSL verify flag for pillar git backend, in case getting around

Browse source 
self-signed certificates is needed.
This commit is contained in:
Jorge-Rodriguez 2013-12-02 10:40:11 +02:00
parent 343dc98025
commit ddf4c6dbe2
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
conf/master
View file

@ -186,7 +186,7 @@
# Allow minions to push files to the master. This is disabled by default, for
# security purposes.
#file_recv: False
#file_recv: False
##### Master Module Management #####
##########################################
@ -230,7 +230,7 @@
#
# If this is set to True the first newline after a Jinja block is removed
# (block, not variable tag!). Defaults to False, corresponds to the Jinja
# environment init variable "trim_blocks".
# environment init variable "trim_blocks".
# jinja_trim_blocks: False
#
# If this is set to True leading spaces and tabs are stripped from the start
@ -328,7 +328,7 @@
#
# Uncomment the line below if you do not want the file_server to follow
# symlinks when walking the filesystem tree. This is set to True
# by default. Currently this only applies to the default roots
# by default. Currently this only applies to the default roots
# fileserver_backend.
#
#fileserver_followsymlinks: False
@ -362,7 +362,7 @@
# environments.
# Note: file:// repos will be treated as a remote, so refs you want used must
# exist in that repo as *local* refs.
#
#
# The gitfs_root option gives the ability to serve files from a subdirectory
# within the repository. The path is defined relative to the root of the
# repository and defaults to the repository root.
@ -385,6 +385,13 @@
# - hiera: /etc/hiera.yaml
# - cmd_yaml: cat /etc/salt/yaml
# The pillar_gitfs_ssl_verify option specifies whether to ignore ssl certificate
# errors when contacting the pillar gitfs backend. You might want to set this to
# false if you're using a git backend that uses a self-signed certificate but
# keep in mind that setting this flag to anything other than the default of True
# is a security concern.
#pillar_gitfs_ssl_verify: True
# The pillar_opts option adds the master configuration file data to a dict in
# the pillar called "master". This is used to set simple configurations in the
# master config file that can then be used on minions.

7
salt/pillar/git_pillar.py
View file

@ -117,6 +117,13 @@ def init(branch, repo_location):
repo.create_remote('origin', repo_location)
except Exception:
pass
# ignore git ssl verification if requested
if __opts__.get('pillar_gitfs_ssl_verify', True):
repo.git.config('http.sslVerify', 'true')
else:
repo.git.config('http.sslVerify', 'false')
repo.git.fetch()
return repo