redactor
This commit is contained in:
@@ -2,50 +2,45 @@ from flask import Blueprint, render_template, request
|
||||
import subprocess
|
||||
from auth.auth_middleware import requires_auth
|
||||
|
||||
|
||||
edit_bp = Blueprint('edit', __name__)
|
||||
|
||||
|
||||
@edit_bp.route('/edit', methods=['GET', 'POST'])
|
||||
@requires_auth
|
||||
def edit_haproxy_config():
|
||||
if request.method == 'POST':
|
||||
edited_config = request.form['haproxy_config']
|
||||
# Save the edited config to the haproxy.cfg file
|
||||
with open('/etc/haproxy/haproxy.cfg', 'w') as f:
|
||||
f.write(edited_config)
|
||||
|
||||
check_output = ""
|
||||
|
||||
if 'save_check' in request.form:
|
||||
# Run haproxy -c -V -f to check the configuration
|
||||
check_result = subprocess.run(['haproxy', '-c', '-V', '-f', '/etc/haproxy/haproxy.cfg'], capture_output=True, text=True)
|
||||
check_output = check_result.stdout
|
||||
|
||||
# Check if there was an error, and if so, append it to the output
|
||||
if check_result.returncode != 0:
|
||||
error_message = check_result.stderr
|
||||
check_output += f"\n\nError occurred:\n{error_message}"
|
||||
|
||||
if check_result.returncode == 0:
|
||||
error_message = check_result.stderr
|
||||
check_output += f"\n\nConfiguration OK. You can restart."
|
||||
|
||||
elif 'save_reload' in request.form:
|
||||
# Run haproxy -c -V -f to check the configuration
|
||||
check_result = subprocess.run(['haproxy', '-c', '-V', '-f', '/etc/haproxy/haproxy.cfg'], capture_output=True, text=True)
|
||||
check_output = check_result.stdout
|
||||
|
||||
# Check if there was an error, and if so, append it to the output
|
||||
if check_result.returncode != 0:
|
||||
error_message = check_result.stderr
|
||||
check_output += f"\n\nError occurred:\n{error_message}"
|
||||
else:
|
||||
# Try to reload HAProxy - support both Docker (supervisor) and systemd
|
||||
reload_success = False
|
||||
reload_output = ""
|
||||
|
||||
# Method 1: Supervisor with sudo (Docker)
|
||||
try:
|
||||
supervisor_result = subprocess.run(['pkill', '-f', 'haproxy'], capture_output=True, text=True, timeout=10)
|
||||
if supervisor_result.returncode == 0:
|
||||
reload_output = f"\n\n✓ HAProxy Restarted via Supervisor:\n{supervisor_result.stdout}"
|
||||
reload_output = f"\n\n HAProxy Restarted via Supervisor:\n{supervisor_result.stdout}"
|
||||
reload_success = True
|
||||
print(f"[HAPROXY] Supervisor restart successful", flush=True)
|
||||
except Exception as e:
|
||||
@@ -54,7 +49,6 @@ def edit_haproxy_config():
|
||||
|
||||
return render_template('edit.html', config_content=edited_config, check_output=check_output)
|
||||
|
||||
# GET request - Read the current contents of haproxy.cfg
|
||||
try:
|
||||
with open('/etc/haproxy/haproxy.cfg', 'r') as f:
|
||||
config_content = f.read()
|
||||
|
||||
Reference in New Issue
Block a user