InPanel 1.2.5__tar.gz → 1.2.6__tar.gz

{inpanel-1.2.5 → inpanel-1.2.6}/InPanel.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: InPanel
-Version: 1.2.5
-Summary: InPanel - A Web-based Linux Server Management Tool
+Version: 1.2.6
+Summary: InPanel - A Server Management Tool
 Author-email: Jackson Dou <jksdou@qq.com>
 Maintainer-email: Jackson Dou <jksdou@qq.com>
 License: BSD 3-Clause License

{inpanel-1.2.5 → inpanel-1.2.6}/InPanel.egg-info/SOURCES.txt

@@ -50,6 +50,7 @@ inpanel/mod/nginx.py
 inpanel/mod/package.py
 inpanel/mod/package_apt.py
 inpanel/mod/package_base.py
+inpanel/mod/package_brew.py
 inpanel/mod/package_dnf.py
 inpanel/mod/package_map.py
 inpanel/mod/package_yum.py
@@ -63,6 +64,7 @@ inpanel/mod/query.py
 inpanel/mod/remote.py
 inpanel/mod/server.py
 inpanel/mod/service.py
+inpanel/mod/service_manager.py
 inpanel/mod/setting.py
 inpanel/mod/shell.py
 inpanel/mod/ssh.py
@@ -93,6 +95,7 @@ inpanel/public/js/controllers/site.js
 inpanel/public/js/controllers/utils.js
 inpanel/public/lib/angular/1.0.2/angular-resource.min.js
 inpanel/public/lib/angular/1.0.2/angular.min.js
+inpanel/public/lib/angular/1.0.8/angular.min.js
 inpanel/public/lib/bootstrap/css/bootstrap-theme.css
 inpanel/public/lib/bootstrap/css/bootstrap-theme.css.map
 inpanel/public/lib/bootstrap/css/bootstrap-theme.min.css
@@ -125,22 +128,22 @@ inpanel/public/partials/secure.html
 inpanel/public/partials/setting.html
 inpanel/public/partials/sorry.html
 inpanel/public/partials/container/index.html
+inpanel/public/partials/container/directives/message.html
+inpanel/public/partials/container/directives/navbar.html
+inpanel/public/partials/container/directives/selector.html
+inpanel/public/partials/container/directives/srvbase.html
+inpanel/public/partials/container/directives/srvext.html
+inpanel/public/partials/container/directives/srvfile.html
+inpanel/public/partials/container/directives/srvinstall.html
+inpanel/public/partials/container/directives/srvlog.html
+inpanel/public/partials/container/directives/srvminiop.html
+inpanel/public/partials/container/directives/srvuninstall.html
+inpanel/public/partials/container/directives/srvupdate.html
 inpanel/public/partials/database/index.html
 inpanel/public/partials/database/mysql/dbedit.html
 inpanel/public/partials/database/mysql/dbnew.html
 inpanel/public/partials/database/mysql/useredit.html
 inpanel/public/partials/database/mysql/usernew.html
-inpanel/public/partials/directives/message.html
-inpanel/public/partials/directives/navbar.html
-inpanel/public/partials/directives/selector.html
-inpanel/public/partials/directives/srvbase.html
-inpanel/public/partials/directives/srvext.html
-inpanel/public/partials/directives/srvfile.html
-inpanel/public/partials/directives/srvinstall.html
-inpanel/public/partials/directives/srvlog.html
-inpanel/public/partials/directives/srvminiop.html
-inpanel/public/partials/directives/srvuninstall.html
-inpanel/public/partials/directives/srvupdate.html
 inpanel/public/partials/ecs/account.html
 inpanel/public/partials/ecs/ecs.html
 inpanel/public/partials/ecs/index.html
@@ -214,6 +217,19 @@ inpanel/public/partials/utils/user.html
 inpanel/public/templates/index.html
 inpanel/public/templates/file/preview.html
 inpanel/templates/__init__.py
