Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the py27-GitPython package when installing GitPython on FreeBSD #158

Merged
merged 4 commits into from
Jul 24, 2015
Merged

Use the py27-GitPython package when installing GitPython on FreeBSD #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85a426c
Add new `salt:python_git` key.
xenophonf Jul 24, 2015
b477990
Use the py27-GitPython package when installing GitPython on FreeBSD.
xenophonf Jul 24, 2015
ef275bd
Allow customizing the GitPython package name.
xenophonf Jul 24, 2015
ea5a9f1
Merge remote-tracking branch 'upstream/master' into fix-freebsd-gitpy…
xenophonf Jul 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions salt/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ salt:
salt_api: salt-api
salt_ssh: salt-ssh

python_git: python-git

master:
gitfs_provider: gitpython

Expand Down
3 changes: 2 additions & 1 deletion salt/gitfs/gitpython.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ GitPython:
{% else %}

python-git:
pkg.installed
pkg.installed:
- name: {{ salt_settings.python_git }}

{% endif %}
1 change: 1 addition & 0 deletions salt/map.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ that differ from whats in defaults.yaml
'salt_cloud': 'py27-salt',
'salt_api': 'py27-salt',
'salt_ssh': 'py27-salt',
'python_git': 'py27-GitPython',
'config_path': '/usr/local/etc/salt',
'minion_service': 'salt_minion',
'master_service': 'salt_master',
Expand Down