diff --git a/salt/files/gitfs_key.jinja b/salt/files/gitfs_key.jinja index 9d11fbb..7c33128 100644 --- a/salt/files/gitfs_key.jinja +++ b/salt/files/gitfs_key.jinja @@ -1 +1 @@ -{{ pillar['salt']['gitfs']['keys'][key][type] }} \ No newline at end of file +{{ pillar['salt']['gitfs']['keys'][key][type] }} diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf index fbec0a9..8a38d85 100644 --- a/salt/files/master.d/f_defaults.conf +++ b/salt/files/master.d/f_defaults.conf @@ -710,26 +710,25 @@ fileserver_backend: # Along with gitfs_user, is used to authenticate to HTTPS remotes. # 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. # This parameter enables authentication over HTTP. Enable this at your own risk. {{ get_config('gitfs_insecure_auth', 'False') }} -# Along with gitfs_privkey (and optionally gitfs_passphrase), is used to authenticate -# to SSH remotes. This parameter (or its per-remote counterpart) is required for SSH remotes. -{{ get_config('gitfs_pubkey', '/path/to/key.pub') }} +# Along with gitfs_privkey (and optionally gitfs_passphrase), is used to +# authenticate to SSH remotes. This parameter (or its per-remote counterpart) +# is required for SSH remotes. +{{ get_config('gitfs_pubkey', '') }} -# Along with gitfs_pubkey (and optionally gitfs_passphrase), is used to authenticate -# to SSH remotes. This parameter (or its per-remote counterpart) is required for SSH remotes. -{{ get_config('gitfs_privkey', '/path/to/key') }} +# Along with gitfs_pubkey (and optionally gitfs_passphrase), is used to +# authenticate to SSH remotes. This parameter (or its per-remote counterpart) +# is required for SSH remotes. +{{ get_config('gitfs_privkey', '') }} # This parameter is optional, required only when the SSH key being used to # authenticate is protected by a passphrase. -{{ get_config('gitfs_passphrase', 'mypassphrase') }} - -# Along with gitfs_user, is used to authenticate to HTTPS remotes. -# This parameter is not required if the repository does not use authentication. +{{ get_config('gitfs_passphrase', '') }} # 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. @@ -945,11 +944,11 @@ ext_pillar: # Along with git_pillar_privkey (and optionally git_pillar_passphrase), # 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), # 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 # to authenticate is protected by a passphrase. diff --git a/salt/gitfs/keys.sls b/salt/gitfs/keys.sls index badc467..338046b 100644 --- a/salt/gitfs/keys.sls +++ b/salt/gitfs/keys.sls @@ -17,4 +17,4 @@ gitfs-key-{{ key }}-{{ type }}: key: {{ key }} type: {{ type }} {%- endfor %} -{%- endfor %} \ No newline at end of file +{%- endfor %}