cont.

Author: Leechael

custom-domain/dstack-ingress/scripts/certman.py

@@ -30,6 +30,9 @@ def install_plugin(self) -> bool:
             print(f"No certbot package defined for {self.provider_type}")
             return False
 
+        # First ensure certbot is installed in the current environment
+        self._ensure_certbot_in_env()
+
         # Check if plugin is already installed
         try:
             if self.provider.CERTBOT_PLUGIN == "dns-namecheap":
@@ -87,6 +90,10 @@ def install_plugin(self) -> bool:
             import pkg_resources
             print(f"Installed to Python: {sys.executable}")
 
+            # Show certbot location
+            certbot_exec = self._get_certbot_executable()
+            print(f"Using certbot: {certbot_exec}")
+            
             try:
                 dist = pkg_resources.get_distribution("certbot-dns-namecheap")
                 print(f"Package version: {dist.version} at {dist.location}")
@@ -102,7 +109,8 @@ def install_plugin(self) -> bool:
                 print(f"Plugin {self.provider.CERTBOT_PLUGIN} successfully imported")
 
                 # Test if plugin is recognized by certbot
-                test_cmd = ["certbot", "plugins"]
+                certbot_exec = self._get_certbot_executable()
+                test_cmd = [certbot_exec, "plugins"]
                 test_result = subprocess.run(test_cmd, capture_output=True, text=True, timeout=10)
 
                 if test_result.returncode == 0 and "dns-namecheap" in test_result.stdout:
@@ -127,7 +135,8 @@ def install_plugin(self) -> bool:
 
                         if force_result.returncode == 0:
                             # Test again after reinstall
-                            retest_result = subprocess.run(test_cmd, capture_output=True, text=True, timeout=10)
+                            retest_cmd = [certbot_exec, "plugins"]
+                            retest_result = subprocess.run(retest_cmd, capture_output=True, text=True, timeout=10)
                             if retest_result.returncode == 0 and "dns-namecheap" in retest_result.stdout:
                                 print(f"✓ Plugin registration fixed after reinstall")
                                 return True
@@ -147,12 +156,75 @@ def install_plugin(self) -> bool:
 
         return True
 
+    def _ensure_certbot_in_env(self) -> None:
+        """Ensure certbot is installed in the current Python environment."""
+        import sys
+        import shutil
+        
+        # Check if certbot is available in current environment
+        python_dir = os.path.dirname(sys.executable)
+        potential_certbot = os.path.join(python_dir, "certbot")
+        
+        if os.path.exists(potential_certbot):
+            print(f"Certbot already available in current environment: {potential_certbot}")
+            return
+        
+        # Try to import certbot to check if it's installed
+        try:
+            import certbot
+            print(f"Certbot module available in current environment")
+            return
+        except ImportError:
+            pass
+        
+        print(f"Installing certbot in current environment...")
+        try:
+            install_cmd = [sys.executable, "-m", "pip", "install", "certbot"]
+            print(f"Running: {' '.join(install_cmd)}")
+            result = subprocess.run(install_cmd, capture_output=True, text=True)
+            
+            if result.returncode == 0:
+                print(f"✓ Certbot installed successfully in current environment")
+            else:
+                print(f"Failed to install certbot: {result.stderr}")
+                # Continue anyway - system certbot might still work
+        except Exception as e:
+            print(f"Error installing certbot: {e}")
+            # Continue anyway - system certbot might still work
+    
+    def _get_certbot_executable(self) -> str:
+        """Get the correct certbot executable path that matches the Python environment."""
+        import sys
+        import shutil
+        
+        # Try to find certbot in the same environment as the current Python
+        python_dir = os.path.dirname(sys.executable)
+        potential_certbot = os.path.join(python_dir, "certbot")
+        
+        if os.path.exists(potential_certbot):
+            print(f"Found certbot in same environment: {potential_certbot}")
+            return potential_certbot
+        
+        # Try which certbot
+        certbot_path = shutil.which("certbot")
+        if certbot_path:
+            print(f"Found certbot via which: {certbot_path}")
+            return certbot_path
+        
+        # Fall back to system certbot
+        print(f"Falling back to system certbot command")
+        return "certbot"
+    
     def _debug_plugin_registration(self) -> None:
         """Debug why plugin is not being registered by certbot."""
         try:
             import pkg_resources
             print("=== Plugin Registration Debug ===")
 
+            # Show which certbot we're using
+            certbot_exec = self._get_certbot_executable()
+            print(f"Using certbot: {certbot_exec}")
+            
             # Check entry points
             try:
                 entry_points = list(pkg_resources.iter_entry_points('certbot.plugins'))
@@ -220,7 +292,9 @@ def _build_certbot_command(self, action: str, domain: str, email: str) -> List[s
         if not plugin:
             raise ValueError(f"No certbot plugin configured for {self.provider_type}")
 
-        base_cmd = ["certbot", action, "-a", plugin, "--non-interactive", "-v"]
+        # Use the same certbot executable as the Python environment
+        certbot_exec = self._get_certbot_executable()
+        base_cmd = [certbot_exec, action, "-a", plugin, "--non-interactive", "-v"]
 
         # Add credentials file if configured
         if self.provider.CERTBOT_CREDENTIALS_FILE: