diff --git a/README.md b/README.md index 5ae4ab1b..4ad6fa22 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Forkop (Podkop Plus) -[![Star](https://img.shields.io/github/stars/ushan0v/forkop?style=social)](https://github.com/ushan0v/forkop/stargazers) -[![Releases](https://img.shields.io/github/v/release/ushan0v/forkop?label=releases)](https://github.com/ushan0v/forkop/releases) +[![Star](https://img.shields.io/github/stars/Dushnilin/tachyon?style=social)](https://github.com/Dushnilin/tachyon/stargazers) +[![Releases](https://img.shields.io/github/v/release/Dushnilin/tachyon?label=releases)](https://github.com/Dushnilin/tachyon/releases) [![Telegram](https://img.shields.io/badge/Telegram-Forkop%20%7C%20Chat-2CA5E0?logo=telegram\&logoColor=white)](https://t.me/forkop_chat) [![AI Assistant](https://img.shields.io/badge/Telegram-Forkop%20%7C%20AI%20Assistant-2CA5E0?logo=telegram\&logoColor=white)](https://t.me/forkop_aibot) @@ -10,7 +10,7 @@ ### Установка ```sh -sh <(wget -O - https://raw.githubusercontent.com/ushan0v/forkop/main/install.sh) +sh <(wget -O - https://raw.githubusercontent.com/Dushnilin/tachyon/main/install.sh) ```
diff --git a/build.sh b/build.sh index 48c9eda1..b5afce66 100644 --- a/build.sh +++ b/build.sh @@ -32,8 +32,8 @@ APK_SDK_URL="${APK_SDK_URL:-https://downloads.openwrt.org/releases/25.12.3/targe BACKEND_DESCRIPTION="Rule-based Forkop backend with hybrid sing-box + zapret orchestration" APP_DESCRIPTION="Rule-based Forkop LuCI app with hybrid sing-box + zapret orchestration" I18N_DESCRIPTION="Translation for luci-app-forkop - Русский (Russian)" -MAINTAINER="ushan0v " -PROJECT_URL="https://github.com/ushan0v/forkop" +MAINTAINER="Dushnilin " +PROJECT_URL="https://github.com/Dushnilin/tachyon" BACKEND_DEPENDS_IPK="libc, ca-bundle, kmod-inet-diag, kmod-netlink-diag, kmod-tun, curl, ucode, ucode-mod-fs, ucode-mod-uci, kmod-nft-tproxy, coreutils-base64, coreutils-sort, bind-dig, nftables, kmod-nft-nat, ip-full" BACKEND_DEPENDS_APK="bind-dig ca-bundle coreutils-base64 coreutils-sort curl ip-full kmod-inet-diag kmod-netlink-diag kmod-nft-nat kmod-nft-tproxy kmod-tun libc nftables ucode ucode-mod-fs ucode-mod-uci" APP_DEPENDS_IPK="libc, luci-base, forkop" diff --git a/fe-app-forkop/locales-utils.js b/fe-app-forkop/locales-utils.js index 79b22d95..fc78496f 100644 --- a/fe-app-forkop/locales-utils.js +++ b/fe-app-forkop/locales-utils.js @@ -1,6 +1,6 @@ import { execSync } from 'child_process'; -export function getGitUser(defaultName = 'Forkop', defaultEmail = 'ushan0v@users.noreply.github.com') { +export function getGitUser(defaultName = 'Tachyon', defaultEmail = 'dushnilin@gmail.com') { try { const name = execSync('git config user.name', { stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim(); const email = execSync('git config user.email', { stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim(); diff --git a/fe-app-forkop/src/forkop/tabs/diagnostic/partials/renderWikiDisclaimer.ts b/fe-app-forkop/src/forkop/tabs/diagnostic/partials/renderWikiDisclaimer.ts index ec46b74c..1ac82b2c 100644 --- a/fe-app-forkop/src/forkop/tabs/diagnostic/partials/renderWikiDisclaimer.ts +++ b/fe-app-forkop/src/forkop/tabs/diagnostic/partials/renderWikiDisclaimer.ts @@ -31,7 +31,7 @@ export function renderWikiDisclaimer(kind: 'default' | 'error' | 'warning') { text: _('Open Project Page'), onClick: () => window.open( - 'https://github.com/ushan0v/forkop#readme', + 'https://github.com/Dushnilin/tachyon#readme', '_blank', 'noopener,noreferrer', ), diff --git a/forkop/Makefile b/forkop/Makefile index 6deaf9b1..58eeb42b 100644 --- a/forkop/Makefile +++ b/forkop/Makefile @@ -14,7 +14,7 @@ endif PKG_VERSION:=$(or $(FORKOP_HAS_RELEASE_VERSION),0.0.0) PKG_RELEASE:= -PKG_MAINTAINER:=ushan0v +PKG_MAINTAINER:=Dushnilin PKG_LICENSE:=GPL-2.0-or-later include $(INCLUDE_DIR)/package.mk @@ -25,7 +25,7 @@ define Package/forkop DEPENDS:=+ca-bundle +kmod-inet-diag +kmod-netlink-diag +kmod-tun +curl +ucode +ucode-mod-fs +ucode-mod-uci +kmod-nft-tproxy +coreutils-base64 +coreutils-sort +bind-dig +nftables +kmod-nft-nat +ip-full CONFLICTS:=https-dns-proxy nextdns luci-app-passwall luci-app-passwall2 TITLE:=Forkop backend service - URL:=https://github.com/ushan0v/forkop + URL:=https://github.com/Dushnilin/tachyon PKGARCH:=all endef diff --git a/forkop/files/usr/lib/components/action.uc b/forkop/files/usr/lib/components/action.uc index e0d812d9..a506cb20 100644 --- a/forkop/files/usr/lib/components/action.uc +++ b/forkop/files/usr/lib/components/action.uc @@ -9,7 +9,7 @@ const LIB_DIR = getenv("FORKOP_LIB") || "/usr/lib/forkop"; const BIN_PATH = getenv("FORKOP_BIN") || constants.FORKOP_BIN || "/usr/bin/forkop"; const SERVICE_INIT = getenv("FORKOP_SERVICE_INIT") || constants.FORKOP_SERVICE_INIT || "/etc/init.d/forkop"; const FORKOP_VERSION = getenv("FORKOP_VERSION") || constants.FORKOP_VERSION || ""; -const FORKOP_RELEASE_REPO = getenv("FORKOP_RELEASE_REPO") || constants.FORKOP_RELEASE_REPO || "ushan0v/forkop"; +const FORKOP_RELEASE_REPO = getenv("FORKOP_RELEASE_REPO") || constants.FORKOP_RELEASE_REPO || "Dushnilin/tachyon"; const RUNTIME_STATE_DIR = getenv("FORKOP_RUNTIME_STATE_DIR") || "/var/run/forkop"; const SYSTEM_INFO_CACHE_FILE = getenv("FORKOP_SYSTEM_INFO_CACHE_FILE") || RUNTIME_STATE_DIR + "/system-info.json"; const COMPONENT_JOB_DIR = getenv("UPDATES_JOB_DIR") || getenv("FORKOP_UI_COMPONENT_ACTION_DIR") || RUNTIME_STATE_DIR + "/component-actions"; diff --git a/forkop/files/usr/lib/core/constants.uc b/forkop/files/usr/lib/core/constants.uc index fcd90fea..d590da57 100644 --- a/forkop/files/usr/lib/core/constants.uc +++ b/forkop/files/usr/lib/core/constants.uc @@ -18,7 +18,7 @@ function constants_map() { c.FORKOP_BIN = env("FORKOP_BIN", "/usr/bin/forkop"); c.FORKOP_SERVICE_NAME = env("FORKOP_SERVICE_NAME", "forkop"); c.FORKOP_SERVICE_INIT = env("FORKOP_SERVICE_INIT", "/etc/init.d/forkop"); - c.FORKOP_RELEASE_REPO = env("FORKOP_RELEASE_REPO", "ushan0v/forkop"); + c.FORKOP_RELEASE_REPO = env("FORKOP_RELEASE_REPO", "Dushnilin/tachyon"); c.FORKOP_LUCI_VIEW_NAMESPACE = env("FORKOP_LUCI_VIEW_NAMESPACE", "forkop"); c.FORKOP_LUCI_VIEW_DIR = env("FORKOP_LUCI_VIEW_DIR", "/www/luci-static/resources/view/" + c.FORKOP_LUCI_VIEW_NAMESPACE); c.FORKOP_LUCI_I18N_DOMAIN = env("FORKOP_LUCI_I18N_DOMAIN", "forkop"); diff --git a/forkop/files/usr/lib/diagnostics/runtime.uc b/forkop/files/usr/lib/diagnostics/runtime.uc index 25af9de8..2c077d60 100644 --- a/forkop/files/usr/lib/diagnostics/runtime.uc +++ b/forkop/files/usr/lib/diagnostics/runtime.uc @@ -11,7 +11,7 @@ const LIB_DIR = getenv("FORKOP_LIB") || "/usr/lib/forkop"; const FORKOP_VERSION = getenv("FORKOP_VERSION") || constants.FORKOP_VERSION || ""; const FORKOP_CONFIG = getenv("FORKOP_CONFIG") || constants.FORKOP_CONFIG || "/etc/config/" + CONFIG_NAME; const FORKOP_SERVICE_NAME = getenv("FORKOP_SERVICE_NAME") || constants.FORKOP_SERVICE_NAME || "forkop"; -const FORKOP_RELEASE_REPO = getenv("FORKOP_RELEASE_REPO") || constants.FORKOP_RELEASE_REPO || "ushan0v/forkop"; +const FORKOP_RELEASE_REPO = getenv("FORKOP_RELEASE_REPO") || constants.FORKOP_RELEASE_REPO || "Dushnilin/tachyon"; const FORKOP_LUCI_VIEW_DIR = getenv("FORKOP_LUCI_VIEW_DIR") || constants.FORKOP_LUCI_VIEW_DIR || "/www/luci-static/resources/view/forkop"; const RUNTIME_STATE_DIR = getenv("FORKOP_RUNTIME_STATE_DIR") || "/var/run/forkop"; const SYSTEM_INFO_CACHE_FILE = getenv("FORKOP_SYSTEM_INFO_CACHE_FILE") || RUNTIME_STATE_DIR + "/system-info.json"; diff --git a/forkop/files/usr/lib/singbox/runtime.uc b/forkop/files/usr/lib/singbox/runtime.uc index ca08cea3..46c0820c 100644 --- a/forkop/files/usr/lib/singbox/runtime.uc +++ b/forkop/files/usr/lib/singbox/runtime.uc @@ -585,7 +585,7 @@ function service_listen_address_value(settings) { return address; } - log_message("Failed to determine the listening IP address. Please open an issue to report this problem: https://github.com/ushan0v/forkop/issues", "error"); + log_message("Failed to determine the listening IP address. Please open an issue to report this problem: https://github.com/Dushnilin/tachyon/issues", "error"); return ""; } diff --git a/install.sh b/install.sh index 6ce92d40..81868b1b 100755 --- a/install.sh +++ b/install.sh @@ -1,8 +1,8 @@ #!/bin/sh # shellcheck shell=dash -REPO_OWNER="ushan0v" -REPO_NAME="forkop" +REPO_OWNER="Dushnilin" +REPO_NAME="tachyon" REQUIRED_SPACE_KB=15360 CONNECT_TIMEOUT_SECONDS=15 diff --git a/luci-app-forkop/Makefile b/luci-app-forkop/Makefile index f2c91386..b65c1f3e 100644 --- a/luci-app-forkop/Makefile +++ b/luci-app-forkop/Makefile @@ -20,7 +20,7 @@ LUCI_DEPENDS:=+luci-base +forkop LUCI_PKGARCH:=all LUCI_LANG.ru:=Русский (Russian) LUCI_LANG.en:=English -LUCI_MAINTAINER:=ushan0v +LUCI_MAINTAINER:=Dushnilin LUCI_DESCRIPTION:=Rule-based Forkop LuCI app with hybrid sing-box + zapret orchestration LUCI_MINIFY_JS:=0 diff --git a/luci-app-forkop/htdocs/luci-static/resources/view/forkop/main.js b/luci-app-forkop/htdocs/luci-static/resources/view/forkop/main.js index 7d071906..3c0f5432 100644 --- a/luci-app-forkop/htdocs/luci-static/resources/view/forkop/main.js +++ b/luci-app-forkop/htdocs/luci-static/resources/view/forkop/main.js @@ -9331,7 +9331,7 @@ function renderWikiDisclaimer(kind) { classNames: ["cbi-button-save"], text: _("Open Project Page"), onClick: () => window.open( - "https://github.com/ushan0v/forkop#readme", + "https://github.com/Dushnilin/tachyon#readme", "_blank", "noopener,noreferrer" )