+inpanel/templates/services/__init__.py
+inpanel/templates/services/_common.json
+inpanel/templates/services/categories.json
+inpanel/templates/services/database.json
+inpanel/templates/services/ftp.json
+inpanel/templates/services/http.json
+inpanel/templates/services/java.json
+inpanel/templates/services/mail.json
+inpanel/templates/services/nodejs.json
+inpanel/templates/services/php.json
+inpanel/templates/services/security.json
+inpanel/templates/services/storage.json
+inpanel/templates/services/system.json
 inpanel/templates/sources/__init__.py
 inpanel/templates/sources/apt.json
 inpanel/templates/sources/brew.json

{inpanel-1.2.5 → inpanel-1.2.6}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: InPanel
-Version: 1.2.5
-Summary: InPanel - A Web-based Linux Server Management Tool
+Version: 1.2.6
+Summary: InPanel - A Server Management Tool
 Author-email: Jackson Dou <jksdou@qq.com>
 Maintainer-email: Jackson Dou <jksdou@qq.com>
 License: BSD 3-Clause License

{inpanel-1.2.5 → inpanel-1.2.6}/inpanel/app.py

@@ -247,16 +247,16 @@ def cmd_uninstall(args=None):
     print('Uninstalling InPanel...')
 
     # 移除 systemd 服务
-    if os.path.exists(systemd_service):
+    if Path(systemd_service).exists():
         try:
             subprocess.run(['systemctl', 'stop', 'inpanel'], stderr=subprocess.DEVNULL)
             subprocess.run(['systemctl', 'disable', 'inpanel'], stderr=subprocess.DEVNULL)
         except Exception:
             pass
-        os.remove(systemd_service)
+        Path(systemd_service).unlink()
         print(f'  removed: {systemd_service}')
-    if os.path.exists(systemd_service_etc):
-        os.remove(systemd_service_etc)
+    if Path(systemd_service_etc).exists():
+        Path(systemd_service_etc).unlink()
         print(f'  removed: {systemd_service_etc}')
     try:
         subprocess.run(['systemctl', 'daemon-reload'], stderr=subprocess.DEVNULL)
@@ -264,7 +264,7 @@ def cmd_uninstall(args=None):
         pass
 
     # 移除 init.d 脚本
-    if os.path.exists(initd_script):
+    if Path(initd_script).exists():
         try:
             subprocess.run(['chkconfig', '--del', 'inpanel'], stderr=subprocess.DEVNULL)
         except Exception:
@@ -273,12 +273,12 @@ def cmd_uninstall(args=None):
             subprocess.run(['update-rc.d', '-f', 'inpanel', 'remove'], stderr=subprocess.DEVNULL)
         except Exception:
             pass
-        os.remove(initd_script)
+        Path(initd_script).unlink()
         print(f'  removed: {initd_script}')
 
     # 移除二进制文件 / 控制台脚本
-    if os.path.exists(bin_path):
-        os.remove(bin_path)
+    if Path(bin_path).exists():
+        Path(bin_path).unlink()
         print(f'  removed: {bin_path}')
 
     # 通过 pip 移除 Python 包
@@ -298,18 +298,18 @@ def cmd_uninstall(args=None):
                 print(f'  removed: {pkg_path}')
 
     # 移除配置文件（可选）
-    if purge_config and config_path and os.path.exists(config_path):
+    if purge_config and config_path and Path(config_path).exists():
         shutil.rmtree(config_path, ignore_errors=True)
         print(f'  removed: {config_path} (config files)')
 
     # 移除日志文件（可选）
-    if purge_logs and logging_path and os.path.exists(logging_path):
+    if purge_logs and logging_path and Path(logging_path).exists():
         shutil.rmtree(logging_path, ignore_errors=True)
         print(f'  removed: {logging_path} (log files)')
 
