From 190452473b532818b6b2321e8dac51c4bcd87582 Mon Sep 17 00:00:00 2001
From: Alex <caskd@420blaze.it>
Date: Thu, 21 May 2020 20:20:43 +0200
Subject: [PATCH] Update some vars and add other ones

---
 tasks/main.yml            | 2 +-
 templates/haproxy.conf.j2 | 8 ++++----
 vars/main.yml             | 7 -------
 3 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 vars/main.yml

diff --git a/tasks/main.yml b/tasks/main.yml
index bf97fca..ed09ae2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,6 +1,6 @@
 - name: Copy HAProxy files
   loop:
-        - { src: 'haproxy.conf.j2', dest: '/etc/haproxy/haproxy.cfg' }
+        - { src: 'haproxy.conf.j2', dest: '{{ haproxy.config }}' }
   template:
         follow: yes
         src: "{{ item.src }}"
diff --git a/templates/haproxy.conf.j2 b/templates/haproxy.conf.j2
index 8a0d54a..777cb36 100644
--- a/templates/haproxy.conf.j2
+++ b/templates/haproxy.conf.j2
@@ -1,7 +1,7 @@
 global
   maxconn 2048
   maxconnrate 40
-  unix-bind prefix /run/haproxy user nobody group nogroup
+  unix-bind prefix {{ haproxy.socketroot }} user {{ haproxy.user }} group {{ haproxy.group }}
 
 defaults
   mode http
@@ -29,7 +29,7 @@ resolvers local
   hold nx              100ms
   hold timeout         3s
   hold valid           5s
-{% for entry in services.haproxy.ports.tcp %}
+{% for entry in haproxy.ports.tcp %}
 
 listen {{ entry.group }}
   mode tcp
@@ -47,7 +47,7 @@ frontend http
 
   acl root url /
 
-{% for domains in services.haproxy.public %}
+{% for domains in haproxy.public %}
   use_backend backend-{{ domains.service }} if { hdr_beg(host) -i {{ domains.domain }} }
 {% endfor %}
 
@@ -56,7 +56,7 @@ frontend http
   http-response set-header X-Content-Type-Options nosniff
   http-response set-header Referrer-Policy no-referrer-when-downgrade
   http-response set-header Strict-Transport-Security max-age=31536000;\ includeSubDomains;\ preload
-{% for domains in services.haproxy.public %}
+{% for domains in haproxy.public %}
 
 backend backend-{{ domains.service }}
   server-template {{ domains.service }} 1 _{{ domains.service }}._tcp.redxen.localhost
diff --git a/vars/main.yml b/vars/main.yml
deleted file mode 100644
index e80e80f..0000000
--- a/vars/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-apt_packages:
-        - { package: "haproxy", state: present }
-systemd:
-        services:
-                - { name: "haproxy", enabled: true, action: reloaded, daemon_reload: true}
-        overrides:
-                - "haproxy"