fixes

Author: Chetan11-dev

bota/src/bota/apache_utils.py

@@ -0,0 +1,33 @@
+
+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 collapse_empty_lines(conf: str) -> str:
+    # Replace multiple consecutive newlines (with optional whitespace) with a single newline
+    return re.sub(r'\n\s*\n+', '\n\n', conf.strip()) + '\n'
+
+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 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 collapse_empty_lines(sub_at_end(apache_conf, root_path, api_target))
+    else:
+        # Add new directives right after the VirtualHost opening tag
+        return collapse_empty_lines(sub_at_start(apache_conf, root_path, api_target))

bota/src/bota/vm.py

@@ -5,6 +5,8 @@
 import requests
 from requests.exceptions import ReadTimeout
 import traceback
+
+from .apache_utils import make_apache_content
 def find_ip(attempts=5, proxy=None) -> str:
     """Finds the public IP address of the current connection."""
     url = 'https://checkip.amazonaws.com/'
@@ -603,40 +605,6 @@ 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 collapse_empty_lines(conf: str) -> str:
-    # Replace multiple consecutive newlines (with optional whitespace) with a single newline
-    return re.sub(r'\n\s*\n+', '\n\n', conf.strip()) + '\n'
-
-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 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 collapse_empty_lines(sub_at_end(apache_conf, root_path, api_target))
-    else:
-        # Add new directives right after the VirtualHost opening tag
-        return collapse_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 '/'
     api_target = f"http://127.0.0.1:{port}{root_path}"