Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
haproxy-formula
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
salt
haproxy-formula
Commits
3b37f733
Unverified
Commit
3b37f733
authored
6 years ago
by
Niels Abspoel
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #79 from kjkeane/kjkeane-patch-1
Add log-tag and log-send-hostname
parents
fa77a391
2661a95e
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
haproxy/templates/haproxy.jinja
+6
-0
6 additions, 0 deletions
haproxy/templates/haproxy.jinja
pillar.example
+4
-0
4 additions, 0 deletions
pillar.example
with
10 additions
and
0 deletions
haproxy/templates/haproxy.jinja
+
6
−
0
View file @
3b37f733
...
...
@@ -30,6 +30,12 @@ global
{%- else %}
log /dev/log local0
log /dev/log local1 notice
{%- endif %}
{%- if salt['pillar.get']('haproxy:global:log-tag') %}
log-tag {{ salt['pillar.get']('haproxy:global:log-tag', 'haproxy') }}
{%- endif %}
{%- if salt['pillar.get']('haproxy:global:log-send-hostname') %}
log-send-hostname {{ salt['pillar.get']('haproxy:global:log-send-hostname') }}
{%- endif %}
user {{ salt['pillar.get']('haproxy:global:user', 'haproxy') }}
group {{ salt['pillar.get']('haproxy:global:group', 'haproxy') }}
...
...
This diff is collapsed.
Click to expand it.
pillar.example
+
4
−
0
View file @
3b37f733
...
...
@@ -17,6 +17,10 @@ haproxy:
log:
- 127.0.0.1 local2
- 127.0.0.1 local1 notice
# Option log-tag parameter, sets the tag field in the syslog header
log-tag: haproxy
# Optional log-send-hostname parameter, sets the hostname field in the syslog header
log-send-hostname: localhost
stats:
enable: True
socketpath: /var/lib/haproxy/stats
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment