n8n container deployment improvement

plogical/DockerSites.py

@@ -782,6 +782,7 @@ services:
 
     def setup_n8n_data_directory(self):
         """Helper method to create and set up n8n data directory with proper permissions"""
+        try:
             # Create base n8n data directory
             base_dir = f"/home/docker/{self.data['finalURL']}/n8n_data"
             command = f"mkdir -p {base_dir}"
@@ -812,46 +813,64 @@ services:
             # Create necessary directories
             required_dirs = [
                 f"{base_dir}/.n8n",
+                f"{base_dir}/.n8n/.n8n",
                 f"{base_dir}/.n8n/database",
                 f"{base_dir}/.n8n/workflows",
                 f"{base_dir}/.n8n/credentials"
             ]
 
+            # Create directories and set ownership/permissions
             for directory in required_dirs:
                 command = f"mkdir -p {directory}"
                 ProcessUtilities.executioner(command)
                 
-        # Write config directly to the config file
+                command = f"chown -R 1000:1000 {directory}"
-        config_file = f"{base_dir}/.n8n/.n8n/config"
-        
-        # Ensure parent directory exists
-        command = f"mkdir -p {base_dir}/.n8n/.n8n"
                 ProcessUtilities.executioner(command)
                 
-        # Write config file
+                command = f"chmod 755 {directory}"
-        with open(config_file, 'w') as f:
+                ProcessUtilities.executioner(command)
+
+            # Write config to a temporary file first
+            temp_config = f'/home/cyberpanel/{str(randint(1000, 9999))}-config.json'
+            with open(temp_config, 'w') as f:
                 json.dump(config_content, f, indent=2)
 
-        # Set ownership recursively
+            # Set proper ownership and permissions on temp file
-        command = f"chown -R 1000:1000 {base_dir}"
+            command = f"chown 1000:1000 {temp_config}"
             ProcessUtilities.executioner(command)
 
-        # Set directory permissions
+            command = f"chmod 644 {temp_config}"
-        command = f"find {base_dir} -type d -exec chmod 755 {{}} \\;"
             ProcessUtilities.executioner(command)
 
-        # Set file permissions
+            # Move config to final location
-        command = f"find {base_dir} -type f -exec chmod 644 {{}} \\;"
+            config_file = f"{base_dir}/.n8n/.n8n/config"
+            command = f"mv {temp_config} {config_file}"
             ProcessUtilities.executioner(command)
 
             # Create empty .gitignore to prevent permission issues
             command = f"touch {base_dir}/.n8n/.gitignore"
             ProcessUtilities.executioner(command)
+            
             command = f"chown 1000:1000 {base_dir}/.n8n/.gitignore"
             ProcessUtilities.executioner(command)
+            
             command = f"chmod 644 {base_dir}/.n8n/.gitignore"
             ProcessUtilities.executioner(command)
 
+            # Final permission check on the entire directory
+            command = f"chown -R 1000:1000 {base_dir}"
+            ProcessUtilities.executioner(command)
+
+            command = f"find {base_dir} -type d -exec chmod 755 {{}} \\;"
+            ProcessUtilities.executioner(command)
+
+            command = f"find {base_dir} -type f -exec chmod 644 {{}} \\;"
+            ProcessUtilities.executioner(command)
+
+        except BaseException as msg:
+            logging.writeToFile(f'Error in setup_n8n_data_directory: {str(msg)}')
+            raise
+
     def DeployN8NContainer(self):
         try:
             # Initialize container state tracking