-    pidfile_dir = os.path.dirname(pidfile)
-    if os.path.exists(pidfile):
-        os.remove(pidfile)
+    pidfile_dir = str(Path(pidfile).parent)
+    if Path(pidfile).exists():
+        Path(pidfile).unlink()
 
     print()
     print('InPanel uninstalled successfully.')
@@ -381,6 +381,7 @@ def run_server():
         (r'/api/sources/pip/(.+?)(?:/(.+))?', web.RepoPipHandler),
         (r'/api/sources/docker/(.+?)(?:/(.+))?', web.RepoDockerHandler),
         (r'/api/sources/supported/?', web.RepoSupportedHandler),
+        (r'/api/service/(.+?)(?:/(.+))?', web.ServiceHandler),
         (r'/api/firewall/(.+)', web.FirewallHandler),
         (r'/api/setting/(.+)', web.SettingHandler),
         (r'/api/operation/(.+)', web.OperationHandler),

{inpanel-1.2.5 → inpanel-1.2.6}/inpanel/base.py

@@ -8,7 +8,6 @@
 '''InPanel 基础信息模块'''
 
 import sys
-import os
 from pathlib import Path
 from platform import mac_ver, platform, uname, win32_ver
 
@@ -41,8 +40,8 @@ __author__ = 'Jackson Dou'
 __license__ = 'BSD'
 
 app_name    = 'InPanel'
-releasetime = '2026-07-18'
-DEBUG       = False
+releasetime = '2026-07-22'
+DEBUG       = True
 COMMENTFLAG = '#INPANEL#'
 GENBY       = 'AUTOMATICALLY GENERATED BY INPANEL'
 

{inpanel-1.2.5 → inpanel-1.2.6}/inpanel/mod/acme.py

@@ -14,7 +14,6 @@ from binascii import unhexlify
 from hashlib import sha256
 from json import dumps, loads
 from pathlib import Path
-import os
 from subprocess import PIPE, STDOUT, Popen
 from time import sleep
 
@@ -229,7 +228,7 @@ class ACME():
                 wellknown_url = "http://{0}/.well-known/acme-challenge/{1}".format(domain, token)
                 assert(disable_check or self._request(wellknown_url)[0] == key_auth)
             except (AssertionError, ValueError) as e:
-                os.remove(wellknown_path)
+                Path(wellknown_path).unlink()
                 raise ValueError("Wrote file to {0}, but couldn't download {1}: {2}".format(
                     wellknown_path, wellknown_url, e))
 

{inpanel-1.2.5 → inpanel-1.2.6}/inpanel/mod/apt.py

@@ -13,7 +13,6 @@
 '''
 
 import json
-import os
 import re
 import time
 from pathlib import Path
@@ -38,12 +37,12 @@ from ..base import config_path
 
 def _get_sources_file():
     conf_dir = str(config_path).rstrip('/')
-    return os.path.join(conf_dir, 'sources_apt.json')
+    return str(Path(conf_dir) / 'sources_apt.json')
 
 
 def _load_sources_config():
     filepath = _get_sources_file()
-    if os.path.isfile(filepath):
+    if Path(filepath).is_file():
         try:
             with open(filepath, 'r', encoding='utf-8') as f:
                 data = json.load(f)
@@ -58,10 +57,10 @@ def _load_sources_config():
 
 def _save_sources_config(sources):
     filepath = _get_sources_file()
-    conf_dir = os.path.dirname(filepath)
-    if not os.path.isdir(conf_dir):
+    conf_dir = str(Path(filepath).parent)
+    if not Path(conf_dir).is_dir():
         try:
-            os.makedirs(conf_dir, exist_ok=True)
+            Path(conf_dir).mkdir(parents=True, exist_ok=True)
         except OSError:
             pass
     try:
@@ -153,7 +152,7 @@ def get_list():
         if Path(sources_list_path).exists():
             res.append('sources.list')
         if Path(sources_list_d_path).exists() and Path(sources_list_d_path).is_dir():
-            items = sorted(os.listdir(sources_list_d_path))
+            items = sorted(p.name for p in Path(sources_list_d_path).iterdir())
             for item in items:
                 if item.endswith('.list'):
                     res.append('sources.list.d/' + item)

{inpanel-1.2.5 → inpanel-1.2.6}/inpanel/mod/brew.py

@@ -17,7 +17,6 @@
 '''
 
 import json
