Linux-Help/formula-haproxy
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #40 from davidkarlsen/noPpaForUbuntu

Browse source 
this is no longer needed - haproxy 1.5.x in ubuntu repo
This commit is contained in:
Forrest 2015-12-27 11:10:19 -08:00
commit ff4a06b5b0
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
haproxy/install.sls
View file

@ -1,14 +1,3 @@
# Because on Ubuntu we don't have a current HAProxy in the usual repo, we add a PPA
{% if salt['grains.get']('osfullname') == 'Ubuntu' %}
haproxy_ppa_repo:
pkgrepo.managed:
- ppa: vbernat/haproxy-1.5
- require_in:
- pkg: haproxy.install
- watch_in:
- pkg: haproxy.install
{% endif %}
haproxy.install: haproxy.install:
pkg.installed: pkg.installed:
- name: haproxy - name: haproxy
@ -17,4 +6,4 @@ haproxy.install:
{% for item in salt['pillar.get']('haproxy:require') %} {% for item in salt['pillar.get']('haproxy:require') %}
- {{ item }} - {{ item }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}