xiaji/django.remote
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完善了bug，修改了nginx的静态文件和权限问题。

Browse Source
This commit is contained in:
xiaji
2025-09-07 14:24:17 +08:00
parent 99fbfdc732
commit 329cc85c87
3 changed files with 668 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
nginx_tab.py
View File

@@ -421,6 +421,11 @@ class NginxTab(QWidget):
self.download_site_config_btn.clicked.connect(self.download_site_config)
site_config_btn_layout.addWidget(self.download_site_config_btn)
# 添加静态文件映射按钮
self.add_static_mappings_btn = QPushButton("添加静态文件映射")
self.add_static_mappings_btn.clicked.connect(self.add_static_mappings)
site_config_btn_layout.addWidget(self.add_static_mappings_btn)
# 修改为Unix socket连接按钮
self.modify_to_unix_socket_btn = QPushButton("修改为Unix Socket连接")
self.modify_to_unix_socket_btn.clicked.connect(self.modify_to_unix_socket)
@@ -858,15 +863,25 @@ http {
server_config = next(iter(config.values()))
username = server_config.get('username', '')
project_name = server_config.get('project', '')
remote_dir = server_config.get('remote_dir', '')
git_url = server_config.get('git_url', '')
# 从git_url中提取项目名（.git前的值）
if git_url:
# 提取git_url中最后一个/和.git之间的部分
if '/' in git_url:
git_project_name = git_url.split('/')[-1]
if git_project_name.endswith('.git'):
git_project_name = git_project_name[:-4] # 移除.git后缀
else:
git_project_name = 'webstatus' # 默认值
else:
git_project_name = 'webstatus' # 默认值
# 根据要求构建静态文件路径
# BASE_DIR = Path(__file__).resolve().parent.parent
# STATIC_ROOT = BASE_DIR / "static"
# MEDIA_ROOT = BASE_DIR / "media"
# 在实际路径中，这对应于项目目录下的static和media文件夹
static_path = f"{remote_dir}/{project_name}/static"
media_path = f"{remote_dir}/{project_name}/media"
# 静态文件结构为: /home/[username]/[git_url中的项目名]/[project]/static
# 媒体文件结构为: /home/[username]/[git_url中的项目名]/[project]/media
static_path = f"/home/{username}/{git_project_name}/static"
media_path = f"/home/{username}/{git_project_name}/media"
# 获取当前配置内容
current_config = self.site_config_editor.toPlainText()
@@ -874,14 +889,14 @@ http {
# 检查是否已经包含静态文件映射
if "location /static/" not in current_config:
# 添加静态文件映射配置
static_mapping = f"\n # 静态文件映射 (STATIC_ROOT = BASE_DIR / \"static\")\n"
static_mapping = f"\n # 静态文件映射 (路径: /home/{username}/{git_project_name}/{project_name}/static)\n"
static_mapping += f" location /static/ {{\n"
static_mapping += f" alias {static_path}/;\n"
static_mapping += f" expires 30d;\n"
static_mapping += f" }}\n"
# 添加媒体文件映射配置
static_mapping += f"\n # 媒体文件映射 (MEDIA_ROOT = BASE_DIR / \"media\")\n"
static_mapping += f"\n # 媒体文件映射 (路径: /home/{username}/{git_project_name}/{project_name}/media)\n"
static_mapping += f" location /media/ {{\n"
static_mapping += f" alias {media_path}/;\n"
static_mapping += f" expires 30d;\n"
@@ -931,7 +946,7 @@ http {
project_name = 'webstatus' # 默认值
# 构建Unix socket路径
unix_socket_path = f"unix:/home/{username}/{project_name}/sock/gunicorn.sock"
unix_socket_path = f"http://unix:/home/{username}/{project_name}/sock/gunicorn.sock"
# 获取当前配置内容
current_config = self.site_config_editor.toPlainText()
@@ -939,7 +954,7 @@ http {
# 查找并替换proxy_pass的值
import re
# 使用正则表达式匹配proxy_pass行
pattern = r'(\s+proxy_pass\s+)http://[^;]+;'
pattern = r'(\s+proxy_pass\s+)(http://[^;]+|unix:[^;]+);'
replacement = f'\1{unix_socket_path};'
new_config = re.sub(pattern, replacement, current_config)
@@ -1082,7 +1097,13 @@ http {
f"sudo chown -R {username}:www-data /home/{username}/{project_name}",
f"sudo chmod g+x /home/{username}/{project_name}",
f"sudo chown -R {username}:www-data /home/{username}/{project_name}/sock",
f"sudo chmod -R 770 /home/{username}/{project_name}/sock"
f"sudo chmod -R 770 /home/{username}/{project_name}/sock",
# 修复/home/xiaji目录权限
f"sudo chmod o+r /home/{username}",
# 修复后验证权限（应显示drwxr-xr-x）
f"ls -ld /home/{username}",
# 验证www-data能否正常访问目录
f"sudo -u www-data ls /home/{username}/{project_name}/static/admin/css/"
]
# 创建并启动权限设置线程