fixes

Author: Chetan11-dev

bota/src/bota/vm.py

@@ -603,20 +603,40 @@ def read_file(path):
 def read_conf():
     return read_file("/etc/apache2/sites-available/000-default.conf")
 
+import re
+def clean_conf(apache_conf, root_path):
+    apache_conf = re.sub(r'ProxyPass\s+' + re.escape(root_path) + r'\s+.*\n', '', apache_conf)
+    apache_conf = re.sub(r'ProxyPassReverse\s+' + re.escape(root_path) + r'\s+.*\n', '', apache_conf)
+    # return apache_conf
+    return re.sub(r'[ \t]+</VirtualHost>', '</VirtualHost>', apache_conf)
+
+def sub_at_start(apache_conf, root_path, api_target):
+    return re.sub(
+            r'(<VirtualHost\b.*?>)', 
+            f'\\1\n    ProxyPass {root_path} {api_target}\n    ProxyPassReverse {root_path} {api_target}', 
+            apache_conf, 
+            count=1
+        )
 
-def make_apache_content():
-    return read_file("/etc/apache2/sites-available/000-default.conf")
+
+def sub_at_end(apache_conf, root_path, api_target):
+    return re.sub(r'</VirtualHost>', f'    ProxyPass {root_path} {api_target}\n    ProxyPassReverse {root_path} {api_target}\n</VirtualHost>', apache_conf)
+
+def make_apache_content(apache_conf, root_path, api_target):
+    # Remove existing ProxyPass and ProxyPassReverse directives for the root_path
+    apache_conf = clean_conf(apache_conf, root_path)
+
+    # Add new ProxyPass and ProxyPassReverse directives based on the root_path
+    if root_path == "/":
+        return remove_empty_lines(sub_at_end(apache_conf, root_path, api_target))
+    else:
+        # Add new directives right after the VirtualHost opening tag
+        return remove_empty_lines(sub_at_start(apache_conf, root_path, api_target))
 
 def setup_apache_load_balancer_desktop_app(port, api_base_path):
     root_path = api_base_path or '/'
-    apache_conf = f"""<VirtualHost *:80>
-    ServerAdmin webmaster@localhost
-    DocumentRoot /var/www/html
-    ErrorLog ${{APACHE_LOG_DIR}}/error.log
-    CustomLog ${{APACHE_LOG_DIR}}/access.log combined
-    ProxyPass {root_path} http://127.0.0.1:{port}{root_path}
-    ProxyPassReverse {root_path} http://127.0.0.1:{port}{root_path}
-</VirtualHost>"""
+    api_target = f"http://127.0.0.1:{port}{root_path}"
+    apache_conf = make_apache_content(read_conf(), root_path, api_target)
     write_file_sudo(apache_conf, "/etc/apache2/sites-available/000-default.conf")
 
 def validate_url(url):