瀏覽代碼

Merge pull request #158 from irtnog/fix-freebsd-gitpython-package

Use the py27-GitPython package when installing GitPython on FreeBSD
tags/v0.57.0
Brian Jackson 9 年之前
父節點
當前提交
e7e77d40d9
共有 3 個文件被更改,包括 5 次插入1 次删除
  1. +2
    -0
      salt/defaults.yaml
  2. +2
    -1
      salt/gitfs/gitpython.sls
  3. +1
    -0
      salt/map.jinja

+ 2
- 0
salt/defaults.yaml 查看文件

@@ -18,6 +18,8 @@ salt:
salt_api: salt-api
salt_ssh: salt-ssh

python_git: python-git

master:
gitfs_provider: gitpython


+ 2
- 1
salt/gitfs/gitpython.sls 查看文件

@@ -8,6 +8,7 @@ GitPython:
{% else %}

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

{% endif %}

+ 1
- 0
salt/map.jinja 查看文件

@@ -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',

Loading…
取消
儲存