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
5c299064
Commit
5c299064
authored
7 years ago
by
Mathieu Massé
Browse files
Options
Downloads
Patches
Plain Diff
Add optional extra arguments to the stats socket
parent
e4e6b28b
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
README.rst
+1
-1
1 addition, 1 deletion
README.rst
haproxy/templates/haproxy.jinja
+1
-1
1 addition, 1 deletion
haproxy/templates/haproxy.jinja
pillar.example
+2
-0
2 additions, 0 deletions
pillar.example
with
4 additions
and
2 deletions
README.rst
+
1
−
1
View file @
5c299064
...
@@ -35,7 +35,7 @@ Currently, only a handful of options can be set using the pillar:
...
@@ -35,7 +35,7 @@ Currently, only a handful of options can be set using the pillar:
- Global
- Global
+ stats: enable stats, curently only via a unix socket which can be set to a path with custom permissions
+ stats: enable stats, cur
r
ently only via a unix socket which can be set to a path with custom permissions
and optional extra bind arguments
+ user: sets the user haproxy shall run as
+ user: sets the user haproxy shall run as
+ group: sets the group haproxy shall run as
+ group: sets the group haproxy shall run as
+ chroot: allows you to turn on chroot and set a directory
+ chroot: allows you to turn on chroot and set a directory
...
...
This diff is collapsed.
Click to expand it.
haproxy/templates/haproxy.jinja
+
1
−
1
View file @
5c299064
...
@@ -40,7 +40,7 @@ global
...
@@ -40,7 +40,7 @@ global
daemon
daemon
{%- endif %}
{%- endif %}
{%- if salt['pillar.get']('haproxy:global:stats:enable', 'no') == True %}
{%- if salt['pillar.get']('haproxy:global:stats:enable', 'no') == True %}
stats socket {{ salt['pillar.get']('haproxy:global:stats:socketpath', '/tmp/ha_stats.sock') }} mode {{ salt['pillar.get']('haproxy:global:stats:mode', '660') }} level {{ salt['pillar.get']('haproxy:global:stats:level', 'operator') }}
stats socket {{ salt['pillar.get']('haproxy:global:stats:socketpath', '/tmp/ha_stats.sock') }} mode {{ salt['pillar.get']('haproxy:global:stats:mode', '660') }} level {{ salt['pillar.get']('haproxy:global:stats:level', 'operator') }}
{% if 'extra' in salt['pillar.get']('haproxy:global:stats', {}) %} {{ salt['pillar.get']('haproxy:global:stats:extra') }}{% endif %}
{%- endif %}
{%- endif %}
{%- if 'maxconn' in salt['pillar.get']('haproxy:global', {}) %}
{%- if 'maxconn' in salt['pillar.get']('haproxy:global', {}) %}
maxconn {{ salt['pillar.get']('haproxy:global:maxconn') }}
maxconn {{ salt['pillar.get']('haproxy:global:maxconn') }}
...
...
This diff is collapsed.
Click to expand it.
pillar.example
+
2
−
0
View file @
5c299064
...
@@ -22,6 +22,8 @@ haproxy:
...
@@ -22,6 +22,8 @@ haproxy:
socketpath: /var/lib/haproxy/stats
socketpath: /var/lib/haproxy/stats
mode: 660
mode: 660
level: admin
level: admin
# Optional extra bind parameter, for example to set the owner/group on the socket file
extra: user haproxy group haproxy
ssl-default-bind-ciphers: "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384"
ssl-default-bind-ciphers: "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384"
ssl-default-bind-options: "no-sslv3 no-tlsv10 no-tlsv11"
ssl-default-bind-options: "no-sslv3 no-tlsv10 no-tlsv11"
...
...
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