-import os
 import time
 from pathlib import Path
 from subprocess import getstatusoutput
@@ -40,12 +39,12 @@ _BREW_BUILTIN_MIRRORS = _cfg['brew_builtin_mirrors']
 
 def _get_sources_file():
     conf_dir = str(config_path).rstrip('/')
-    return os.path.join(conf_dir, 'sources_brew.json')
+    return str(Path(conf_dir) / 'sources_brew.json')
 
 
 def _load_sources_config():
     filepath = _get_sources_file()
-    if os.path.isfile(filepath):
+    if Path(filepath).is_file():
         try:
             with open(filepath, 'r', encoding='utf-8') as f:
                 data = json.load(f)
@@ -60,10 +59,10 @@ def _load_sources_config():
 
 def _save_sources_config(sources):
     filepath = _get_sources_file()
-    conf_dir = os.path.dirname(filepath)
-    if not os.path.isdir(conf_dir):
+    conf_dir = str(Path(filepath).parent)
+    if not Path(conf_dir).is_dir():
         try:
-            os.makedirs(conf_dir, exist_ok=True)
+            Path(conf_dir).mkdir(parents=True, exist_ok=True)
         except OSError:
             pass
     try:

{inpanel-1.2.5 → inpanel-1.2.6}/inpanel/mod/certificate.py

@@ -13,14 +13,13 @@ from shutil import copy
 from subprocess import PIPE, Popen
 
 from . import file
-import os
 from .acme import ACME
 
 
 class Certificate():
 
     def __init__(self):
-        # self.path_current = os.path.dirname(os.path.abspath(__file__))
+        # self.path_current = str(Path(__file__).resolve().parent)
         self.path_home = '/etc/inpanel/certs/'
         self.path_acc = str(Path(self.path_home) / 'client.key')
         self.path_crt = str(Path(self.path_home) / 'crt')
@@ -142,7 +141,7 @@ class Certificate():
             cmd.extend(['-reqexts', 'SAN', '-config', conf_tmp])
         out = self._cmd(cmd, err_msg="Create csr error")
         if conf_tmp is not None and Path(conf_tmp).exists():
-            os.remove(conf_tmp)
+            Path(conf_tmp).unlink()
         if out is None:
             return {'code': -1, 'msg': 'csr_create_error'}
         else:

{inpanel-1.2.5 → inpanel-1.2.6}/inpanel/mod/disk.py

@@ -310,6 +310,90 @@ def fstab(devname, config=None):
                            devname=devname, config=config)
 
 
