bugfix HAProxy not initialized on new installations; fixed paths for …

…filelogs
fititnt · Nov 7, 2019 · 32ca5cf · 32ca5cf
1 parent 1d09570
commit 32ca5cf
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 16 deletions.
diff --git a/tasks/haproxy.yml b/tasks/haproxy.yml
@@ -2,6 +2,8 @@
 # FILE:            {{ role_path }}/tasks/haproxy.yml
 # LICENSE:         Public Domain
 
+# TODO: fix issue with at very first time HAProxy is not started after installation (fititnt, 2019-11-04 20:40 BRT)
+
 # https://haproxy.debian.net/#?distribution=Ubuntu&release=bionic&version=2.0
 
 - name: "add-apt-repository ppa:vbernat/haproxy-2.0"
@@ -14,6 +16,12 @@
     name: 'haproxy=2.0.*'
     state: 'present'
 
+- name: sudo systemctl enable haproxy.service
+  systemd:
+    name: haproxy
+    state: started
+    enabled: yes
+
 - name: /etc/haproxy/haproxy.cfg
   template:
     # src: "{{ role_path }}/templates/openresty/nginx/conf/nginx.conf.j2"

diff --git a/templates/alb-strategy/files-local.conf.j2 b/templates/alb-strategy/files-local.conf.j2
@@ -7,8 +7,8 @@ server {
     listen {{ alb_openresty_httpsport }} ssl;
     server_name {{ item.app_domain | default(alb_default_app_domain) }};
 
-    error_log  /var/log/app/{{ app_uid }}/error.log;
-    access_log  /var/log/app/{{ app_uid }}/access.log  main;
+    error_log  /var/log/app/{{ item.app_uid }}/error.log;
+    access_log  /var/log/app/{{ item.app_uid }}/access.log  main;
 
     location = /favicon.ico { access_log off; log_not_found off; }
     location = /robots.txt  { access_log off; log_not_found off; }
@@ -27,8 +27,8 @@ server {
 
     server_name {{ item.app_domain | default(alb_default_app_domain) }};
 
-    error_log  /var/log/app/{{ app_uid }}/error.log;
-    access_log  /var/log/app/{{ app_uid }}/access.log  main;
+    error_log  /var/log/app/{{ item.app_uid }}/error.log;
+    access_log  /var/log/app/{{ item.app_uid }}/access.log  main;
 
     location = /favicon.ico { access_log off; log_not_found off; }
     location = /robots.txt  { access_log off; log_not_found off; }

diff --git a/templates/alb-strategy/hello-world.conf.j2 b/templates/alb-strategy/hello-world.conf.j2
@@ -7,8 +7,8 @@ server {
     listen {{ alb_openresty_httpsport }} ssl;
     server_name {{ item.app_domain | default(alb_default_app_domain) }};
 
-    error_log  /var/log/app/{{ app_uid }}/error.log;
-    access_log  /var/log/app/{{ app_uid }}/access.log  main;
+    error_log  /var/log/app/{{ item.app_uid }}/error.log;
+    access_log  /var/log/app/{{ item.app_uid }}/access.log  main;
 
     location = /favicon.ico { access_log off; log_not_found off; }
     location = /robots.txt  { access_log off; log_not_found off; }
@@ -31,8 +31,8 @@ server {
 
     server_name {{ item.app_domain | default(alb_default_app_domain) }};
 
-    error_log  /var/log/app/{{ app_uid }}/error.log;
-    access_log  /var/log/app/{{ app_uid }}/access.log  main;
+    error_log  /var/log/app/{{ item.app_uid }}/error.log;
+    access_log  /var/log/app/{{ item.app_uid }}/access.log  main;
 
     location = /favicon.ico { access_log off; log_not_found off; }
     location = /robots.txt  { access_log off; log_not_found off; }

diff --git a/templates/alb-strategy/proxy.conf.j2 b/templates/alb-strategy/proxy.conf.j2
@@ -5,8 +5,8 @@ server {
     listen {{ alb_openresty_httpsport }} ssl;
     server_name  {{ item.app_domain | default(alb_default_app_domain) }};
 
-    error_log  /var/log/app/{{ app_uid }}/error.log;
-    access_log  /var/log/app/{{ app_uid }}/access.log  main;
+    error_log  /var/log/app/{{ item.app_uid }}/error.log;
+    access_log  /var/log/app/{{ item.app_uid }}/access.log  main;
 
     location = /favicon.ico { access_log off; log_not_found off; }
     location = /robots.txt  { access_log off; log_not_found off; }
@@ -40,8 +40,8 @@ server {
 
     server_name {{ item.app_domain | default(alb_default_app_domain) }};
 
-    error_log  /var/log/app/{{ app_uid }}/error.log;
-    access_log  /var/log/app/{{ app_uid }}/access.log  main;
+    error_log  /var/log/app/{{ item.app_uid }}/error.log;
+    access_log  /var/log/app/{{ item.app_uid }}/access.log  main;
 
     location = /favicon.ico { access_log off; log_not_found off; }
     location = /robots.txt  { access_log off; log_not_found off; }

diff --git a/templates/alb-strategy/socket-php.conf.j2 b/templates/alb-strategy/socket-php.conf.j2
@@ -6,8 +6,8 @@ server {
     listen {{ alb_openresty_httpsport }} ssl;
     server_name {{ item.app_domain | default(alb_default_app_domain) }};
 
-    error_log  /var/log/app/{{ app_uid }}/error.log;
-    access_log  /var/log/app/{{ app_uid }}/access.log  main;
+    error_log  /var/log/app/{{ item.app_uid }}/error.log;
+    access_log  /var/log/app/{{ item.app_uid }}/access.log  main;
 
     location = /favicon.ico { access_log off; log_not_found off; }
     location = /robots.txt  { access_log off; log_not_found off; }
@@ -46,8 +46,8 @@ server {
 
     server_name {{ item.app_domain | default(alb_default_app_domain) }};
 
-    error_log  /var/log/app/{{ app_uid }}/error.log;
-    access_log  /var/log/app/{{ app_uid }}/access.log  main;
+    error_log  /var/log/app/{{ item.app_uid }}/error.log;
+    access_log  /var/log/app/{{ item.app_uid }}/access.log  main;
 
     location = /favicon.ico { access_log off; log_not_found off; }
     location = /robots.txt  { access_log off; log_not_found off; }