Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

Cleanup and make closer to the PR submitted for the mainline salt repo master config file

This commit is contained in:
Brad Thurber 2016-04-20 15:10:55 -04:00
parent c4ef48c5e8
commit 939aa37028
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/files/gitfs_key.jinja
View File

@ -1 +1 @@
{{ pillar['salt']['gitfs']['keys'][key][type] }} {{ pillar['salt']['gitfs']['keys'][key][type] }}

25
salt/files/master.d/f_defaults.conf
View File

@ -710,26 +710,25 @@ fileserver_backend:
# Along with gitfs_user, is used to authenticate to HTTPS remotes. # Along with gitfs_user, is used to authenticate to HTTPS remotes.
# This parameter is not required if the repository does not use authentication. # This parameter is not required if the repository does not use authentication.
{{ get_config('gitfs_password', 'mypassword') }} {{ get_config('gitfs_password', '') }}
# By default, Salt will not authenticate to an HTTP (non-HTTPS) remote. # By default, Salt will not authenticate to an HTTP (non-HTTPS) remote.
# This parameter enables authentication over HTTP. Enable this at your own risk. # This parameter enables authentication over HTTP. Enable this at your own risk.
{{ get_config('gitfs_insecure_auth', 'False') }} {{ get_config('gitfs_insecure_auth', 'False') }}
# Along with gitfs_privkey (and optionally gitfs_passphrase), is used to authenticate # Along with gitfs_privkey (and optionally gitfs_passphrase), is used to
# to SSH remotes. This parameter (or its per-remote counterpart) is required for SSH remotes. # authenticate to SSH remotes. This parameter (or its per-remote counterpart)
{{ get_config('gitfs_pubkey', '/path/to/key.pub') }} # is required for SSH remotes.
{{ get_config('gitfs_pubkey', '') }}
# Along with gitfs_pubkey (and optionally gitfs_passphrase), is used to authenticate # Along with gitfs_pubkey (and optionally gitfs_passphrase), is used to
# to SSH remotes. This parameter (or its per-remote counterpart) is required for SSH remotes. # authenticate to SSH remotes. This parameter (or its per-remote counterpart)
{{ get_config('gitfs_privkey', '/path/to/key') }} # is required for SSH remotes.
{{ get_config('gitfs_privkey', '') }}
# This parameter is optional, required only when the SSH key being used to # This parameter is optional, required only when the SSH key being used to
# authenticate is protected by a passphrase. # authenticate is protected by a passphrase.
{{ get_config('gitfs_passphrase', 'mypassphrase') }} {{ get_config('gitfs_passphrase', '') }}
# Along with gitfs_user, is used to authenticate to HTTPS remotes.
# This parameter is not required if the repository does not use authentication.
# When using the git fileserver backend at least one git remote needs to be # When using the git fileserver backend at least one git remote needs to be
# defined. The user running the salt master will need read access to the repo. # defined. The user running the salt master will need read access to the repo.
@ -945,11 +944,11 @@ ext_pillar:
# Along with git_pillar_privkey (and optionally git_pillar_passphrase), # Along with git_pillar_privkey (and optionally git_pillar_passphrase),
# is used to authenticate to SSH remotes. # is used to authenticate to SSH remotes.
{{ get_config('git_pillar_pubkey', '/path/to/key.pub') }} {{ get_config('git_pillar_pubkey', '') }}
# Along with git_pillar_pubkey (and optionally git_pillar_passphrase), # Along with git_pillar_pubkey (and optionally git_pillar_passphrase),
# is used to authenticate to SSH remotes. # is used to authenticate to SSH remotes.
{{ get_config('git_pillar_privkey', '/path/to/key') }} {{ get_config('git_pillar_privkey', '') }}
# This parameter is optional, required only when the SSH key being used # This parameter is optional, required only when the SSH key being used
# to authenticate is protected by a passphrase. # to authenticate is protected by a passphrase.

2
salt/gitfs/keys.sls
View File

@ -17,4 +17,4 @@ gitfs-key-{{ key }}-{{ type }}:
key: {{ key }} key: {{ key }}
type: {{ type }} type: {{ type }}
{%- endfor %} {%- endfor %}
{%- endfor %} {%- endfor %}