From ff529be07f67eec2c32a4dc8cd196664fc3fb355 Mon Sep 17 00:00:00 2001
From: jknapp <jknapp85@gmail.com>
Date: Fri, 21 Feb 2025 06:28:51 -0800
Subject: [PATCH] Fix Templates from causing errors with haproxy when added,
 Fix add notice when haproxy fails check

---
 haproxy_manager.py                    | 18 +++++++++++++-----
 templates/hap_backend.tpl             |  3 ++-
 templates/hap_header.tpl              |  3 ++-
 templates/hap_letsencrypt_backend.tpl |  2 +-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/haproxy_manager.py b/haproxy_manager.py
index 44ecfcf..c4e349c 100644
--- a/haproxy_manager.py
+++ b/haproxy_manager.py
@@ -174,9 +174,9 @@ def request_ssl():
 
     # Request Let's Encrypt certificate
     result = subprocess.run([
-        'certbot', 'certonly', '--standalone',
-        '--preferred-challenges', 'http',
-        '-d', domain, '--non-interactive --http-01-port=8688'
+        'certbot', 'certonly', '-n', '--standalone',
+        '--preferred-challenges', 'http', '--http-01-port=8688',
+        '-d', domain 
     ])
 
     if result.returncode == 0:
@@ -364,7 +364,11 @@ def generate_config():
                         capture_output=True,
                         text=True
                     )
-                    print("HAProxy started successfully")
+                    if result.returncode == 0:
+                        print("HAProxy started successfully")
+                    else:
+                        print(f"HAProxy start command returned: {result.stdout}")
+                        print(f"Error output: {result.stderr}")
                 except subprocess.CalledProcessError as e:
                     print(f"Failed to start HAProxy: {e.stdout}\n{e.stderr}")
                     raise
@@ -383,7 +387,11 @@ def start_haproxy():
                 capture_output=True,
                 text=True
             )
-            print("HAProxy started successfully")
+            if result.returncode == 0:
+                print("HAProxy started successfully")
+            else:
+                print(f"HAProxy start command returned: {result.stdout}")
+                print(f"Error output: {result.stderr}")
         except subprocess.CalledProcessError as e:
             print(f"Failed to start HAProxy: {e.stdout}\n{e.stderr}")
             raise
diff --git a/templates/hap_backend.tpl b/templates/hap_backend.tpl
index 60d0236..367e566 100644
--- a/templates/hap_backend.tpl
+++ b/templates/hap_backend.tpl
@@ -3,4 +3,5 @@ backend {{ name }}-backend
     option forwardfor
     http-request add-header X-CLIENT-IP %[src]
     {% if ssl_enabled %}http-request set-header X-Forwarded-Proto https if { ssl_fc }{% endif %}
-    {% for server in servers %}server {{ server.server_name }} {{ server.server_address }}:{{ server.server_port }} {{ server.server_options }}{% endfor %}
\ No newline at end of file
+    {% for server in servers %}server {{ server.server_name }} {{ server.server_address }}:{{ server.server_port }} {{ server.server_options }}{% endfor %}
+    
\ No newline at end of file
diff --git a/templates/hap_header.tpl b/templates/hap_header.tpl
index ddb26b9..d08f06e 100644
--- a/templates/hap_header.tpl
+++ b/templates/hap_header.tpl
@@ -45,4 +45,5 @@ defaults
     timeout server          10m
     timeout http-keep-alive 120s
     timeout check           10s
-    maxconn                 3000
\ No newline at end of file
+    maxconn                 3000
+    
\ No newline at end of file
diff --git a/templates/hap_letsencrypt_backend.tpl b/templates/hap_letsencrypt_backend.tpl
index 8868023..da30c87 100644
--- a/templates/hap_letsencrypt_backend.tpl
+++ b/templates/hap_letsencrypt_backend.tpl
@@ -1,4 +1,4 @@
 
 #Pass SSL Requests to Lets Encrypt
 backend letsencrypt-backend
-    server letsencrypt 127.0.0.1:8688
\ No newline at end of file
+    server letsencrypt 127.0.0.1:8688