Compare commits
2 Commits
973d7b6749
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
be0c4359a1 | ||
|
|
3654565b52 |
12
README.md
12
README.md
@@ -39,13 +39,13 @@ A powerful management tool for deploying and managing Psiphon Conduit nodes on L
|
|||||||
## Quick Install
|
## Quick Install
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
curl -sL https://raw.githubusercontent.com/SamNet-dev/conduit-manager/main/conduit.sh | sudo bash
|
curl -sL https://git.samnet.dev/SamNet-dev/conduit/raw/branch/main/conduit.sh | sudo bash
|
||||||
```
|
```
|
||||||
|
|
||||||
Or download and run manually:
|
Or download and run manually:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
wget https://raw.githubusercontent.com/SamNet-dev/conduit-manager/main/conduit.sh
|
wget https://git.samnet.dev/SamNet-dev/conduit/raw/branch/main/conduit.sh
|
||||||
sudo bash conduit.sh
|
sudo bash conduit.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -142,7 +142,7 @@ sudo bash conduit.sh
|
|||||||
|
|
||||||
Looking for macOS? We have a **macOS (Apple Silicon)** version available!
|
Looking for macOS? We have a **macOS (Apple Silicon)** version available!
|
||||||
|
|
||||||
> **[macos-edition branch](https://github.com/SamNet-dev/conduit-manager/tree/macos-edition)** — Based on v1.0.2, developed by [@PouriaCh](https://github.com/PouriaCh)
|
> **[macos-edition branch](https://git.samnet.dev/SamNet-dev/conduit/src/branch/macos-edition)** — Based on v1.0.2, developed by [@PouriaCh](https://github.com/PouriaCh)
|
||||||
|
|
||||||
Note: The Linux version (this branch) has the latest features including Telegram bot, multi-container scaling, per-container resource limits, and live dashboard. The macOS edition provides core functionality for Apple Silicon Macs.
|
Note: The Linux version (this branch) has the latest features including Telegram bot, multi-container scaling, per-container resource limits, and live dashboard. The macOS edition provides core functionality for Apple Silicon Macs.
|
||||||
|
|
||||||
@@ -347,13 +347,13 @@ Conduit node operators can earn OAT tokens for contributing to the Psiphon netwo
|
|||||||
دستور زیر را در ترمینال سرور اجرا کنید:
|
دستور زیر را در ترمینال سرور اجرا کنید:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
curl -sL https://raw.githubusercontent.com/SamNet-dev/conduit-manager/main/conduit.sh | sudo bash
|
curl -sL https://git.samnet.dev/SamNet-dev/conduit/raw/branch/main/conduit.sh | sudo bash
|
||||||
```
|
```
|
||||||
|
|
||||||
یا دانلود و اجرای دستی:
|
یا دانلود و اجرای دستی:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
wget https://raw.githubusercontent.com/SamNet-dev/conduit-manager/main/conduit.sh
|
wget https://git.samnet.dev/SamNet-dev/conduit/raw/branch/main/conduit.sh
|
||||||
sudo bash conduit.sh
|
sudo bash conduit.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -439,7 +439,7 @@ sudo bash conduit.sh
|
|||||||
|
|
||||||
به دنبال نسخه macOS هستید؟ نسخه **macOS (Apple Silicon)** موجود است!
|
به دنبال نسخه macOS هستید؟ نسخه **macOS (Apple Silicon)** موجود است!
|
||||||
|
|
||||||
> **[شاخه macos-edition](https://github.com/SamNet-dev/conduit-manager/tree/macos-edition)** — بر اساس نسخه 1.0.2، توسعه داده شده توسط [@PouriaCh](https://github.com/PouriaCh)
|
> **[شاخه macos-edition](https://git.samnet.dev/SamNet-dev/conduit/src/branch/macos-edition)** — بر اساس نسخه 1.0.2، توسعه داده شده توسط [@PouriaCh](https://github.com/PouriaCh)
|
||||||
|
|
||||||
توجه: نسخه لینوکس (این شاخه) شامل جدیدترین امکانات مانند ربات تلگرام، مقیاسپذیری چند کانتینره، محدودیت منابع و داشبورد زنده است. نسخه macOS عملکرد اصلی را برای مکهای Apple Silicon فراهم میکند.
|
توجه: نسخه لینوکس (این شاخه) شامل جدیدترین امکانات مانند ربات تلگرام، مقیاسپذیری چند کانتینره، محدودیت منابع و داشبورد زنده است. نسخه macOS عملکرد اصلی را برای مکهای Apple Silicon فراهم میکند.
|
||||||
|
|
||||||
|
|||||||
20
conduit.sh
20
conduit.sh
@@ -14,7 +14,7 @@
|
|||||||
# ╚═══════════════════════════════════════════════════════════════════╝
|
# ╚═══════════════════════════════════════════════════════════════════╝
|
||||||
# core engine: https://github.com/Psiphon-Labs/psiphon-tunnel-core
|
# core engine: https://github.com/Psiphon-Labs/psiphon-tunnel-core
|
||||||
# Usage:
|
# Usage:
|
||||||
# curl -sL https://raw.githubusercontent.com/SamNet-dev/conduit-manager/main/conduit.sh | sudo bash
|
# curl -sL https://git.samnet.dev/SamNet-dev/conduit/raw/branch/main/conduit.sh | sudo bash
|
||||||
#
|
#
|
||||||
# Reference: https://github.com/ssmirr/conduit/releases/latest
|
# Reference: https://github.com/ssmirr/conduit/releases/latest
|
||||||
# Conduit CLI options:
|
# Conduit CLI options:
|
||||||
@@ -8465,7 +8465,7 @@ show_about() {
|
|||||||
echo ""
|
echo ""
|
||||||
echo -e "${CYAN}──────────────────────────────────────────────────────────────────${NC}"
|
echo -e "${CYAN}──────────────────────────────────────────────────────────────────${NC}"
|
||||||
echo -e " ${BOLD}Made by Sam - SamNet Technologies${NC}"
|
echo -e " ${BOLD}Made by Sam - SamNet Technologies${NC}"
|
||||||
echo -e " GitHub: ${CYAN}https://github.com/SamNet-dev/conduit-manager${NC}"
|
echo -e " Git: ${CYAN}https://git.samnet.dev/SamNet-dev/conduit${NC}"
|
||||||
echo -e " Twitter: ${CYAN}https://x.com/YourAnonHeart${NC}"
|
echo -e " Twitter: ${CYAN}https://x.com/YourAnonHeart${NC}"
|
||||||
echo -e " Psiphon: ${CYAN}https://psiphon.ca${NC}"
|
echo -e " Psiphon: ${CYAN}https://psiphon.ca${NC}"
|
||||||
echo ""
|
echo ""
|
||||||
@@ -9302,8 +9302,8 @@ SVCEOF
|
|||||||
# Fetch latest commit SHA from GitHub API
|
# Fetch latest commit SHA from GitHub API
|
||||||
local _remote_sha
|
local _remote_sha
|
||||||
_remote_sha=$(curl -fsSL --connect-timeout 5 --max-time 10 \
|
_remote_sha=$(curl -fsSL --connect-timeout 5 --max-time 10 \
|
||||||
"https://api.github.com/repos/SamNet-dev/conduit-manager/commits/main" \
|
"https://git.samnet.dev/api/v1/repos/SamNet-dev/conduit/branches/main" \
|
||||||
-H "Accept: application/vnd.github.sha" 2>/dev/null) || true
|
2>/dev/null | grep -o '"id":"[a-f0-9]*"' | head -1 | cut -d'"' -f4) || true
|
||||||
|
|
||||||
# Validate: must be 40+ hex chars (not JSON error or HTML from a proxy)
|
# Validate: must be 40+ hex chars (not JSON error or HTML from a proxy)
|
||||||
if [ -n "$_remote_sha" ] && [ ${#_remote_sha} -ge 40 ]; then
|
if [ -n "$_remote_sha" ] && [ ${#_remote_sha} -ge 40 ]; then
|
||||||
@@ -13080,7 +13080,7 @@ deploy_to_server() {
|
|||||||
[ "$deploy_mc" != "0" ] && env_prefix+="MAX_CLIENTS=$deploy_mc "
|
[ "$deploy_mc" != "0" ] && env_prefix+="MAX_CLIENTS=$deploy_mc "
|
||||||
env_prefix+="BANDWIDTH=$deploy_bw "
|
env_prefix+="BANDWIDTH=$deploy_bw "
|
||||||
|
|
||||||
local install_url="https://raw.githubusercontent.com/SamNet-dev/conduit-manager/main/conduit.sh"
|
local install_url="https://git.samnet.dev/SamNet-dev/conduit/raw/branch/main/conduit.sh"
|
||||||
# Download then run — try curl first, fall back to wget
|
# Download then run — try curl first, fall back to wget
|
||||||
local remote_cmd="${_sudo}bash -c 'export ${env_prefix}; { curl -fsSL --max-time 60 \"${install_url}\" -o /tmp/conduit_install.sh 2>/dev/null || wget -qO /tmp/conduit_install.sh \"${install_url}\" 2>/dev/null; } && bash /tmp/conduit_install.sh --batch; _rc=\$?; rm -f /tmp/conduit_install.sh; exit \$_rc'"
|
local remote_cmd="${_sudo}bash -c 'export ${env_prefix}; { curl -fsSL --max-time 60 \"${install_url}\" -o /tmp/conduit_install.sh 2>/dev/null || wget -qO /tmp/conduit_install.sh \"${install_url}\" 2>/dev/null; } && bash /tmp/conduit_install.sh --batch; _rc=\$?; rm -f /tmp/conduit_install.sh; exit \$_rc'"
|
||||||
|
|
||||||
@@ -14924,7 +14924,7 @@ update_conduit() {
|
|||||||
|
|
||||||
# --- Phase 1: Script update ---
|
# --- Phase 1: Script update ---
|
||||||
echo -e "${BOLD}Phase 1: Checking for script updates...${NC}"
|
echo -e "${BOLD}Phase 1: Checking for script updates...${NC}"
|
||||||
local update_url="https://raw.githubusercontent.com/SamNet-dev/conduit-manager/main/conduit.sh"
|
local update_url="https://git.samnet.dev/SamNet-dev/conduit/raw/branch/main/conduit.sh"
|
||||||
local tmp_script="/tmp/conduit_update_$$.sh"
|
local tmp_script="/tmp/conduit_update_$$.sh"
|
||||||
|
|
||||||
if curl -fsSL --max-time 30 --max-filesize 2097152 -o "$tmp_script" "$update_url" 2>/dev/null; then
|
if curl -fsSL --max-time 30 --max-filesize 2097152 -o "$tmp_script" "$update_url" 2>/dev/null; then
|
||||||
@@ -15039,8 +15039,8 @@ update_conduit() {
|
|||||||
rm -f /tmp/.conduit_update_available
|
rm -f /tmp/.conduit_update_available
|
||||||
local _cur_sha
|
local _cur_sha
|
||||||
_cur_sha=$(curl -fsSL --connect-timeout 5 --max-time 10 \
|
_cur_sha=$(curl -fsSL --connect-timeout 5 --max-time 10 \
|
||||||
"https://api.github.com/repos/SamNet-dev/conduit-manager/commits/main" \
|
"https://git.samnet.dev/api/v1/repos/SamNet-dev/conduit/branches/main" \
|
||||||
-H "Accept: application/vnd.github.sha" 2>/dev/null) || true
|
2>/dev/null | grep -o '"id":"[a-f0-9]*"' | head -1 | cut -d'"' -f4) || true
|
||||||
if [ -n "$_cur_sha" ] && [ ${#_cur_sha} -ge 40 ]; then
|
if [ -n "$_cur_sha" ] && [ ${#_cur_sha} -ge 40 ]; then
|
||||||
_cur_sha="${_cur_sha:0:40}"
|
_cur_sha="${_cur_sha:0:40}"
|
||||||
case "$_cur_sha" in *[!a-f0-9]*) _cur_sha="" ;; esac
|
case "$_cur_sha" in *[!a-f0-9]*) _cur_sha="" ;; esac
|
||||||
@@ -15171,8 +15171,8 @@ MANAGEMENT
|
|||||||
# Save current commit SHA as update baseline
|
# Save current commit SHA as update baseline
|
||||||
local _cur_sha
|
local _cur_sha
|
||||||
_cur_sha=$(curl -fsSL --connect-timeout 5 --max-time 10 \
|
_cur_sha=$(curl -fsSL --connect-timeout 5 --max-time 10 \
|
||||||
"https://api.github.com/repos/SamNet-dev/conduit-manager/commits/main" \
|
"https://git.samnet.dev/api/v1/repos/SamNet-dev/conduit/branches/main" \
|
||||||
-H "Accept: application/vnd.github.sha" 2>/dev/null) || true
|
2>/dev/null | grep -o '"id":"[a-f0-9]*"' | head -1 | cut -d'"' -f4) || true
|
||||||
if [ -n "$_cur_sha" ] && [ ${#_cur_sha} -ge 40 ]; then
|
if [ -n "$_cur_sha" ] && [ ${#_cur_sha} -ge 40 ]; then
|
||||||
_cur_sha="${_cur_sha:0:40}"
|
_cur_sha="${_cur_sha:0:40}"
|
||||||
case "$_cur_sha" in *[!a-f0-9]*) _cur_sha="" ;; esac
|
case "$_cur_sha" in *[!a-f0-9]*) _cur_sha="" ;; esac
|
||||||
|
|||||||
Reference in New Issue
Block a user