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

Moved consul registry address to config

Browse source
This commit is contained in:
Eric Renfro 2018-05-17 21:43:17 -04:00
parent 560ed8d972
commit 9f2a542f43
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fabio/defaults.yaml
View file

@ -9,8 +9,8 @@ fabio:
group: fabio group: fabio
config_file: /etc/fabio/fabio.cfg config_file: /etc/fabio/fabio.cfg
consul_address: localhost:8500
data_dir: /var/fabio data_dir: /var/fabio
config: config:
proxy.addr: :80,:9999 proxy.addr: :9999
registry.consul.addr: localhost:8500

2
fabio/files/fabio.service
View file

@ -5,7 +5,7 @@ After=network.target
[Service] [Service]
EnvironmentFile=-/etc/{% if grains['os_family'] == 'Debian' %}default{% else %}sysconfig{% endif %}/fabio EnvironmentFile=-/etc/{% if grains['os_family'] == 'Debian' %}default{% else %}sysconfig{% endif %}/fabio
ExecStart=/usr/local/bin/fabio -cfg {{ config_file }} -registry.consul.addr {{ consul_address }} ExecStart=/usr/local/bin/fabio -cfg {{ config_file }}
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
User={{ user }} User={{ user }}
Group={{ group }} Group={{ group }}

1
fabio/service.sls
View file

@ -27,7 +27,6 @@ fabio-init-file:
user: {{ fabio.user }} user: {{ fabio.user }}
group: {{ fabio.group }} group: {{ fabio.group }}
config_file: {{ fabio.config_file }} config_file: {{ fabio.config_file }}
consul_address: {{ fabio.consul_address }}
- mode: 0644 - mode: 0644
{%- elif salt['test.provider']('service') == 'upstart' %} {%- elif salt['test.provider']('service') == 'upstart' %}
- source: salt://{{ slspath }}/files/fabio.upstart - source: salt://{{ slspath }}/files/fabio.upstart