+# ------------------------------------------------------------------
+# 异步任务函数（由 web.py 的 _dispatch_task 调用）
+# 命名规则：disk_<method>，对应 jobname 中的 disk_<method>_...
+# ------------------------------------------------------------------
+
+from . import shell
+
+
+async def disk_swap(tm, action, devname):
+    """启用/停用 swap（异步任务）"""
+    jobname = f'disk.swap_{action}_{devname}'
+    if not tm._start_job(jobname):
+        return
+
+    action_str = {'on': '启用', 'off': '停用'}
+    tm._update_job(jobname, 2, f'正在{action_str.get(action, action)} {devname}...')
+
+    if action == 'on':
+        cmd = f'swapon /dev/{devname}'
+    else:
+        cmd = f'swapoff /dev/{devname}'
+
+    result, output = await shell.async_command(cmd)
+    if result == 0:
+        tm._finish_job(jobname, 0, f'{action_str.get(action, action)} {devname} 成功！')
+    else:
+        tm._finish_job(jobname, -1,
+                       f'{action_str.get(action, action)} {devname} 失败！',
+                       data=output.strip().replace('\n', '<br>'))
+
+
+async def disk_mount(tm, action, devname, mountpoint, fstype):
+    """挂载/卸载磁盘（异步任务）"""
+    jobname = f'disk.mount_{action}_{devname}'
+    if not tm._start_job(jobname):
+        return
+
+    action_str = {'mount': '挂载', 'umount': '卸载'}
+    tm._update_job(jobname, 2, f'正在{action_str.get(action, action)} {devname} 到 {mountpoint}...')
+
+    if action == 'mount':
+        fstab(devname, {
+            'devname': devname,
+            'mount': mountpoint,
+            'fstype': fstype,
+        })
+        cmd = f'mount -t {fstype} /dev/{devname} {mountpoint}'
+    else:
+        cmd = f'umount /dev/{devname}'
+
+    result, output = await shell.async_command(cmd)
+    if result == 0:
+        tm._finish_job(jobname, 0, f'{action_str.get(action, action)} {devname} 成功！')
+    else:
+        tm._finish_job(jobname, -1,
+                       f'{action_str.get(action, action)} {devname} 失败！',
+                       data=output.strip().replace('\n', '<br>'))
+
+
+async def disk_format(tm, devname, fstype):
+    """格式化磁盘（异步任务）"""
+    jobname = f'disk.format_{devname}'
+    if not tm._start_job(jobname):
+        return
+
+    tm._update_job(jobname, 2, f'正在格式化 {devname}，可能需要较长时间，请耐心等候...')
+
+    if fstype in ('ext2', 'ext3', 'ext4'):
+        cmd = f'mkfs.{fstype} -F /dev/{devname}'
+    elif fstype in ('xfs', 'reiserfs', 'btrfs'):
+        cmd = f'mkfs.{fstype} -f /dev/{devname}'
+    elif fstype == 'swap':
+        cmd = f'mkswap -f /dev/{devname}'
+    else:
+        cmd = f'mkfs.{fstype} /dev/{devname}'
+
+    result, output = await shell.async_command(cmd)
+    if result == 0:
+        tm._finish_job(jobname, 0, f'{devname} 格式化成功！')
+    else:
+        tm._finish_job(jobname, -1, f'{devname} 格式化失败！',
+                       data=output.strip().replace('\n', '<br>'))
+
+
 if __name__ == '__main__':
     # !!!!!!!!!!! DANGEROUS TESTING !!!!!!!!!!!
     # print('* Add partition to sdb with 5G:',)

{inpanel-1.2.5 → inpanel-1.2.6}/inpanel/mod/dnf.py

