github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v4.5.0.0 

Changelog: https://haproxy-wi.org/changelog.py#4_5
pull/246/head
Pavel Loginov 2020-09-23 09:57:26 +06:00
parent f959cc61f2
commit 1212285a20
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/ansible/roles/haproxy/tasks/main.yml
View File

@ -17,6 +17,7 @@
yum: yum:
name: epel-release name: epel-release
state: latest state: latest
disable_gpg_check: yes
when: (ansible_facts['os_family'] == "RedHat" or ansible_facts['os_family'] == 'CentOS') and HAPVER|length > 0 when: (ansible_facts['os_family'] == "RedHat" or ansible_facts['os_family'] == 'CentOS') and HAPVER|length > 0
ignore_errors: yes ignore_errors: yes
environment: environment:
@ -30,6 +31,7 @@
- http://repo.haproxy-wi.org/haproxy-{{HAPVER}}.el{{ansible_facts['distribution_major_version']}}.x86_64.rpm - http://repo.haproxy-wi.org/haproxy-{{HAPVER}}.el{{ansible_facts['distribution_major_version']}}.x86_64.rpm
- socat - socat
state: present state: present
disable_gpg_check: yes
when: (ansible_facts['os_family'] == "RedHat" or ansible_facts['os_family'] == 'CentOS') and HAPVER|length > 0 when: (ansible_facts['os_family'] == "RedHat" or ansible_facts['os_family'] == 'CentOS') and HAPVER|length > 0
ignore_errors: yes ignore_errors: yes
register: install_result register: install_result

3
app/scripts/ansible/roles/haproxy/templates/haproxy.service.j2
View File

@ -5,7 +5,8 @@ After=network.target
[Service] [Service]
EnvironmentFile=-/etc/default/haproxy EnvironmentFile=-/etc/default/haproxy
EnvironmentFile=-/etc/sysconfig/haproxy EnvironmentFile=-/etc/sysconfig/haproxy
Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid" "EXTRAOPTS=-S /run/haproxy-master.sock" Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid" {% if ansible_facts['distribution_major_version'] != '8' %}"EXTRAOPTS=-S /run/haproxy-master.sock"{% endif %}
ExecStartPre=/sbin/haproxy -f $CONFIG -c -q $EXTRAOPTS ExecStartPre=/sbin/haproxy -f $CONFIG -c -q $EXTRAOPTS
ExecStart=/sbin/haproxy -Ws -f $CONFIG -p $PIDFILE $EXTRAOPTS ExecStart=/sbin/haproxy -Ws -f $CONFIG -p $PIDFILE $EXTRAOPTS
ExecReload=/sbin/haproxy -f $CONFIG -c -q $EXTRAOPTS ExecReload=/sbin/haproxy -f $CONFIG -c -q $EXTRAOPTS