@@ -13,7 +13,6 @@
 '''
 
 import json
-import os
 import re
 import time
 from pathlib import Path
@@ -38,12 +37,12 @@ config_path = '/etc/yum.repos.d'
 
 def _get_sources_file():
     conf_dir = str(_base_config_path).rstrip('/')
-    return os.path.join(conf_dir, 'sources_dnf.json')
+    return str(Path(conf_dir) / 'sources_dnf.json')
 
 
 def _load_sources_config():
     filepath = _get_sources_file()
-    if os.path.isfile(filepath):
+    if Path(filepath).is_file():
         try:
             with open(filepath, 'r', encoding='utf-8') as f:
                 data = json.load(f)
@@ -58,10 +57,10 @@ def _load_sources_config():
 
 def _save_sources_config(sources):
     filepath = _get_sources_file()
-    conf_dir = os.path.dirname(filepath)
-    if not os.path.isdir(conf_dir):
+    conf_dir = str(Path(filepath).parent)
+    if not Path(conf_dir).is_dir():
         try:
-            os.makedirs(conf_dir, exist_ok=True)
+            Path(conf_dir).mkdir(parents=True, exist_ok=True)
         except OSError:
             pass
     try:
@@ -144,7 +143,7 @@ def get_list():
         d = str(Path(config_path))
         if not Path(d).exists() or not Path(d).is_dir():
             return None
-        items = sorted(os.listdir(d))
+        items = sorted(p.name for p in Path(d).iterdir())
         return items if len(items) > 0 else []
     elif base.kernel_name in ('Darwin'):
         return None
@@ -298,7 +297,7 @@ def get_repo_list():
     d = Path(config_path)
     if not d.exists() or not d.is_dir():
         return []
-    items = sorted(os.listdir(str(d)))
+    items = sorted(p.name for p in Path(d).iterdir())
     repos = []
     for item in items:
         if not item.endswith('.repo'):

{inpanel-1.2.5 → inpanel-1.2.6}/inpanel/mod/docker_source.py

@@ -16,7 +16,6 @@ Docker 镜像加速源管理：通过 /etc/docker/daemon.json 中的 registry-mi
 """
 
 import json
-import os
 import time
 from pathlib import Path
 
@@ -34,7 +33,7 @@ _DOCKER_DAEMON_PATH = '/etc/docker/daemon.json'
 
 def _get_docker_sources_file():
     """获取 Docker 源配置文件的路径"""
-    return os.path.join(config_path, 'sources_docker.json')
+    return str(Path(config_path) / 'sources_docker.json')
 
 
 def _load_sources_config():
@@ -44,7 +43,7 @@ def _load_sources_config():
     返回源列表（list of dict），每个 dict 包含 name、url、builtin。
     """
     filepath = _get_docker_sources_file()
-    if os.path.isfile(filepath):
+    if Path(filepath).is_file():
         try:
             with open(filepath, 'r', encoding='utf-8') as f:
                 data = json.load(f)
@@ -62,10 +61,10 @@ def _load_sources_config():
 def _save_sources_config(sources):
     """保存 Docker 源配置到 sources_docker.json"""
     filepath = _get_docker_sources_file()
-    conf_dir = os.path.dirname(filepath)
-    if not os.path.isdir(conf_dir):
+    conf_dir = str(Path(filepath).parent)
+    if not Path(conf_dir).is_dir():
         try:
-            os.makedirs(conf_dir, exist_ok=True)
+            Path(conf_dir).mkdir(parents=True, exist_ok=True)
         except OSError:
             pass
     try:
@@ -81,7 +80,7 @@ def _read_daemon_json():
     Returns:
         dict: daemon.json 的内容，如果文件不存在或解析失败返回空 dict
     """
-    if not os.path.isfile(_DOCKER_DAEMON_PATH):
+    if not Path(_DOCKER_DAEMON_PATH).is_file():
         return {}
     try:
         with open(_DOCKER_DAEMON_PATH, 'r', encoding='utf-8') as f:
@@ -100,9 +99,9 @@ def _write_daemon_json(config):
         config: dict，要写入的配置
     """
     try:
-        daemon_dir = os.path.dirname(_DOCKER_DAEMON_PATH)
-        if not os.path.isdir(daemon_dir):
-            os.makedirs(daemon_dir, exist_ok=True)
+        daemon_dir = str(Path(_DOCKER_DAEMON_PATH).parent)
+        if not Path(daemon_dir).is_dir():
+            Path(daemon_dir).mkdir(parents=True, exist_ok=True)
         with open(_DOCKER_DAEMON_PATH, 'w', encoding='utf-8') as f:
             json.dump(config, f, ensure_ascii=False, indent=2)
             f.write('\n')
@@ -334,7 +333,7 @@ def web_handler(context, action):
     name = context.get_argument('name', '')
 
     if action == 'overview':
-        daemon_exists = os.path.isfile(_DOCKER_DAEMON_PATH)
+        daemon_exists = Path(_DOCKER_DAEMON_PATH).is_file()
         active_mirrors = _get_active_mirrors()
         context.write({
             'code': 0,