Compare commits
6 Commits
main
..
d61a26557a
| Author | SHA1 | Date | |
|---|---|---|---|
 Sergey Antropoff
|
d61a26557a | ||
|
Sergey Antropoff
|
2d44916893 | ||
|
Sergey Antropoff
|
3ca7dde4b2 | ||
|
Sergey Antropoff
|
ad7846febe | ||
|
Sergey Antropoff
|
e90e2bad8b | ||
|
Sergey Antropoff
|
6f96a26bed |
@@ -32,7 +32,7 @@ BOLD := \033[1m
|
|||||||
NC := \033[0m
|
NC := \033[0m
|
||||||
|
|
||||||
.PHONY: help init check ping status \
|
.PHONY: help init check ping status \
|
||||||
install update export index uninstall \
|
install update export uninstall \
|
||||||
vault-init vault-encrypt vault-edit vault-view
|
vault-init vault-encrypt vault-edit vault-view
|
||||||
|
|
||||||
help: ## Показать справку
|
help: ## Показать справку
|
||||||
@@ -48,8 +48,7 @@ help: ## Показать справку
|
|||||||
@echo " make install"
|
@echo " make install"
|
||||||
@echo " make install LIMIT=vps-de"
|
@echo " make install LIMIT=vps-de"
|
||||||
@echo " make update LIMIT=vps-nl"
|
@echo " make update LIMIT=vps-nl"
|
||||||
@echo " make index"
|
@echo " make uninstall LIMIT=vps-de EXTRA_VARS='hysteria2_uninstall_remove_local_output=true'"
|
||||||
@echo " make uninstall LIMIT=vps-de"
|
|
||||||
@echo ""
|
@echo ""
|
||||||
|
|
||||||
init: ## Создать inventory, group_vars и .vault_pass из примеров
|
init: ## Создать inventory, group_vars и .vault_pass из примеров
|
||||||
@@ -68,27 +67,14 @@ init: ## Создать inventory, group_vars и .vault_pass из примеро
|
|||||||
check: ## Проверить синтаксис playbook
|
check: ## Проверить синтаксис playbook
|
||||||
$(ANSIBLE) playbook.yml --syntax-check $(VAULT_ARGS)
|
$(ANSIBLE) playbook.yml --syntax-check $(VAULT_ARGS)
|
||||||
$(ANSIBLE) playbook-uninstall.yml --syntax-check $(VAULT_ARGS)
|
$(ANSIBLE) playbook-uninstall.yml --syntax-check $(VAULT_ARGS)
|
||||||
$(ANSIBLE) playbook-index.yml --syntax-check $(VAULT_ARGS)
|
|
||||||
|
|
||||||
ping: ## Проверить SSH-доступ ко всем VPS
|
ping: ## Проверить SSH-доступ ко всем VPS
|
||||||
$(ANSIBLE_ADHOC) hysteria2_servers -m ping $(ANSIBLE_OPTS)
|
$(ANSIBLE_ADHOC) hysteria2_servers -m ping $(ANSIBLE_OPTS)
|
||||||
|
|
||||||
status: ## Краткий статус hysteria-server на VPS
|
status: ## Статус hysteria-server на VPS
|
||||||
@ANSIBLE_DEPRECATION_WARNINGS=False ANSIBLE_STDOUT_CALLBACK=minimal \
|
|
||||||
$(ANSIBLE_ADHOC) hysteria2_servers -m shell \
|
$(ANSIBLE_ADHOC) hysteria2_servers -m shell \
|
||||||
-a 'UNIT=""; \
|
-a "systemctl status hysteria-server --no-pager || systemctl status hysteria2 --no-pager" \
|
||||||
if systemctl cat hysteria-server.service >/dev/null 2>&1; then UNIT=hysteria-server; \
|
-b $(VAULT_ARGS) $(if $(LIMIT),--limit $(LIMIT),)
|
||||||
elif systemctl cat hysteria2.service >/dev/null 2>&1; then UNIT=hysteria2; fi; \
|
|
||||||
if [ -z "$$UNIT" ]; then echo "not installed"; exit 0; fi; \
|
|
||||||
STATE=$$(systemctl is-active "$$UNIT" 2>/dev/null || true); \
|
|
||||||
[ -n "$$STATE" ] || STATE=inactive; \
|
|
||||||
SINCE=$$(systemctl show -p ActiveEnterTimestamp --value "$$UNIT" 2>/dev/null); \
|
|
||||||
PID=$$(systemctl show -p MainPID --value "$$UNIT" 2>/dev/null); \
|
|
||||||
MEM=$$(systemctl show -p MemoryCurrent --value "$$UNIT" 2>/dev/null); \
|
|
||||||
case "$$MEM" in ""|"[not set]"|"0"|"n/a") MEM="-";; *) MEM="$$((MEM/1024/1024))M";; esac; \
|
|
||||||
echo "$$UNIT: $$STATE | since $$SINCE | PID $$PID | RAM $$MEM"; \
|
|
||||||
[ "$$STATE" = "active" ]' \
|
|
||||||
-b $(ANSIBLE_OPTS)
|
|
||||||
|
|
||||||
install: check ## Установить Hysteria2 на VPS (+ URL и QR локально)
|
install: check ## Установить Hysteria2 на VPS (+ URL и QR локально)
|
||||||
$(ANSIBLE) playbook.yml --tags install $(ANSIBLE_OPTS)
|
$(ANSIBLE) playbook.yml --tags install $(ANSIBLE_OPTS)
|
||||||
@@ -99,11 +85,7 @@ update: check ## Обновить бинарник, перекатить кон
|
|||||||
export: check ## Только перевыпустить URL и QR (без изменений на сервере)
|
export: check ## Только перевыпустить URL и QR (без изменений на сервере)
|
||||||
$(ANSIBLE) playbook.yml --tags export $(ANSIBLE_OPTS)
|
$(ANSIBLE) playbook.yml --tags export $(ANSIBLE_OPTS)
|
||||||
|
|
||||||
index: check ## Пересобрать HTML серверов + output/index.html и открыть в браузере
|
uninstall: ## Удалить Hysteria2 с VPS
|
||||||
$(ANSIBLE) playbook-index.yml $(VAULT_ARGS) \
|
|
||||||
$(if $(EXTRA_VARS),--extra-vars "$(EXTRA_VARS)",)
|
|
||||||
|
|
||||||
uninstall: ## Полностью удалить Hysteria2 с VPS (только uninstall, без install/update)
|
|
||||||
@echo "$(YELLOW)Будет выполнено удаление Hysteria2$(NC) $(if $(LIMIT),на $(LIMIT),на всех серверах)"
|
@echo "$(YELLOW)Будет выполнено удаление Hysteria2$(NC) $(if $(LIMIT),на $(LIMIT),на всех серверах)"
|
||||||
@read -p "Продолжить? [y/N] " c; [[ "$$c" =~ ^[Yy]$$ ]] || exit 1
|
@read -p "Продолжить? [y/N] " c; [[ "$$c" =~ ^[Yy]$$ ]] || exit 1
|
||||||
$(ANSIBLE) playbook-uninstall.yml --tags uninstall $(ANSIBLE_OPTS)
|
$(ANSIBLE) playbook-uninstall.yml --tags uninstall $(ANSIBLE_OPTS)
|
||||||
|
|||||||
@@ -8,20 +8,6 @@ Ansible-роль для установки [Hysteria 2](https://v2.hysteria.netw
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Последние обновления
|
|
||||||
|
|
||||||
### 2026-07-23
|
|
||||||
|
|
||||||
- **`make status`** — краткий статус по хостам (active / not installed, PID, RAM), без длинных логов journal.
|
|
||||||
- **`make index`** — пересборка HTML всех серверов и общего `output/index.html` из локальных `server-info.yml` (без SSH), открытие в браузере.
|
|
||||||
- **Каталог `output/index.html`** — вкладки «Статистика» (по умолчанию) и серверы (`vps-db`, `vps-kz`, …): IP, доступность TCP, пользователи, матрица присутствия.
|
|
||||||
- **Страницы серверов** — сетка карточек и визуальный стиль как у главной; ссылка «← Общий каталог».
|
|
||||||
- **Lightbox QR** — крупный просмотр на высоту экрана, кнопка скачивания `<сервер>-<пользователь>.png`.
|
|
||||||
- **Скачивание файлов** — ссылки `.url` / `.txt` / `.png` / `.qr.txt` принудительно скачивают файл как `<сервер>-<пользователь>.ext`, а не открывают его во вкладке браузера.
|
|
||||||
- **`make install` / `make update` / `make export`** — в конце тот же pipeline HTML, что и у `make index`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Выбор ветки: `main` или `salamander`
|
## Выбор ветки: `main` или `salamander`
|
||||||
|
|
||||||
| | **`main` (эта ветка)** | **`salamander`** |
|
| | **`main` (эта ветка)** | **`salamander`** |
|
||||||
@@ -56,23 +42,14 @@ git clone https://git.antropoff.ru/DevOpsTools/hysteria2.git
|
|||||||
cd hysteria2
|
cd hysteria2
|
||||||
git checkout main
|
git checkout main
|
||||||
|
|
||||||
# macOS: установить Ansible (если ещё нет)
|
|
||||||
brew install ansible
|
|
||||||
|
|
||||||
make init
|
make init
|
||||||
# отредактировать:
|
# отредактировать inventory/hosts.yml, group_vars/all.yml, vault
|
||||||
# inventory/hosts.yml
|
|
||||||
# group_vars/all.yml
|
|
||||||
# group_vars/hysteria2_servers/vault.yml
|
|
||||||
# group_vars/hysteria2_servers/vars.yml (проброс vault → роль)
|
|
||||||
|
|
||||||
make vault-encrypt
|
make vault-encrypt
|
||||||
make ping
|
make ping
|
||||||
make install # → output/index.html откроется в браузере
|
make install # → output/index.html откроется в браузере
|
||||||
```
|
```
|
||||||
|
|
||||||
После `make init` создаются локальные файлы из `.example` (не коммитятся). Пароль vault хранится в `.vault_pass`.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Makefile
|
## Makefile
|
||||||
@@ -80,35 +57,25 @@ make install # → output/index.html откроется в браузере
|
|||||||
| Команда | Описание |
|
| Команда | Описание |
|
||||||
|---|---|
|
|---|---|
|
||||||
| `make help` | Справка |
|
| `make help` | Справка |
|
||||||
| `make init` | Создать конфиги из `.example` и `.vault_pass` |
|
| `make init` | Создать конфиги из `.example` |
|
||||||
| `make check` | Проверить синтаксис playbook |
|
|
||||||
| `make ping` | Проверить SSH к VPS |
|
| `make ping` | Проверить SSH к VPS |
|
||||||
| `make status` | Краткий статус: active / not installed, uptime, PID, RAM |
|
| `make status` | `systemctl status hysteria-server` |
|
||||||
| `make install` | Установка masquerade + экспорт URL/QR/HTML |
|
| `make install` | Установка masquerade + экспорт URL/QR/HTML |
|
||||||
| `make update` | Обновить бинарник и конфиг; экспорт только для новых/изменённых пользователей |
|
| `make update` | Обновить бинарник, конфиг, перевыпустить экспорт |
|
||||||
| `make export` | Только экспорт (URL, QR, HTML) без изменений на сервере |
|
| `make export` | Только экспорт (URL, QR, HTML) |
|
||||||
| `make index` | Пересобрать HTML всех серверов + общий `output/index.html` и открыть в браузере |
|
| `make uninstall` | Удалить Hysteria2 с VPS |
|
||||||
| `make uninstall` | Полное удаление с VPS + `output/<server>/` + пересборка `output/index.html` |
|
| `make vault-encrypt` | Зашифровать vault |
|
||||||
| `make vault-init` | Создать `.vault_pass`, включить `vault_password_file` в `ansible.cfg` |
|
| `make vault-edit` | Редактировать vault |
|
||||||
| `make vault-encrypt` | Зашифровать `vault.yml` |
|
|
||||||
| `make vault-edit` | Редактировать vault (редактор **nano**, см. `EDITOR` в Makefile) |
|
|
||||||
| `make vault-view` | Показать расшифрованный vault |
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
make install LIMIT=vps-de
|
make install LIMIT=vps-de
|
||||||
make install LIMIT=vps-nl # только новый сервер — старые не трогаются
|
|
||||||
make update LIMIT=vps-nl
|
make update LIMIT=vps-nl
|
||||||
make export
|
make export
|
||||||
make index # только пересобрать общий каталог из output/
|
make uninstall LIMIT=vps-de EXTRA_VARS='hysteria2_uninstall_remove_local_output=true'
|
||||||
make uninstall LIMIT=vps-de
|
|
||||||
make update EXTRA_VARS='hysteria2_force_export=true' # перевыпустить URL/QR для всех
|
|
||||||
make install EXTRA_VARS='hysteria2_force_export=true' # то же при install
|
|
||||||
make install EXTRA_VARS='hysteria2_open_browser=false'
|
make install EXTRA_VARS='hysteria2_open_browser=false'
|
||||||
make update EXTRA_VARS='hysteria2_wait_for_acme=false'
|
make update EXTRA_VARS='hysteria2_wait_for_acme=false'
|
||||||
```
|
```
|
||||||
|
|
||||||
`LIMIT` — имя хоста из `inventory/hosts.yml` (например `vps-de`).
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Inventory
|
## Inventory
|
||||||
@@ -222,7 +189,6 @@ vault_hysteria2_user_passwords:
|
|||||||
Подключается через `group_vars/hysteria2_servers/vars.yml`:
|
Подключается через `group_vars/hysteria2_servers/vars.yml`:
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
hysteria2_user_passwords: "{{ vault_hysteria2_user_passwords[inventory_hostname] | default({}) }}"
|
|
||||||
```
|
```
|
||||||
|
|
||||||
2. **Per-host в inventory:**
|
2. **Per-host в inventory:**
|
||||||
@@ -232,89 +198,9 @@ hysteria2_user_passwords:
|
|||||||
friend: "custom-password"
|
friend: "custom-password"
|
||||||
```
|
```
|
||||||
|
|
||||||
3. **Автогенерация** — Ansible `password` lookup, если пароль не задан ни в inventory/vault, ни в `output/<server>/server-info.yml`.
|
3. **Автогенерация** — Ansible `password` lookup (длина `hysteria2_password_length`), если пароль не задан.
|
||||||
|
|
||||||
При `make update` / `make export`:
|
При `make update` пароли подтягиваются из `output/<server>/server-info.yml`, если не указаны в vault/inventory.
|
||||||
- **существующие** пользователи сохраняют пароли из `server-info.yml` (и URL/QR, если домен/порт не менялись);
|
|
||||||
- **новые** получают автогенерацию и полный экспорт;
|
|
||||||
- **удалённые** из inventory убираются из конфига Hysteria2 и из `output/<server>/`.
|
|
||||||
|
|
||||||
Принудительно перевыпустить URL/QR для всех: `hysteria2_force_export: true` (в `group_vars/all.yml` или `EXTRA_VARS`).
|
|
||||||
|
|
||||||
```bash
|
|
||||||
make install EXTRA_VARS='hysteria2_force_export=true'
|
|
||||||
make update LIMIT=vps-de EXTRA_VARS='hysteria2_force_export=true'
|
|
||||||
```
|
|
||||||
|
|
||||||
### Добавить второй VPS
|
|
||||||
|
|
||||||
После `make install` на первом сервере можно добавить ещё один хост в `inventory/hosts.yml`.
|
|
||||||
|
|
||||||
**Без `LIMIT`** `make install` пройдёт по **всем** серверам из inventory. На уже установленном пароли и файлы URL/QR **не перегенерируются** (берутся из `output/<server>/server-info.yml`), если вы не меняли его `hysteria2_users`, домен или порт.
|
|
||||||
|
|
||||||
Чтобы **не трогать** уже работающий VPS и экспорт:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
make install LIMIT=новый-сервер
|
|
||||||
```
|
|
||||||
|
|
||||||
`LIMIT` — имя нового хоста из inventory (например `vps-nl`).
|
|
||||||
|
|
||||||
### Добавить / удалить пользователя
|
|
||||||
|
|
||||||
1. Отредактируйте `hysteria2_users` в `inventory/hosts.yml` (добавьте имя или уберите).
|
|
||||||
2. Запустите `make update LIMIT=<хост>`.
|
|
||||||
|
|
||||||
Пароли существующих клиентов **не меняются** (берутся из `output/<server>/server-info.yml`).
|
|
||||||
Новому пользователю генерируется пароль и создаются URL/QR.
|
|
||||||
Удалённый пользователь пропадает из `/etc/hysteria/config.yaml` и из папки `output/<server>/`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Установка бинарника Hysteria2
|
|
||||||
|
|
||||||
Официальный скрипт `install_server.sh` хранится в `roles/hysteria2/files/`.
|
|
||||||
|
|
||||||
Перед `make install` / `make update` на **control node** (ваш Mac):
|
|
||||||
|
|
||||||
1. Скачивается копия с https://get.hy2.sh/
|
|
||||||
2. Сравнивается SHA256 с локальным файлом в роли
|
|
||||||
3. При отличии — локальная копия обновляется
|
|
||||||
4. Скрипт копируется на VPS и запускается оттуда (без `curl | bash` на сервере)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## `make update` — что меняется
|
|
||||||
|
|
||||||
| Компонент | Поведение |
|
|
||||||
|---|---|
|
|
||||||
| Бинарник `hysteria` | Обновляется (`install_server.sh --force`) |
|
|
||||||
| `/etc/hysteria/config.yaml` | Перекатывается под текущий inventory |
|
|
||||||
| Пароли VPN | Сохраняются для существующих пользователей |
|
|
||||||
| URL / QR | Только для новых, изменённых или при `hysteria2_force_export=true` |
|
|
||||||
| `apt upgrade` | **Не** выполняется (отключено в Makefile) |
|
|
||||||
| Ожидание ACME | **Не** выполняется (`hysteria2_wait_for_acme=false`) |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## `make uninstall` — полная очистка
|
|
||||||
|
|
||||||
На **VPS** (официальный `install_server.sh --remove` + дочистка Ansible):
|
|
||||||
|
|
||||||
- бинарник `/usr/local/bin/hysteria` и unit-файлы systemd;
|
|
||||||
- `/etc/hysteria/` (конфиг и ACME);
|
|
||||||
- `/var/lib/hysteria` и пользователь `hysteria`;
|
|
||||||
- `/var/www/masq` (сайт-заглушка, ветка **main**);
|
|
||||||
- symlink'и `multi-user.target.wants/hysteria-server*`;
|
|
||||||
- временные `/tmp/hysteria-client-*.yaml`;
|
|
||||||
- правила ufw, добавленные при install;
|
|
||||||
- пакеты `curl`, `micro`, `qrencode`.
|
|
||||||
|
|
||||||
На **control node**:
|
|
||||||
|
|
||||||
- удаляется `output/<имя_сервера>/`;
|
|
||||||
- пересобирается общий `output/index.html` (сервер убирается из списка; при `LIMIT=...` тоже);
|
|
||||||
- если серверов не осталось — `output/index.html` удаляется.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -367,9 +253,7 @@ HTML-страницы показывают:
|
|||||||
- QR-коды;
|
- QR-коды;
|
||||||
- ссылки на файлы и страницы серверов.
|
- ссылки на файлы и страницы серверов.
|
||||||
|
|
||||||
После `make install`, `make update`, `make export` и `make index` **`output/index.html` автоматически открывается в браузере** (macOS: `open`, Linux: `xdg-open`).
|
После `make install`, `make update` и `make export` **`output/index.html` автоматически открывается в браузере** (macOS: `open`, Linux: `xdg-open`).
|
||||||
|
|
||||||
`make index` не ходит на VPS: только читает `output/*/server-info.yml` и пересобирает общий каталог.
|
|
||||||
|
|
||||||
Отключить: `hysteria2_open_browser: false` в `group_vars/all.yml` или `EXTRA_VARS`.
|
Отключить: `hysteria2_open_browser: false` в `group_vars/all.yml` или `EXTRA_VARS`.
|
||||||
|
|
||||||
@@ -394,22 +278,13 @@ ASCII QR — `hysteria share --qr` → `user.qr.txt`.
|
|||||||
| `hysteria2_domain` | host | Домен с A-записью на IP |
|
| `hysteria2_domain` | host | Домен с A-записью на IP |
|
||||||
| `hysteria2_users` | host | Список имён VPN-пользователей |
|
| `hysteria2_users` | host | Список имён VPN-пользователей |
|
||||||
| `hysteria2_acme_email` | group | Email для Let's Encrypt |
|
| `hysteria2_acme_email` | group | Email для Let's Encrypt |
|
||||||
| `hysteria2_user_passwords` | host/vault | Фиксированные пароли VPN (`vars.yml` + vault) |
|
| `hysteria2_user_passwords` | host/vault | Свои пароли VPN |
|
||||||
| `hysteria2_password_length` | group | Длина автогенерируемого пароля (40) |
|
| `hysteria2_output_dir` | group | Папка экспорта (по умолчанию `./output`) |
|
||||||
| `hysteria2_force_export` | group | Перегенерировать URL/QR для всех (`false` по умолчанию) |
|
| `hysteria2_output_name` | host | Имя подпапки (по умолчанию `inventory_hostname`) |
|
||||||
| `hysteria2_output_dir` | group | Папка экспорта (`./output`) |
|
|
||||||
| `hysteria2_output_name` | host | Подпапка экспорта (`inventory_hostname`) |
|
|
||||||
| `hysteria2_listen_port` | group | Порт Hysteria2 (443) |
|
| `hysteria2_listen_port` | group | Порт Hysteria2 (443) |
|
||||||
| `hysteria2_upgrade_system` | group | `apt upgrade` перед install (`true`) |
|
|
||||||
| `hysteria2_configure_firewall` | group | Открыть порты в ufw (`true`) |
|
|
||||||
| `hysteria2_generate_qr_png` | group | PNG QR через `qrencode` |
|
| `hysteria2_generate_qr_png` | group | PNG QR через `qrencode` |
|
||||||
| `hysteria2_wait_for_acme` | group | Пауза при первом ACME (install) |
|
|
||||||
| `hysteria2_open_browser` | group | Открыть `output/index.html` после экспорта |
|
| `hysteria2_open_browser` | group | Открыть `output/index.html` после экспорта |
|
||||||
| `hysteria2_uninstall_rebuild_global_index` | group | Пересобрать `output/index.html` после uninstall (`true`) |
|
| `hysteria2_uninstall_remove_local_output` | extra-vars | Удалить `output/<server>/` при uninstall |
|
||||||
| `vault_ssh_passwords` | vault | SSH-пароли root по имени хоста |
|
|
||||||
| `vault_hysteria2_user_passwords` | vault | VPN-пароли по серверам |
|
|
||||||
|
|
||||||
Полный список defaults: `roles/hysteria2/defaults/main.yml`, `defaults/uninstall.yml`.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -423,11 +298,10 @@ ASCII QR — `hysteria share --qr` → `user.qr.txt`.
|
|||||||
|
|
||||||
## Требования
|
## Требования
|
||||||
|
|
||||||
- **Control node:** macOS или Linux с Ansible **2.14+** (`brew install ansible` на Mac)
|
- Ansible 2.14+
|
||||||
- **VPS:** Debian/Ubuntu с sudo
|
- Debian/Ubuntu VPS с sudo
|
||||||
- Домен с A-записью на IP сервера
|
- Домен с A-записью на IP сервера
|
||||||
- Порты **80/tcp** и **443/tcp+udp** доступны с интернета (ветка `main`)
|
- Для авто-открытия браузера: macOS или Linux с `xdg-open`
|
||||||
- Для авто-открытия браузера: macOS (`open`) или Linux (`xdg-open`)
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -435,30 +309,16 @@ ASCII QR — `hysteria share --qr` → `user.qr.txt`.
|
|||||||
|
|
||||||
```
|
```
|
||||||
roles/hysteria2/
|
roles/hysteria2/
|
||||||
├── defaults/
|
|
||||||
│ ├── main.yml ← основные переменные
|
|
||||||
│ └── uninstall.yml ← переменные удаления
|
|
||||||
├── files/
|
|
||||||
│ └── install_server.sh ← официальный скрипт (синхронизация с get.hy2.sh)
|
|
||||||
├── tasks/
|
├── tasks/
|
||||||
│ ├── main.yml ← порядок задач и теги
|
│ ├── install.yml ← пакеты, hysteria, qrencode
|
||||||
│ ├── validate.yml
|
│ ├── configure.yml ← masquerade + ACME + firewall
|
||||||
│ ├── users.yml ← пароли (inventory / vault / server-info.yml)
|
│ ├── export.yml ← URL, QR, HTML сервера
|
||||||
│ ├── sync_install_script.yml
|
│ └── export_global.yml ← общий output/index.html
|
||||||
│ ├── install.yml ← пакеты, бинарник
|
|
||||||
│ ├── configure.yml ← masquerade + ACME + ufw
|
|
||||||
│ ├── update.yml ← обновление бинарника
|
|
||||||
│ ├── export_prepare.yml ← инкрементальный экспорт
|
|
||||||
│ ├── export.yml ← URL, QR, HTML сервера
|
|
||||||
│ ├── export_global.yml ← общий output/index.html
|
|
||||||
│ ├── share_user.yml
|
|
||||||
│ ├── reuse_export_user.yml
|
|
||||||
│ └── uninstall.yml
|
|
||||||
└── templates/
|
└── templates/
|
||||||
├── config.yaml.j2 ← acme http + masquerade file
|
├── config.yaml.j2 ← acme http + masquerade file
|
||||||
├── client.yaml.j2
|
├── client.yaml.j2
|
||||||
├── masq/index.html.j2
|
├── masq/index.html.j2
|
||||||
└── export/ ← HTML-каталоги
|
└── export/ ← HTML-каталоги
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -3,4 +3,3 @@
|
|||||||
# Файл group_vars/hysteria2_servers/vault.yml должен быть зашифрован (make vault-encrypt).
|
# Файл group_vars/hysteria2_servers/vault.yml должен быть зашифрован (make vault-encrypt).
|
||||||
|
|
||||||
# Проброс VPN-паролей из vault в переменные роли (опционально)
|
# Проброс VPN-паролей из vault в переменные роли (опционально)
|
||||||
hysteria2_user_passwords: "{{ vault_hysteria2_user_passwords[inventory_hostname] | default({}) }}"
|
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
---
|
|
||||||
- name: Rebuild HTML catalogs from local exports
|
|
||||||
hosts: localhost
|
|
||||||
connection: local
|
|
||||||
gather_facts: true
|
|
||||||
become: false
|
|
||||||
tasks:
|
|
||||||
- name: Regenerate server pages and global index.html
|
|
||||||
ansible.builtin.include_role:
|
|
||||||
name: hysteria2
|
|
||||||
tasks_from: export_rebuild_local.yml
|
|
||||||
+3
-24
@@ -2,27 +2,6 @@
|
|||||||
- name: Uninstall Hysteria2 servers
|
- name: Uninstall Hysteria2 servers
|
||||||
hosts: hysteria2_servers
|
hosts: hysteria2_servers
|
||||||
gather_facts: false
|
gather_facts: false
|
||||||
tags: [uninstall]
|
roles:
|
||||||
tasks:
|
- role: hysteria2
|
||||||
- name: Run Hysteria2 uninstall tasks only
|
tags: [uninstall]
|
||||||
ansible.builtin.include_role:
|
|
||||||
name: hysteria2
|
|
||||||
tasks_from: uninstall.yml
|
|
||||||
|
|
||||||
- name: Rebuild global output index after uninstall
|
|
||||||
hosts: hysteria2_servers
|
|
||||||
gather_facts: false
|
|
||||||
tags: [uninstall]
|
|
||||||
tasks:
|
|
||||||
- name: Regenerate output/index.html without removed server
|
|
||||||
block:
|
|
||||||
- name: Run global export tasks
|
|
||||||
ansible.builtin.include_role:
|
|
||||||
name: hysteria2
|
|
||||||
tasks_from: export_global.yml
|
|
||||||
vars:
|
|
||||||
hysteria2_open_browser: false
|
|
||||||
run_once: true
|
|
||||||
delegate_to: localhost
|
|
||||||
become: false
|
|
||||||
when: hysteria2_uninstall_rebuild_global_index | default(true) | bool
|
|
||||||
|
|||||||
+3
-3
@@ -5,14 +5,14 @@
|
|||||||
roles:
|
roles:
|
||||||
- hysteria2
|
- hysteria2
|
||||||
|
|
||||||
- name: Build HTML catalogs from local exports
|
- name: Build global output index
|
||||||
hosts: localhost
|
hosts: localhost
|
||||||
connection: local
|
connection: local
|
||||||
gather_facts: true
|
gather_facts: true
|
||||||
become: false
|
become: false
|
||||||
tags: [install, update, export]
|
tags: [install, update, export]
|
||||||
tasks:
|
tasks:
|
||||||
- name: Regenerate server pages and global index.html
|
- name: Generate global index.html and open in browser
|
||||||
ansible.builtin.include_role:
|
ansible.builtin.include_role:
|
||||||
name: hysteria2
|
name: hysteria2
|
||||||
tasks_from: export_rebuild_local.yml
|
tasks_from: export_global.yml
|
||||||
|
|||||||
@@ -42,14 +42,7 @@ hysteria2_wait_for_acme: true
|
|||||||
# Открыть output/index.html в браузере после install/update/export
|
# Открыть output/index.html в браузере после install/update/export
|
||||||
hysteria2_open_browser: true
|
hysteria2_open_browser: true
|
||||||
|
|
||||||
# Перегенерировать URL/QR для всех пользователей (иначе — только новые/изменённые)
|
# --- uninstall ---
|
||||||
hysteria2_force_export: false
|
hysteria2_uninstall_remove_config: true
|
||||||
|
|
||||||
# --- uninstall (см. также defaults/uninstall.yml) ---
|
|
||||||
hysteria2_system_user: hysteria
|
|
||||||
hysteria2_uninstall_remove_masq: true
|
hysteria2_uninstall_remove_masq: true
|
||||||
hysteria2_uninstall_rebuild_global_index: true
|
hysteria2_uninstall_remove_local_output: false
|
||||||
hysteria2_uninstall_ufw_rules:
|
|
||||||
- 80/tcp
|
|
||||||
- 443/tcp
|
|
||||||
- 443/udp
|
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
---
|
|
||||||
# Системный пользователь Hysteria (создаётся install_server.sh)
|
|
||||||
hysteria2_system_user: hysteria
|
|
||||||
|
|
||||||
# --- uninstall ---
|
|
||||||
# install_server.sh --remove: бинарник + systemd; остальное — задачи uninstall.yml
|
|
||||||
hysteria2_uninstall_remove_masq: true
|
|
||||||
hysteria2_uninstall_rebuild_global_index: true
|
|
||||||
hysteria2_uninstall_ufw_rules:
|
|
||||||
- 80/tcp
|
|
||||||
- 443/tcp
|
|
||||||
- 443/udp
|
|
||||||
@@ -38,7 +38,7 @@ HY2_API_BASE_URL="https://api.hy2.io/v1"
|
|||||||
# curl command line flags.
|
# curl command line flags.
|
||||||
# To using a proxy, please specify ALL_PROXY in the environ variable, such like:
|
# To using a proxy, please specify ALL_PROXY in the environ variable, such like:
|
||||||
# export ALL_PROXY=socks5h://192.0.2.1:1080
|
# export ALL_PROXY=socks5h://192.0.2.1:1080
|
||||||
CURL_FLAGS=(-q -L -f --retry 5 --retry-delay 10 --retry-max-time 60)
|
CURL_FLAGS=(-L -f -q --retry 5 --retry-delay 10 --retry-max-time 60)
|
||||||
|
|
||||||
|
|
||||||
###
|
###
|
||||||
@@ -1027,10 +1027,10 @@ perform_install_hysteria_home_legacy() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
perform_install() {
|
perform_install() {
|
||||||
local _is_fresh_install
|
local _is_frash_install
|
||||||
local _is_upgrade_from_hysteria1
|
local _is_upgrade_from_hysteria1
|
||||||
if ! is_hysteria_installed; then
|
if ! is_hysteria_installed; then
|
||||||
_is_fresh_install=1
|
_is_frash_install=1
|
||||||
elif is_hysteria1_version "$(get_installed_version)"; then
|
elif is_hysteria1_version "$(get_installed_version)"; then
|
||||||
_is_upgrade_from_hysteria1=1
|
_is_upgrade_from_hysteria1=1
|
||||||
fi
|
fi
|
||||||
@@ -1067,7 +1067,7 @@ perform_install() {
|
|||||||
echo
|
echo
|
||||||
echo "$(tgreen)Installed version is up-to-date, there is nothing to do.$(treset)"
|
echo "$(tgreen)Installed version is up-to-date, there is nothing to do.$(treset)"
|
||||||
echo
|
echo
|
||||||
elif [[ -n "$_is_fresh_install" ]]; then
|
elif [[ -n "$_is_frash_install" ]]; then
|
||||||
echo
|
echo
|
||||||
echo -e "$(tbold)Congratulation! Hysteria 2 has been successfully installed on your server.$(treset)"
|
echo -e "$(tbold)Congratulation! Hysteria 2 has been successfully installed on your server.$(treset)"
|
||||||
echo
|
echo
|
||||||
|
|||||||
@@ -11,28 +11,16 @@
|
|||||||
ansible.builtin.set_fact:
|
ansible.builtin.set_fact:
|
||||||
hysteria2_export_users: []
|
hysteria2_export_users: []
|
||||||
|
|
||||||
- name: Prepare incremental export (remove deleted users, split new vs existing)
|
|
||||||
ansible.builtin.import_tasks: export_prepare.yml
|
|
||||||
|
|
||||||
- name: Install qrencode on server for PNG QR export
|
- name: Install qrencode on server for PNG QR export
|
||||||
ansible.builtin.apt:
|
ansible.builtin.apt:
|
||||||
name: qrencode
|
name: qrencode
|
||||||
state: present
|
state: present
|
||||||
update_cache: false
|
update_cache: false
|
||||||
when:
|
when: hysteria2_generate_qr_png | bool
|
||||||
- hysteria2_generate_qr_png | bool
|
|
||||||
- hysteria2_users_for_export | default([]) | length > 0
|
|
||||||
|
|
||||||
- name: Reuse existing export data for unchanged users
|
- name: Build client share data for each user
|
||||||
ansible.builtin.include_tasks: reuse_export_user.yml
|
|
||||||
loop: "{{ hysteria2_users_for_reuse | default([]) }}"
|
|
||||||
loop_control:
|
|
||||||
loop_var: hysteria2_reuse_user
|
|
||||||
label: "{{ hysteria2_reuse_user.name }}"
|
|
||||||
|
|
||||||
- name: Build client share data for new or changed users
|
|
||||||
ansible.builtin.include_tasks: share_user.yml
|
ansible.builtin.include_tasks: share_user.yml
|
||||||
loop: "{{ hysteria2_users_for_export | default([]) }}"
|
loop: "{{ hysteria2_resolved_users }}"
|
||||||
loop_control:
|
loop_control:
|
||||||
loop_var: hysteria2_current_user
|
loop_var: hysteria2_current_user
|
||||||
label: "{{ hysteria2_current_user.name }}"
|
label: "{{ hysteria2_current_user.name }}"
|
||||||
@@ -45,8 +33,6 @@
|
|||||||
server: {{ hysteria2_output_name }}
|
server: {{ hysteria2_output_name }}
|
||||||
domain: {{ hysteria2_domain }}
|
domain: {{ hysteria2_domain }}
|
||||||
port: {{ hysteria2_listen_port }}
|
port: {{ hysteria2_listen_port }}
|
||||||
host_ip: "{{ ansible_host | default('') }}"
|
|
||||||
mode: masquerade
|
|
||||||
users:
|
users:
|
||||||
{% for user in hysteria2_export_users %}
|
{% for user in hysteria2_export_users %}
|
||||||
- name: {{ user.name }}
|
- name: {{ user.name }}
|
||||||
@@ -73,7 +59,5 @@
|
|||||||
- name: Show export location
|
- name: Show export location
|
||||||
ansible.builtin.debug:
|
ansible.builtin.debug:
|
||||||
msg: >-
|
msg: >-
|
||||||
Экспорт: {{ hysteria2_users_for_export | default([]) | length }} пользователь(ей) обновлено,
|
Клиентские URL, QR и index.html сохранены в
|
||||||
{{ hysteria2_users_for_reuse | default([]) | length }} без изменений,
|
{{ hysteria2_output_dir }}/{{ hysteria2_output_name }}/
|
||||||
{{ _hysteria2_removed_users | default([]) | length }} удалено.
|
|
||||||
Каталог: {{ hysteria2_output_dir }}/{{ hysteria2_output_name }}/
|
|
||||||
|
|||||||
@@ -29,17 +29,10 @@
|
|||||||
when: not item.skipped | default(false)
|
when: not item.skipped | default(false)
|
||||||
vars:
|
vars:
|
||||||
_info: "{{ item.content | b64decode | from_yaml }}"
|
_info: "{{ item.content | b64decode | from_yaml }}"
|
||||||
_server_name: "{{ _info.server }}"
|
|
||||||
_entry:
|
_entry:
|
||||||
name: "{{ _server_name }}"
|
name: "{{ _info.server }}"
|
||||||
domain: "{{ _info.domain }}"
|
domain: "{{ _info.domain }}"
|
||||||
port: "{{ _info.port }}"
|
port: "{{ _info.port }}"
|
||||||
mode: "{{ _info.mode | default('masquerade') }}"
|
|
||||||
host_ip: >-
|
|
||||||
{{
|
|
||||||
_info.host_ip
|
|
||||||
| default(hostvars[_server_name].ansible_host | default(''), true)
|
|
||||||
}}
|
|
||||||
dir: "{{ item.item.path | dirname | basename }}"
|
dir: "{{ item.item.path | dirname | basename }}"
|
||||||
users: "{{ _info.users }}"
|
users: "{{ _info.users }}"
|
||||||
become: false
|
become: false
|
||||||
@@ -50,64 +43,6 @@
|
|||||||
when: hysteria2_global_servers | default([]) | length > 0
|
when: hysteria2_global_servers | default([]) | length > 0
|
||||||
become: false
|
become: false
|
||||||
|
|
||||||
- name: Probe TCP reachability of exported servers
|
|
||||||
ansible.builtin.wait_for:
|
|
||||||
host: "{{ item.host_ip if (item.host_ip | default('') | length > 0) else item.domain }}"
|
|
||||||
port: "{{ item.port | int }}"
|
|
||||||
timeout: 3
|
|
||||||
state: started
|
|
||||||
loop: "{{ hysteria2_global_servers | default([]) }}"
|
|
||||||
loop_control:
|
|
||||||
label: "{{ item.name }}"
|
|
||||||
register: _hysteria2_probe
|
|
||||||
failed_when: false
|
|
||||||
changed_when: false
|
|
||||||
become: false
|
|
||||||
when: hysteria2_global_servers | default([]) | length > 0
|
|
||||||
|
|
||||||
- name: Merge probe result for each server
|
|
||||||
ansible.builtin.set_fact:
|
|
||||||
hysteria2_global_servers_enriched: >-
|
|
||||||
{{
|
|
||||||
(hysteria2_global_servers_enriched | default([]))
|
|
||||||
+ [
|
|
||||||
hysteria2_global_servers[item] | combine({
|
|
||||||
'reachable': not ((_hysteria2_probe.results | default([]))[item].failed | default(true)),
|
|
||||||
'probe_seconds': (_hysteria2_probe.results | default([]))[item].elapsed | default(none)
|
|
||||||
})
|
|
||||||
]
|
|
||||||
}}
|
|
||||||
loop: "{{ range(0, hysteria2_global_servers | length) | list }}"
|
|
||||||
when: hysteria2_global_servers | default([]) | length > 0
|
|
||||||
become: false
|
|
||||||
|
|
||||||
- name: Replace servers list with enriched data
|
|
||||||
ansible.builtin.set_fact:
|
|
||||||
hysteria2_global_servers: "{{ hysteria2_global_servers_enriched }}"
|
|
||||||
when: hysteria2_global_servers_enriched is defined
|
|
||||||
become: false
|
|
||||||
|
|
||||||
- name: Compute unique users across servers
|
|
||||||
ansible.builtin.set_fact:
|
|
||||||
hysteria2_unique_users: >-
|
|
||||||
{{
|
|
||||||
hysteria2_global_servers
|
|
||||||
| map(attribute='users')
|
|
||||||
| map('map', attribute='name')
|
|
||||||
| flatten
|
|
||||||
| unique
|
|
||||||
| sort
|
|
||||||
}}
|
|
||||||
hysteria2_reachable_count: >-
|
|
||||||
{{
|
|
||||||
hysteria2_global_servers
|
|
||||||
| selectattr('reachable')
|
|
||||||
| list
|
|
||||||
| length
|
|
||||||
}}
|
|
||||||
when: hysteria2_global_servers | default([]) | length > 0
|
|
||||||
become: false
|
|
||||||
|
|
||||||
- name: Generate global HTML index
|
- name: Generate global HTML index
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
src: export/global-index.html.j2
|
src: export/global-index.html.j2
|
||||||
@@ -116,18 +51,9 @@
|
|||||||
vars:
|
vars:
|
||||||
generated_at: "{{ now(utc=false, fmt='%Y-%m-%d %H:%M:%S') }}"
|
generated_at: "{{ now(utc=false, fmt='%Y-%m-%d %H:%M:%S') }}"
|
||||||
total_users: "{{ hysteria2_global_servers | map(attribute='users') | map('length') | sum }}"
|
total_users: "{{ hysteria2_global_servers | map(attribute='users') | map('length') | sum }}"
|
||||||
unique_users: "{{ hysteria2_unique_users | default([]) }}"
|
|
||||||
reachable_count: "{{ hysteria2_reachable_count | default(0) }}"
|
|
||||||
when: hysteria2_global_servers | default([]) | length > 0
|
when: hysteria2_global_servers | default([]) | length > 0
|
||||||
become: false
|
become: false
|
||||||
|
|
||||||
- name: Remove global HTML index when no servers remain
|
|
||||||
ansible.builtin.file:
|
|
||||||
path: "{{ hysteria2_output_dir }}/index.html"
|
|
||||||
state: absent
|
|
||||||
when: hysteria2_global_servers | default([]) | length == 0
|
|
||||||
become: false
|
|
||||||
|
|
||||||
- name: Open global index in default browser (macOS)
|
- name: Open global index in default browser (macOS)
|
||||||
ansible.builtin.command:
|
ansible.builtin.command:
|
||||||
cmd: open "{{ hysteria2_output_dir }}/index.html"
|
cmd: open "{{ hysteria2_output_dir }}/index.html"
|
||||||
@@ -159,6 +85,6 @@
|
|||||||
|
|
||||||
- name: Skip global index when no servers exported
|
- name: Skip global index when no servers exported
|
||||||
ansible.builtin.debug:
|
ansible.builtin.debug:
|
||||||
msg: "Глобальный {{ hysteria2_output_dir }}/index.html удалён — нет server-info.yml в output/"
|
msg: "Глобальный index.html не создан — нет server-info.yml в {{ hysteria2_output_dir }}/"
|
||||||
when: hysteria2_global_servers | default([]) | length == 0
|
when: hysteria2_global_servers | default([]) | length == 0
|
||||||
become: false
|
become: false
|
||||||
|
|||||||
@@ -1,84 +0,0 @@
|
|||||||
---
|
|
||||||
- name: Determine removed users from previous export
|
|
||||||
ansible.builtin.set_fact:
|
|
||||||
_hysteria2_removed_users: >-
|
|
||||||
{{
|
|
||||||
(_hysteria2_saved_server_info.users | default([]) | map(attribute='name') | list)
|
|
||||||
| difference(hysteria2_resolved_users | map(attribute='name') | list)
|
|
||||||
}}
|
|
||||||
delegate_to: localhost
|
|
||||||
become: false
|
|
||||||
|
|
||||||
- name: Build list of export files to remove for deleted users
|
|
||||||
ansible.builtin.set_fact:
|
|
||||||
_hysteria2_removed_user_files: >-
|
|
||||||
{{
|
|
||||||
_hysteria2_removed_user_files | default([]) + [
|
|
||||||
hysteria2_output_dir ~ '/' ~ hysteria2_output_name ~ '/' ~ item.0 ~ item.1
|
|
||||||
]
|
|
||||||
}}
|
|
||||||
loop: "{{ _hysteria2_removed_users | default([]) | product(_hysteria2_user_export_suffixes) | list }}"
|
|
||||||
vars:
|
|
||||||
_hysteria2_user_export_suffixes:
|
|
||||||
- ".url"
|
|
||||||
- ".txt"
|
|
||||||
- ".qr.txt"
|
|
||||||
- ".png"
|
|
||||||
when: _hysteria2_removed_users | default([]) | length > 0
|
|
||||||
delegate_to: localhost
|
|
||||||
become: false
|
|
||||||
|
|
||||||
- name: Remove export files for deleted users
|
|
||||||
ansible.builtin.file:
|
|
||||||
path: "{{ item }}"
|
|
||||||
state: absent
|
|
||||||
loop: "{{ _hysteria2_removed_user_files | default([]) }}"
|
|
||||||
delegate_to: localhost
|
|
||||||
become: false
|
|
||||||
when: _hysteria2_removed_user_files | default([]) | length > 0
|
|
||||||
|
|
||||||
- name: Check local URL files for resolved users
|
|
||||||
ansible.builtin.stat:
|
|
||||||
path: "{{ hysteria2_output_dir }}/{{ hysteria2_output_name }}/{{ item.name }}.url"
|
|
||||||
loop: "{{ hysteria2_resolved_users }}"
|
|
||||||
register: _hysteria2_url_file_stats
|
|
||||||
delegate_to: localhost
|
|
||||||
become: false
|
|
||||||
|
|
||||||
- name: Split users into full export and reuse existing export data
|
|
||||||
ansible.builtin.set_fact:
|
|
||||||
hysteria2_users_for_export: "{{ hysteria2_users_for_export | default([]) + ([item] if _needs_export else []) }}"
|
|
||||||
hysteria2_users_for_reuse: "{{ hysteria2_users_for_reuse | default([]) + ([_reuse_entry] if not _needs_export else []) }}"
|
|
||||||
loop: "{{ hysteria2_resolved_users }}"
|
|
||||||
loop_control:
|
|
||||||
label: "{{ item.name }}"
|
|
||||||
vars:
|
|
||||||
_saved_user: >-
|
|
||||||
{{
|
|
||||||
(_hysteria2_saved_server_info.users | default([])
|
|
||||||
| selectattr('name', 'equalto', item.name)
|
|
||||||
| list | first) | default({}, true)
|
|
||||||
}}
|
|
||||||
_url_stat: >-
|
|
||||||
{{
|
|
||||||
((_hysteria2_url_file_stats.results
|
|
||||||
| selectattr('item.name', 'equalto', item.name)
|
|
||||||
| list | first).stat) | default({}, true)
|
|
||||||
}}
|
|
||||||
_needs_export: >-
|
|
||||||
{{
|
|
||||||
hysteria2_force_export | bool
|
|
||||||
or (_saved_user | length == 0)
|
|
||||||
or (item.password != (_saved_user.password | default('')))
|
|
||||||
or (hysteria2_domain != (_hysteria2_saved_server_info.domain | default('')))
|
|
||||||
or ((hysteria2_listen_port | string) != (_hysteria2_saved_server_info.port | default('') | string))
|
|
||||||
or ((hysteria2_obfs_password | default('')) != (_hysteria2_saved_server_info.obfs_password | default('')))
|
|
||||||
or not (_url_stat.exists | default(false))
|
|
||||||
}}
|
|
||||||
_reuse_entry:
|
|
||||||
name: "{{ item.name }}"
|
|
||||||
password: "{{ item.password }}"
|
|
||||||
url: "{{ _saved_user.url }}"
|
|
||||||
has_png: "{{ _saved_user.has_png | default(false) | bool }}"
|
|
||||||
delegate_to: localhost
|
|
||||||
become: false
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
---
|
|
||||||
# Пересборка HTML-страниц серверов и общего index из локальных server-info.yml (без SSH)
|
|
||||||
- name: Find server-info.yml in output directories
|
|
||||||
ansible.builtin.find:
|
|
||||||
paths: "{{ hysteria2_output_dir }}"
|
|
||||||
patterns: server-info.yml
|
|
||||||
recurse: true
|
|
||||||
register: _hysteria2_local_server_info_files
|
|
||||||
become: false
|
|
||||||
|
|
||||||
- name: Load local server-info.yml files
|
|
||||||
ansible.builtin.slurp:
|
|
||||||
src: "{{ item.path }}"
|
|
||||||
loop: "{{ _hysteria2_local_server_info_files.files | default([]) }}"
|
|
||||||
register: _hysteria2_local_server_info_raw
|
|
||||||
when: _hysteria2_local_server_info_files.matched | default(0) | int > 0
|
|
||||||
become: false
|
|
||||||
|
|
||||||
- name: Rebuild per-server index.html from local export data
|
|
||||||
ansible.builtin.template:
|
|
||||||
src: export/index.html.j2
|
|
||||||
dest: "{{ _server_dir }}/index.html"
|
|
||||||
mode: "0644"
|
|
||||||
loop: "{{ _hysteria2_local_server_info_raw.results | default([]) }}"
|
|
||||||
when: not item.skipped | default(false)
|
|
||||||
loop_control:
|
|
||||||
label: "{{ _info.server | default('unknown') }}"
|
|
||||||
vars:
|
|
||||||
_info: "{{ item.content | b64decode | from_yaml }}"
|
|
||||||
_server_dir: "{{ item.item.path | dirname }}"
|
|
||||||
hysteria2_output_name: "{{ _info.server }}"
|
|
||||||
hysteria2_domain: "{{ _info.domain }}"
|
|
||||||
hysteria2_listen_port: "{{ _info.port }}"
|
|
||||||
hysteria2_export_users: "{{ _info.users }}"
|
|
||||||
hysteria2_obfs_password: "{{ _info.obfs_password | default('') }}"
|
|
||||||
hysteria2_mode: "{{ _info.mode | default('') }}"
|
|
||||||
generated_at: "{{ now(utc=false, fmt='%Y-%m-%d %H:%M:%S') }}"
|
|
||||||
become: false
|
|
||||||
|
|
||||||
- name: Rebuild global output index
|
|
||||||
ansible.builtin.import_tasks: export_global.yml
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
---
|
|
||||||
- name: Register reused export data for HTML page
|
|
||||||
ansible.builtin.set_fact:
|
|
||||||
hysteria2_export_users: "{{ hysteria2_export_users | default([]) + [hysteria2_reuse_user] }}"
|
|
||||||
@@ -14,19 +14,10 @@
|
|||||||
dest: "{{ hysteria2_install_script_staging_dir }}/{{ hysteria2_install_script_name }}.remote"
|
dest: "{{ hysteria2_install_script_staging_dir }}/{{ hysteria2_install_script_name }}.remote"
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
force: true
|
force: true
|
||||||
timeout: 30
|
|
||||||
delegate_to: localhost
|
delegate_to: localhost
|
||||||
become: false
|
become: false
|
||||||
run_once: true
|
run_once: true
|
||||||
register: _hysteria2_remote_script
|
register: _hysteria2_remote_script
|
||||||
failed_when: false
|
|
||||||
|
|
||||||
- name: Record install script fetch result
|
|
||||||
ansible.builtin.set_fact:
|
|
||||||
_hysteria2_script_fetch_ok: "{{ not (_hysteria2_remote_script.failed | default(false)) }}"
|
|
||||||
delegate_to: localhost
|
|
||||||
become: false
|
|
||||||
run_once: true
|
|
||||||
|
|
||||||
- name: Stat local install script in role files
|
- name: Stat local install script in role files
|
||||||
ansible.builtin.stat:
|
ansible.builtin.stat:
|
||||||
@@ -45,7 +36,6 @@
|
|||||||
become: false
|
become: false
|
||||||
run_once: true
|
run_once: true
|
||||||
register: _hysteria2_remote_script_stat
|
register: _hysteria2_remote_script_stat
|
||||||
when: _hysteria2_script_fetch_ok | bool
|
|
||||||
|
|
||||||
- name: Update bundled install script when official version is newer
|
- name: Update bundled install script when official version is newer
|
||||||
ansible.builtin.copy:
|
ansible.builtin.copy:
|
||||||
@@ -55,55 +45,20 @@
|
|||||||
delegate_to: localhost
|
delegate_to: localhost
|
||||||
become: false
|
become: false
|
||||||
run_once: true
|
run_once: true
|
||||||
when:
|
when: >-
|
||||||
- _hysteria2_script_fetch_ok | bool
|
not _hysteria2_local_script.stat.exists
|
||||||
- >-
|
or _hysteria2_local_script.stat.checksum
|
||||||
not _hysteria2_local_script.stat.exists
|
!= _hysteria2_remote_script_stat.stat.checksum
|
||||||
or _hysteria2_local_script.stat.checksum
|
|
||||||
!= _hysteria2_remote_script_stat.stat.checksum
|
|
||||||
register: _hysteria2_script_updated
|
register: _hysteria2_script_updated
|
||||||
|
|
||||||
- name: Fail when bundled install script is missing and official fetch failed
|
- name: Report install script sync result
|
||||||
ansible.builtin.fail:
|
|
||||||
msg: >-
|
|
||||||
Не удалось скачать {{ hysteria2_install_script_url }}
|
|
||||||
({{ _hysteria2_remote_script.msg | default('сеть недоступна') }})
|
|
||||||
и локальный roles/hysteria2/files/{{ hysteria2_install_script_name }} отсутствует.
|
|
||||||
delegate_to: localhost
|
|
||||||
become: false
|
|
||||||
run_once: true
|
|
||||||
when:
|
|
||||||
- not _hysteria2_script_fetch_ok | bool
|
|
||||||
- not _hysteria2_local_script.stat.exists
|
|
||||||
|
|
||||||
- name: Report install script sync skipped due to network error
|
|
||||||
ansible.builtin.debug:
|
ansible.builtin.debug:
|
||||||
msg: >-
|
msg: >-
|
||||||
Пропуск синхронизации с {{ hysteria2_install_script_url }}:
|
{{
|
||||||
{{ _hysteria2_remote_script.msg | default('сеть недоступна') }}.
|
'Официальный install_server.sh обновлён в roles/hysteria2/files/'
|
||||||
Используется локальный roles/hysteria2/files/{{ hysteria2_install_script_name }}.
|
if (_hysteria2_script_updated.changed | default(false))
|
||||||
|
else 'Локальный install_server.sh актуален (совпадает с ' ~ hysteria2_install_script_url ~ ')'
|
||||||
|
}}
|
||||||
delegate_to: localhost
|
delegate_to: localhost
|
||||||
become: false
|
become: false
|
||||||
run_once: true
|
run_once: true
|
||||||
when: not _hysteria2_script_fetch_ok | bool
|
|
||||||
|
|
||||||
- name: Report install script updated from official server
|
|
||||||
ansible.builtin.debug:
|
|
||||||
msg: Официальный install_server.sh обновлён в roles/hysteria2/files/
|
|
||||||
delegate_to: localhost
|
|
||||||
become: false
|
|
||||||
run_once: true
|
|
||||||
when:
|
|
||||||
- _hysteria2_script_fetch_ok | bool
|
|
||||||
- _hysteria2_script_updated.changed | default(false)
|
|
||||||
|
|
||||||
- name: Report install script already up to date
|
|
||||||
ansible.builtin.debug:
|
|
||||||
msg: >-
|
|
||||||
Локальный install_server.sh актуален (совпадает с {{ hysteria2_install_script_url }}).
|
|
||||||
delegate_to: localhost
|
|
||||||
become: false
|
|
||||||
run_once: true
|
|
||||||
when:
|
|
||||||
- _hysteria2_script_fetch_ok | bool
|
|
||||||
- not (_hysteria2_script_updated.changed | default(false))
|
|
||||||
|
|||||||
@@ -1,137 +1,46 @@
|
|||||||
---
|
---
|
||||||
- name: Stop and disable hysteria-server before removal
|
- name: Stop and disable hysteria-server
|
||||||
ansible.builtin.systemd:
|
ansible.builtin.systemd:
|
||||||
name: "{{ hysteria2_service_name }}"
|
name: "{{ hysteria2_service_name }}"
|
||||||
enabled: false
|
enabled: false
|
||||||
state: stopped
|
state: stopped
|
||||||
failed_when: false
|
failed_when: false
|
||||||
|
|
||||||
- name: Copy Hysteria2 install script to server
|
- name: Remove Hysteria2 via official script
|
||||||
ansible.builtin.copy:
|
ansible.builtin.shell:
|
||||||
src: "{{ hysteria2_install_script_name }}"
|
cmd: bash <(curl -fsSL https://get.hy2.sh/) --remove
|
||||||
dest: "{{ hysteria2_install_script_remote_path }}"
|
executable: /bin/bash
|
||||||
mode: "0755"
|
|
||||||
|
|
||||||
- name: Remove Hysteria2 binary and systemd units via official script
|
|
||||||
ansible.builtin.command:
|
|
||||||
cmd: "{{ hysteria2_install_script_remote_path }} --remove"
|
|
||||||
register: _hysteria2_remove
|
register: _hysteria2_remove
|
||||||
changed_when: _hysteria2_remove.rc == 0
|
|
||||||
failed_when: false
|
failed_when: false
|
||||||
|
|
||||||
- name: Show official script removal output
|
- name: Remove Hysteria2 configuration directory
|
||||||
ansible.builtin.debug:
|
|
||||||
msg: "{{ _hysteria2_remove.stdout_lines | default(['install_server.sh --remove: no output']) }}"
|
|
||||||
when: _hysteria2_remove.stdout_lines is defined
|
|
||||||
|
|
||||||
- name: Remove Hysteria2 configuration and ACME data
|
|
||||||
ansible.builtin.file:
|
ansible.builtin.file:
|
||||||
path: "{{ item }}"
|
path: "{{ hysteria2_config_path | dirname }}"
|
||||||
state: absent
|
state: absent
|
||||||
loop:
|
when: hysteria2_uninstall_remove_config | bool
|
||||||
- "{{ hysteria2_config_path | dirname }}"
|
|
||||||
- "/var/lib/{{ hysteria2_system_user | default('hysteria') }}"
|
|
||||||
|
|
||||||
- name: Remove masquerade web directory
|
- name: Remove masquerade web directory
|
||||||
ansible.builtin.file:
|
ansible.builtin.file:
|
||||||
path: "{{ hysteria2_masq_dir }}"
|
path: "{{ hysteria2_masq_dir }}"
|
||||||
state: absent
|
state: absent
|
||||||
when: hysteria2_uninstall_remove_masq | default(true) | bool
|
when: hysteria2_uninstall_remove_masq | bool
|
||||||
|
|
||||||
- name: Remove enabled hysteria-server systemd symlink
|
|
||||||
ansible.builtin.file:
|
|
||||||
path: /etc/systemd/system/multi-user.target.wants/hysteria-server.service
|
|
||||||
state: absent
|
|
||||||
failed_when: false
|
|
||||||
|
|
||||||
- name: Find enabled hysteria-server@ systemd symlinks
|
|
||||||
ansible.builtin.find:
|
|
||||||
paths: /etc/systemd/system/multi-user.target.wants
|
|
||||||
patterns: hysteria-server@*.service
|
|
||||||
file_type: file
|
|
||||||
register: _hysteria2_systemd_instance_wants
|
|
||||||
failed_when: false
|
|
||||||
|
|
||||||
- name: Remove enabled hysteria-server@ systemd symlinks
|
|
||||||
ansible.builtin.file:
|
|
||||||
path: "{{ item.path }}"
|
|
||||||
state: absent
|
|
||||||
loop: "{{ _hysteria2_systemd_instance_wants.files | default([]) }}"
|
|
||||||
failed_when: false
|
|
||||||
|
|
||||||
- name: Remove Hysteria system user and home directory
|
|
||||||
ansible.builtin.user:
|
|
||||||
name: "{{ hysteria2_system_user | default('hysteria') }}"
|
|
||||||
state: absent
|
|
||||||
remove: true
|
|
||||||
failed_when: false
|
|
||||||
|
|
||||||
- name: Find temporary Hysteria client configs on server
|
|
||||||
ansible.builtin.find:
|
|
||||||
paths: /tmp
|
|
||||||
patterns: hysteria-client-*.yaml
|
|
||||||
file_type: file
|
|
||||||
register: _hysteria2_tmp_client_configs
|
|
||||||
failed_when: false
|
|
||||||
|
|
||||||
- name: Remove temporary Hysteria client configs on server
|
|
||||||
ansible.builtin.file:
|
|
||||||
path: "{{ item.path }}"
|
|
||||||
state: absent
|
|
||||||
loop: "{{ _hysteria2_tmp_client_configs.files | default([]) }}"
|
|
||||||
failed_when: false
|
|
||||||
|
|
||||||
- name: Check if ufw is available and active
|
|
||||||
ansible.builtin.command: ufw status
|
|
||||||
register: _hysteria2_ufw_status
|
|
||||||
changed_when: false
|
|
||||||
failed_when: false
|
|
||||||
|
|
||||||
- name: Remove firewall rules added during install
|
|
||||||
ansible.builtin.command: "ufw delete allow {{ item }}"
|
|
||||||
loop: "{{ hysteria2_uninstall_ufw_rules }}"
|
|
||||||
register: _hysteria2_ufw_delete
|
|
||||||
changed_when: >-
|
|
||||||
_hysteria2_ufw_delete.rc == 0
|
|
||||||
and 'Could not delete' not in (_hysteria2_ufw_delete.stdout | default(''))
|
|
||||||
and 'Could not find' not in (_hysteria2_ufw_delete.stderr | default(''))
|
|
||||||
failed_when: false
|
|
||||||
when: "'active' in (_hysteria2_ufw_status.stdout | default(''))"
|
|
||||||
|
|
||||||
- name: Remove packages installed for Hysteria2
|
|
||||||
ansible.builtin.apt:
|
|
||||||
name: "{{ _hysteria2_apt_packages }}"
|
|
||||||
state: absent
|
|
||||||
purge: true
|
|
||||||
autoremove: true
|
|
||||||
vars:
|
|
||||||
_hysteria2_apt_packages: >-
|
|
||||||
{{
|
|
||||||
['curl', 'micro']
|
|
||||||
+ (['qrencode'] if hysteria2_generate_qr_png | default(true) | bool else [])
|
|
||||||
}}
|
|
||||||
|
|
||||||
- name: Remove copied install script from server
|
|
||||||
ansible.builtin.file:
|
|
||||||
path: "{{ hysteria2_install_script_remote_path }}"
|
|
||||||
state: absent
|
|
||||||
|
|
||||||
- name: Reload systemd after uninstall
|
- name: Reload systemd after uninstall
|
||||||
ansible.builtin.systemd:
|
ansible.builtin.systemd:
|
||||||
daemon_reload: true
|
daemon_reload: true
|
||||||
|
|
||||||
- name: Remove local output directory for this server
|
- name: Show uninstall result
|
||||||
|
ansible.builtin.debug:
|
||||||
|
msg: >-
|
||||||
|
Hysteria2 удалён с {{ inventory_hostname }}.
|
||||||
|
{% if not hysteria2_uninstall_remove_local_output | bool %}
|
||||||
|
Локальные URL/QR в {{ hysteria2_output_dir }}/{{ hysteria2_output_name }}/ сохранены.
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
- name: Remove local exported client files
|
||||||
ansible.builtin.file:
|
ansible.builtin.file:
|
||||||
path: "{{ hysteria2_output_dir }}/{{ hysteria2_output_name }}"
|
path: "{{ hysteria2_output_dir }}/{{ hysteria2_output_name }}"
|
||||||
state: absent
|
state: absent
|
||||||
delegate_to: localhost
|
delegate_to: localhost
|
||||||
become: false
|
become: false
|
||||||
|
when: hysteria2_uninstall_remove_local_output | bool
|
||||||
- name: Show uninstall result
|
|
||||||
ansible.builtin.debug:
|
|
||||||
msg: >-
|
|
||||||
Hysteria2 полностью удалён с {{ inventory_hostname }}.
|
|
||||||
Локальная папка {{ hysteria2_output_dir }}/{{ hysteria2_output_name }}/ удалена.
|
|
||||||
{% if hysteria2_uninstall_rebuild_global_index | default(true) | bool %}
|
|
||||||
{{ hysteria2_output_dir }}/index.html будет пересобран без этого сервера.
|
|
||||||
{% endif %}
|
|
||||||
|
|||||||
@@ -10,16 +10,6 @@
|
|||||||
- update
|
- update
|
||||||
- export
|
- export
|
||||||
|
|
||||||
- name: Initialize empty saved export metadata
|
|
||||||
ansible.builtin.set_fact:
|
|
||||||
_hysteria2_saved_passwords: {}
|
|
||||||
_hysteria2_saved_server_info: {}
|
|
||||||
when: not _hysteria2_saved_info.stat.exists
|
|
||||||
tags:
|
|
||||||
- install
|
|
||||||
- update
|
|
||||||
- export
|
|
||||||
|
|
||||||
- name: Load saved user passwords from local export
|
- name: Load saved user passwords from local export
|
||||||
when: _hysteria2_saved_info.stat.exists
|
when: _hysteria2_saved_info.stat.exists
|
||||||
block:
|
block:
|
||||||
@@ -30,9 +20,8 @@
|
|||||||
delegate_to: localhost
|
delegate_to: localhost
|
||||||
become: false
|
become: false
|
||||||
|
|
||||||
- name: Parse saved export metadata
|
- name: Parse saved passwords into lookup dict
|
||||||
ansible.builtin.set_fact:
|
ansible.builtin.set_fact:
|
||||||
_hysteria2_saved_server_info: "{{ _hysteria2_saved_info_raw.content | b64decode | from_yaml }}"
|
|
||||||
_hysteria2_saved_passwords: >-
|
_hysteria2_saved_passwords: >-
|
||||||
{{
|
{{
|
||||||
dict(
|
dict(
|
||||||
@@ -44,14 +33,12 @@
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
delegate_to: localhost
|
|
||||||
become: false
|
|
||||||
tags:
|
tags:
|
||||||
- install
|
- install
|
||||||
- update
|
- update
|
||||||
- export
|
- export
|
||||||
|
|
||||||
- name: Resolve user list with passwords from inventory, vault and previous export
|
- name: Resolve user list with optional fixed passwords
|
||||||
ansible.builtin.set_fact:
|
ansible.builtin.set_fact:
|
||||||
hysteria2_resolved_users: "{{ hysteria2_resolved_users | default([]) + [ _entry ] }}"
|
hysteria2_resolved_users: "{{ hysteria2_resolved_users | default([]) + [ _entry ] }}"
|
||||||
vars:
|
vars:
|
||||||
@@ -59,26 +46,8 @@
|
|||||||
_password: >-
|
_password: >-
|
||||||
{{
|
{{
|
||||||
(
|
(
|
||||||
item.password
|
item.password if item is mapping
|
||||||
if item is mapping and (item.password | default('') | length > 0)
|
) | default('', true)
|
||||||
else none
|
|
||||||
)
|
|
||||||
| default(
|
|
||||||
hysteria2_user_passwords[_username]
|
|
||||||
if (
|
|
||||||
hysteria2_user_passwords is defined
|
|
||||||
and (hysteria2_user_passwords[_username] | default('') | length > 0)
|
|
||||||
)
|
|
||||||
else none,
|
|
||||||
true
|
|
||||||
)
|
|
||||||
| default(
|
|
||||||
_hysteria2_saved_passwords[_username]
|
|
||||||
if (_hysteria2_saved_passwords[_username] | default('') | length > 0)
|
|
||||||
else none,
|
|
||||||
true
|
|
||||||
)
|
|
||||||
| default('', true)
|
|
||||||
}}
|
}}
|
||||||
_entry:
|
_entry:
|
||||||
name: "{{ _username }}"
|
name: "{{ _username }}"
|
||||||
|
|||||||
@@ -15,14 +15,11 @@
|
|||||||
--text: #e6edf3;
|
--text: #e6edf3;
|
||||||
--muted: #8b949e;
|
--muted: #8b949e;
|
||||||
--accent: #58a6ff;
|
--accent: #58a6ff;
|
||||||
--accent-2: #3fb950;
|
--accent-2: #a371f7;
|
||||||
--accent-soft: rgba(88, 166, 255, 0.12);
|
--accent-soft: rgba(88, 166, 255, 0.12);
|
||||||
|
--accent-soft-2: rgba(163, 113, 247, 0.12);
|
||||||
--success: #3fb950;
|
--success: #3fb950;
|
||||||
--success-soft: rgba(63, 185, 80, 0.15);
|
--success-soft: rgba(63, 185, 80, 0.15);
|
||||||
--danger: #f85149;
|
|
||||||
--danger-soft: rgba(248, 81, 73, 0.15);
|
|
||||||
--warn: #d29922;
|
|
||||||
--warn-soft: rgba(210, 153, 34, 0.15);
|
|
||||||
--radius: 14px;
|
--radius: 14px;
|
||||||
--shadow: 0 12px 40px rgba(0, 0, 0, 0.35);
|
--shadow: 0 12px 40px rgba(0, 0, 0, 0.35);
|
||||||
}
|
}
|
||||||
@@ -36,241 +33,96 @@
|
|||||||
--text: #1f2328;
|
--text: #1f2328;
|
||||||
--muted: #656d76;
|
--muted: #656d76;
|
||||||
--accent: #0969da;
|
--accent: #0969da;
|
||||||
--accent-2: #1a7f37;
|
--accent-2: #8250df;
|
||||||
--accent-soft: rgba(9, 105, 218, 0.08);
|
--accent-soft: rgba(9, 105, 218, 0.08);
|
||||||
|
--accent-soft-2: rgba(130, 80, 223, 0.08);
|
||||||
--success: #1a7f37;
|
--success: #1a7f37;
|
||||||
--success-soft: rgba(26, 127, 55, 0.1);
|
--success-soft: rgba(26, 127, 55, 0.1);
|
||||||
--danger: #cf222e;
|
|
||||||
--danger-soft: rgba(207, 34, 46, 0.1);
|
|
||||||
--warn: #9a6700;
|
|
||||||
--warn-soft: rgba(154, 103, 0, 0.1);
|
|
||||||
--shadow: 0 10px 30px rgba(31, 35, 40, 0.08);
|
--shadow: 0 10px 30px rgba(31, 35, 40, 0.08);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||||
body {
|
body {
|
||||||
font-family: "Segoe UI", "SF Pro Display", "Helvetica Neue", Arial, sans-serif;
|
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
|
||||||
background:
|
background: var(--bg);
|
||||||
radial-gradient(ellipse 80% 50% at 20% -10%, var(--accent-soft), transparent),
|
|
||||||
radial-gradient(ellipse 60% 40% at 100% 0%, rgba(63, 185, 80, 0.08), transparent),
|
|
||||||
var(--bg);
|
|
||||||
color: var(--text);
|
color: var(--text);
|
||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
}
|
}
|
||||||
.hero {
|
.hero {
|
||||||
padding: 2rem 1.5rem 1.25rem;
|
background:
|
||||||
|
radial-gradient(ellipse 80% 60% at 50% -10%, var(--accent-soft), transparent),
|
||||||
|
radial-gradient(ellipse 60% 40% at 90% 10%, var(--accent-soft-2), transparent),
|
||||||
|
var(--bg-soft);
|
||||||
|
border-bottom: 1px solid var(--border);
|
||||||
|
padding: 2.5rem 1.5rem 2rem;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
.hero h1 {
|
.hero h1 {
|
||||||
font-size: clamp(1.75rem, 4vw, 2.25rem);
|
font-size: clamp(1.75rem, 4vw, 2.25rem);
|
||||||
font-weight: 800;
|
font-weight: 800;
|
||||||
letter-spacing: -0.03em;
|
letter-spacing: -0.03em;
|
||||||
margin-bottom: 0.35rem;
|
margin-bottom: 0.5rem;
|
||||||
color: var(--accent);
|
background: linear-gradient(135deg, var(--accent), var(--accent-2));
|
||||||
|
-webkit-background-clip: text;
|
||||||
|
-webkit-text-fill-color: transparent;
|
||||||
|
background-clip: text;
|
||||||
}
|
}
|
||||||
.hero p { color: var(--muted); font-size: 0.95rem; }
|
.hero p { color: var(--muted); font-size: 0.95rem; }
|
||||||
.tabs {
|
.stats {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 1rem;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
margin-top: 1.25rem;
|
||||||
|
}
|
||||||
|
.stat {
|
||||||
|
padding: 0.5rem 1rem;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
border-radius: 999px;
|
||||||
|
background: var(--bg-card);
|
||||||
|
font-size: 0.85rem;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
.stat span { color: var(--accent); }
|
||||||
|
.nav {
|
||||||
position: sticky;
|
position: sticky;
|
||||||
top: 0;
|
top: 0;
|
||||||
z-index: 50;
|
z-index: 50;
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 0.45rem;
|
gap: 0.5rem;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
padding: 0.75rem 1rem;
|
padding: 0.85rem 1rem;
|
||||||
background: color-mix(in srgb, var(--bg-soft) 90%, transparent);
|
background: color-mix(in srgb, var(--bg-soft) 88%, transparent);
|
||||||
backdrop-filter: blur(12px);
|
backdrop-filter: blur(10px);
|
||||||
border-bottom: 1px solid var(--border);
|
border-bottom: 1px solid var(--border);
|
||||||
}
|
}
|
||||||
.tab {
|
.nav a {
|
||||||
appearance: none;
|
padding: 0.4rem 0.85rem;
|
||||||
|
border-radius: 999px;
|
||||||
border: 1px solid var(--border);
|
border: 1px solid var(--border);
|
||||||
background: var(--bg-card);
|
background: var(--bg-card);
|
||||||
color: var(--text);
|
color: var(--text);
|
||||||
padding: 0.5rem 0.95rem;
|
text-decoration: none;
|
||||||
border-radius: 999px;
|
font-size: 0.82rem;
|
||||||
font-size: 0.85rem;
|
font-weight: 600;
|
||||||
font-weight: 650;
|
transition: border-color 0.15s, background 0.15s, color 0.15s;
|
||||||
cursor: pointer;
|
|
||||||
transition: border-color 0.15s, background 0.15s, color 0.15s, box-shadow 0.15s;
|
|
||||||
}
|
}
|
||||||
.tab:hover {
|
.nav a:hover {
|
||||||
border-color: var(--accent);
|
border-color: var(--accent);
|
||||||
color: var(--accent);
|
color: var(--accent);
|
||||||
background: var(--accent-soft);
|
background: var(--accent-soft);
|
||||||
}
|
}
|
||||||
.tab.active {
|
|
||||||
border-color: var(--accent);
|
|
||||||
background: var(--accent-soft);
|
|
||||||
color: var(--accent);
|
|
||||||
box-shadow: 0 0 0 3px var(--accent-soft);
|
|
||||||
}
|
|
||||||
.tab .dot {
|
|
||||||
display: inline-block;
|
|
||||||
width: 7px;
|
|
||||||
height: 7px;
|
|
||||||
border-radius: 50%;
|
|
||||||
margin-right: 0.35rem;
|
|
||||||
vertical-align: middle;
|
|
||||||
background: var(--muted);
|
|
||||||
}
|
|
||||||
.tab .dot.up { background: var(--success); box-shadow: 0 0 8px var(--success); }
|
|
||||||
.tab .dot.down { background: var(--danger); }
|
|
||||||
.container {
|
.container {
|
||||||
max-width: 1080px;
|
max-width: 980px;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
padding: 1.5rem 1rem 3rem;
|
padding: 1.5rem 1rem 3rem;
|
||||||
}
|
}
|
||||||
.tab-panel { display: none; animation: fadeIn 0.2s ease; }
|
.server-section {
|
||||||
.tab-panel.active { display: block; }
|
scroll-margin-top: 4.5rem;
|
||||||
@keyframes fadeIn {
|
margin-bottom: 2.5rem;
|
||||||
from { opacity: 0; transform: translateY(6px); }
|
|
||||||
to { opacity: 1; transform: translateY(0); }
|
|
||||||
}
|
}
|
||||||
.metrics {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(auto-fit, minmax(160px, 1fr));
|
|
||||||
gap: 0.85rem;
|
|
||||||
margin-bottom: 1.5rem;
|
|
||||||
}
|
|
||||||
.metric {
|
|
||||||
background: var(--bg-card);
|
|
||||||
border: 1px solid var(--border);
|
|
||||||
border-radius: var(--radius);
|
|
||||||
padding: 1.1rem 1.2rem;
|
|
||||||
box-shadow: var(--shadow);
|
|
||||||
}
|
|
||||||
.metric .label {
|
|
||||||
font-size: 0.72rem;
|
|
||||||
font-weight: 700;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.06em;
|
|
||||||
color: var(--muted);
|
|
||||||
margin-bottom: 0.35rem;
|
|
||||||
}
|
|
||||||
.metric .value {
|
|
||||||
font-size: 1.75rem;
|
|
||||||
font-weight: 800;
|
|
||||||
letter-spacing: -0.03em;
|
|
||||||
color: var(--accent);
|
|
||||||
}
|
|
||||||
.metric .sub {
|
|
||||||
margin-top: 0.2rem;
|
|
||||||
font-size: 0.78rem;
|
|
||||||
color: var(--muted);
|
|
||||||
}
|
|
||||||
.section-title {
|
|
||||||
font-size: 1.05rem;
|
|
||||||
font-weight: 700;
|
|
||||||
margin: 0 0 0.85rem;
|
|
||||||
}
|
|
||||||
.server-stats {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
|
|
||||||
gap: 1rem;
|
|
||||||
margin-bottom: 1.75rem;
|
|
||||||
}
|
|
||||||
.server-stat-card {
|
|
||||||
background: var(--bg-card);
|
|
||||||
border: 1px solid var(--border);
|
|
||||||
border-radius: var(--radius);
|
|
||||||
padding: 1.15rem 1.25rem;
|
|
||||||
box-shadow: var(--shadow);
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 0.75rem;
|
|
||||||
}
|
|
||||||
.server-stat-card header {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
align-items: flex-start;
|
|
||||||
gap: 0.75rem;
|
|
||||||
}
|
|
||||||
.server-stat-card h3 {
|
|
||||||
font-size: 1.1rem;
|
|
||||||
font-weight: 750;
|
|
||||||
}
|
|
||||||
.badge {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.35rem;
|
|
||||||
padding: 0.25rem 0.65rem;
|
|
||||||
border-radius: 999px;
|
|
||||||
font-size: 0.72rem;
|
|
||||||
font-weight: 700;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
.badge.up {
|
|
||||||
background: var(--success-soft);
|
|
||||||
color: var(--success);
|
|
||||||
border: 1px solid color-mix(in srgb, var(--success) 35%, transparent);
|
|
||||||
}
|
|
||||||
.badge.down {
|
|
||||||
background: var(--danger-soft);
|
|
||||||
color: var(--danger);
|
|
||||||
border: 1px solid color-mix(in srgb, var(--danger) 35%, transparent);
|
|
||||||
}
|
|
||||||
.meta-grid {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: 1fr 1fr;
|
|
||||||
gap: 0.55rem 0.85rem;
|
|
||||||
}
|
|
||||||
.meta-item label {
|
|
||||||
display: block;
|
|
||||||
font-size: 0.68rem;
|
|
||||||
font-weight: 700;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.05em;
|
|
||||||
color: var(--muted);
|
|
||||||
}
|
|
||||||
.meta-item span,
|
|
||||||
.meta-item code {
|
|
||||||
font-size: 0.88rem;
|
|
||||||
font-weight: 600;
|
|
||||||
word-break: break-all;
|
|
||||||
}
|
|
||||||
.meta-item code {
|
|
||||||
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
|
|
||||||
font-size: 0.8rem;
|
|
||||||
}
|
|
||||||
.matrix-wrap {
|
|
||||||
overflow-x: auto;
|
|
||||||
border: 1px solid var(--border);
|
|
||||||
border-radius: var(--radius);
|
|
||||||
background: var(--bg-card);
|
|
||||||
box-shadow: var(--shadow);
|
|
||||||
}
|
|
||||||
table.matrix {
|
|
||||||
width: 100%;
|
|
||||||
border-collapse: collapse;
|
|
||||||
min-width: 480px;
|
|
||||||
}
|
|
||||||
table.matrix th,
|
|
||||||
table.matrix td {
|
|
||||||
padding: 0.65rem 0.85rem;
|
|
||||||
border-bottom: 1px solid var(--border);
|
|
||||||
text-align: center;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
}
|
|
||||||
table.matrix th {
|
|
||||||
background: var(--bg-soft);
|
|
||||||
font-weight: 700;
|
|
||||||
position: sticky;
|
|
||||||
top: 0;
|
|
||||||
}
|
|
||||||
table.matrix th:first-child,
|
|
||||||
table.matrix td:first-child {
|
|
||||||
text-align: left;
|
|
||||||
font-weight: 650;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
table.matrix tr:last-child td { border-bottom: none; }
|
|
||||||
.cell-yes {
|
|
||||||
color: var(--success);
|
|
||||||
font-weight: 800;
|
|
||||||
}
|
|
||||||
.cell-no { color: var(--muted); opacity: 0.45; }
|
|
||||||
.server-header {
|
.server-header {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
@@ -285,8 +137,15 @@
|
|||||||
box-shadow: var(--shadow);
|
box-shadow: var(--shadow);
|
||||||
border-left: 4px solid var(--accent);
|
border-left: 4px solid var(--accent);
|
||||||
}
|
}
|
||||||
.server-header h2 { font-size: 1.35rem; font-weight: 700; }
|
.server-header h2 {
|
||||||
.server-header .domain { color: var(--muted); font-size: 0.9rem; margin-top: 0.15rem; }
|
font-size: 1.35rem;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
.server-header .domain {
|
||||||
|
color: var(--muted);
|
||||||
|
font-size: 0.9rem;
|
||||||
|
margin-top: 0.15rem;
|
||||||
|
}
|
||||||
.server-link {
|
.server-link {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@@ -377,13 +236,6 @@
|
|||||||
width: 160px;
|
width: 160px;
|
||||||
height: 160px;
|
height: 160px;
|
||||||
image-rendering: pixelated;
|
image-rendering: pixelated;
|
||||||
cursor: zoom-in;
|
|
||||||
border-radius: 4px;
|
|
||||||
transition: transform 0.2s ease, box-shadow 0.2s ease;
|
|
||||||
}
|
|
||||||
.qr-block img:hover {
|
|
||||||
transform: scale(1.03);
|
|
||||||
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.18);
|
|
||||||
}
|
}
|
||||||
.files {
|
.files {
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -430,265 +282,31 @@
|
|||||||
z-index: 100;
|
z-index: 100;
|
||||||
}
|
}
|
||||||
.toast.show { transform: translateX(-50%) translateY(0); opacity: 1; }
|
.toast.show { transform: translateX(-50%) translateY(0); opacity: 1; }
|
||||||
.lightbox {
|
|
||||||
position: fixed;
|
|
||||||
inset: 0;
|
|
||||||
z-index: 200;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
padding: 1rem;
|
|
||||||
box-sizing: border-box;
|
|
||||||
background: rgba(8, 12, 18, 0.72);
|
|
||||||
backdrop-filter: blur(10px);
|
|
||||||
-webkit-backdrop-filter: blur(10px);
|
|
||||||
opacity: 0;
|
|
||||||
visibility: hidden;
|
|
||||||
pointer-events: none;
|
|
||||||
transition: opacity 0.22s ease, visibility 0.22s ease;
|
|
||||||
}
|
|
||||||
.lightbox.open {
|
|
||||||
opacity: 1;
|
|
||||||
visibility: visible;
|
|
||||||
pointer-events: auto;
|
|
||||||
}
|
|
||||||
.lightbox-panel {
|
|
||||||
position: relative;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
width: min(96vw, calc(100dvh - 2rem));
|
|
||||||
height: calc(100dvh - 2rem);
|
|
||||||
max-height: calc(100dvh - 2rem);
|
|
||||||
padding: 2.5rem 1rem 0.85rem;
|
|
||||||
background: var(--bg-card);
|
|
||||||
border: 1px solid var(--border);
|
|
||||||
border-radius: 18px;
|
|
||||||
box-shadow: 0 24px 64px rgba(0, 0, 0, 0.45);
|
|
||||||
text-align: center;
|
|
||||||
overflow: hidden;
|
|
||||||
box-sizing: border-box;
|
|
||||||
transform: translateY(12px) scale(0.96);
|
|
||||||
transition: transform 0.22s ease;
|
|
||||||
}
|
|
||||||
.lightbox.open .lightbox-panel { transform: translateY(0) scale(1); }
|
|
||||||
.lightbox-media {
|
|
||||||
flex: 1 1 auto;
|
|
||||||
min-height: 0;
|
|
||||||
width: 100%;
|
|
||||||
container-type: size;
|
|
||||||
display: grid;
|
|
||||||
place-items: center;
|
|
||||||
}
|
|
||||||
.lightbox-panel img {
|
|
||||||
display: block;
|
|
||||||
width: min(100cqi, 100cqb);
|
|
||||||
height: min(100cqi, 100cqb);
|
|
||||||
max-width: 100%;
|
|
||||||
max-height: 100%;
|
|
||||||
aspect-ratio: 1;
|
|
||||||
object-fit: contain;
|
|
||||||
background: #fff;
|
|
||||||
border-radius: 12px;
|
|
||||||
padding: 0.75rem;
|
|
||||||
box-sizing: border-box;
|
|
||||||
image-rendering: pixelated;
|
|
||||||
}
|
|
||||||
.lightbox-caption {
|
|
||||||
flex-shrink: 0;
|
|
||||||
margin-top: 0.55rem;
|
|
||||||
font-size: 0.95rem;
|
|
||||||
font-weight: 650;
|
|
||||||
color: var(--text);
|
|
||||||
}
|
|
||||||
.lightbox-actions {
|
|
||||||
flex-shrink: 0;
|
|
||||||
margin-top: 0.65rem;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
}
|
|
||||||
.lightbox-download {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.45rem;
|
|
||||||
padding: 0.55rem 1rem;
|
|
||||||
border-radius: 999px;
|
|
||||||
border: 1px solid var(--border);
|
|
||||||
background: var(--bg-input);
|
|
||||||
color: var(--accent);
|
|
||||||
text-decoration: none;
|
|
||||||
font: inherit;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
font-weight: 650;
|
|
||||||
cursor: pointer;
|
|
||||||
transition: color 0.15s, border-color 0.15s, background 0.15s;
|
|
||||||
}
|
|
||||||
.lightbox-download:hover {
|
|
||||||
border-color: var(--accent);
|
|
||||||
background: var(--accent-soft);
|
|
||||||
}
|
|
||||||
.lightbox-download svg { width: 16px; height: 16px; flex-shrink: 0; }
|
|
||||||
.lightbox-close {
|
|
||||||
position: absolute;
|
|
||||||
top: 0.65rem;
|
|
||||||
right: 0.65rem;
|
|
||||||
width: 36px;
|
|
||||||
height: 36px;
|
|
||||||
border: 1px solid var(--border);
|
|
||||||
border-radius: 999px;
|
|
||||||
background: var(--bg-input);
|
|
||||||
color: var(--muted);
|
|
||||||
cursor: pointer;
|
|
||||||
font-size: 1.25rem;
|
|
||||||
line-height: 1;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
transition: color 0.15s, border-color 0.15s, background 0.15s;
|
|
||||||
}
|
|
||||||
.lightbox-close:hover {
|
|
||||||
color: var(--accent);
|
|
||||||
border-color: var(--accent);
|
|
||||||
background: var(--accent-soft);
|
|
||||||
}
|
|
||||||
body.lightbox-open { overflow: hidden; }
|
|
||||||
.probe-note {
|
|
||||||
margin-top: 1rem;
|
|
||||||
font-size: 0.78rem;
|
|
||||||
color: var(--muted);
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<header class="hero">
|
<header class="hero">
|
||||||
<h1>Hysteria2</h1>
|
<h1>Hysteria2</h1>
|
||||||
<p>Каталог VPN и сводная статистика</p>
|
<p>Общий каталог VPN-подключений</p>
|
||||||
|
<div class="stats">
|
||||||
|
<div class="stat"><span>{{ hysteria2_global_servers | length }}</span> серверов</div>
|
||||||
|
<div class="stat"><span>{{ total_users }}</span> пользователей</div>
|
||||||
|
</div>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<nav class="tabs" role="tablist" aria-label="Разделы">
|
<nav class="nav" aria-label="Серверы">
|
||||||
<button type="button" class="tab active" role="tab" aria-selected="true" data-tab="stats" id="tab-btn-stats">Статистика</button>
|
|
||||||
{% for server in hysteria2_global_servers %}
|
{% for server in hysteria2_global_servers %}
|
||||||
<button type="button" class="tab" role="tab" aria-selected="false" data-tab="server-{{ server.dir | e }}" id="tab-btn-{{ server.dir | e }}">
|
<a href="#server-{{ server.dir | e }}">{{ server.name | e }}</a>
|
||||||
<span class="dot {{ 'up' if server.reachable | default(false) else 'down' }}" aria-hidden="true"></span>{{ server.name | e }}
|
|
||||||
</button>
|
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<main class="container">
|
<main class="container">
|
||||||
<section class="tab-panel active" id="tab-stats" role="tabpanel" aria-labelledby="tab-btn-stats">
|
|
||||||
<div class="metrics">
|
|
||||||
<div class="metric">
|
|
||||||
<div class="label">Серверы</div>
|
|
||||||
<div class="value">{{ hysteria2_global_servers | length }}</div>
|
|
||||||
<div class="sub">в локальном экспорте</div>
|
|
||||||
</div>
|
|
||||||
<div class="metric">
|
|
||||||
<div class="label">Доступность</div>
|
|
||||||
<div class="value">{{ reachable_count }}/{{ hysteria2_global_servers | length }}</div>
|
|
||||||
<div class="sub">TCP :порт отвечает</div>
|
|
||||||
</div>
|
|
||||||
<div class="metric">
|
|
||||||
<div class="label">Учётки</div>
|
|
||||||
<div class="value">{{ total_users }}</div>
|
|
||||||
<div class="sub">сумма по серверам</div>
|
|
||||||
</div>
|
|
||||||
<div class="metric">
|
|
||||||
<div class="label">Уникальные</div>
|
|
||||||
<div class="value">{{ unique_users | length }}</div>
|
|
||||||
<div class="sub">разных пользователей</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2 class="section-title">Серверы</h2>
|
|
||||||
<div class="server-stats">
|
|
||||||
{% for server in hysteria2_global_servers %}
|
{% for server in hysteria2_global_servers %}
|
||||||
<article class="server-stat-card">
|
<section class="server-section" id="server-{{ server.dir | e }}">
|
||||||
<header>
|
|
||||||
<div>
|
|
||||||
<h3>{{ server.name | e }}</h3>
|
|
||||||
</div>
|
|
||||||
{% if server.reachable | default(false) %}
|
|
||||||
<span class="badge up">● online</span>
|
|
||||||
{% else %}
|
|
||||||
<span class="badge down">● offline</span>
|
|
||||||
{% endif %}
|
|
||||||
</header>
|
|
||||||
<div class="meta-grid">
|
|
||||||
<div class="meta-item">
|
|
||||||
<label>Домен</label>
|
|
||||||
<span>{{ server.domain | e }}</span>
|
|
||||||
</div>
|
|
||||||
<div class="meta-item">
|
|
||||||
<label>Порт</label>
|
|
||||||
<span>{{ server.port }}</span>
|
|
||||||
</div>
|
|
||||||
<div class="meta-item">
|
|
||||||
<label>IP</label>
|
|
||||||
<code>{{ server.host_ip | default('—') | e }}</code>
|
|
||||||
</div>
|
|
||||||
<div class="meta-item">
|
|
||||||
<label>Режим</label>
|
|
||||||
<span>{{ server.mode | default('masquerade') | e }}</span>
|
|
||||||
</div>
|
|
||||||
<div class="meta-item">
|
|
||||||
<label>Пользователи</label>
|
|
||||||
<span>{{ server.users | length }}</span>
|
|
||||||
</div>
|
|
||||||
<div class="meta-item">
|
|
||||||
<label>QR-коды</label>
|
|
||||||
<span>{{ server.users | selectattr('has_png') | list | length }}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div style="display:flex; gap:0.5rem; flex-wrap:wrap; margin-top:0.25rem;">
|
|
||||||
<button type="button" class="tab" data-tab="server-{{ server.dir | e }}" style="margin:0;">Открыть вкладку</button>
|
|
||||||
<a class="server-link" href="{{ server.dir | e }}/index.html">Страница сервера →</a>
|
|
||||||
</div>
|
|
||||||
</article>
|
|
||||||
{% endfor %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2 class="section-title">Пользователи × серверы</h2>
|
|
||||||
<div class="matrix-wrap">
|
|
||||||
<table class="matrix">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>Пользователь</th>
|
|
||||||
{% for server in hysteria2_global_servers %}
|
|
||||||
<th>{{ server.name | e }}</th>
|
|
||||||
{% endfor %}
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{% for uname in unique_users %}
|
|
||||||
<tr>
|
|
||||||
<td>{{ uname | e }}</td>
|
|
||||||
{% for server in hysteria2_global_servers %}
|
|
||||||
{% set names = server.users | map(attribute='name') | list %}
|
|
||||||
<td class="{{ 'cell-yes' if uname in names else 'cell-no' }}">{{ '✓' if uname in names else '—' }}</td>
|
|
||||||
{% endfor %}
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<p class="probe-note">Доступность проверена с control node при генерации ({{ generated_at | default('') }}): TCP connect к IP/домену и порту Hysteria.</p>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
{% for server in hysteria2_global_servers %}
|
|
||||||
<section class="tab-panel" id="tab-server-{{ server.dir | e }}" role="tabpanel" aria-labelledby="tab-btn-{{ server.dir | e }}" hidden>
|
|
||||||
<div class="server-header">
|
<div class="server-header">
|
||||||
<div>
|
<div>
|
||||||
<h2>{{ server.name | e }}</h2>
|
<h2>{{ server.name | e }}</h2>
|
||||||
<p class="domain">
|
<p class="domain">{{ server.domain | e }}:{{ server.port }}</p>
|
||||||
{{ server.domain | e }}:{{ server.port }}
|
|
||||||
{% if server.host_ip | default('') | length > 0 %}
|
|
||||||
· <code>{{ server.host_ip | e }}</code>
|
|
||||||
{% endif %}
|
|
||||||
{% if server.reachable | default(false) %}
|
|
||||||
· <span style="color:var(--success);font-weight:700;">online</span>
|
|
||||||
{% else %}
|
|
||||||
· <span style="color:var(--danger);font-weight:700;">offline</span>
|
|
||||||
{% endif %}
|
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
<a class="server-link" href="{{ server.dir | e }}/index.html">Страница сервера →</a>
|
<a class="server-link" href="{{ server.dir | e }}/index.html">Страница сервера →</a>
|
||||||
</div>
|
</div>
|
||||||
@@ -718,33 +336,19 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% set _png = namespace(b64='', data='') %}
|
|
||||||
{% if user.has_png | default(false) %}
|
{% if user.has_png | default(false) %}
|
||||||
{% set _png.b64 = lookup('pipe', 'base64 < ' ~ ((hysteria2_output_dir ~ '/' ~ server.dir ~ '/' ~ user.name ~ '.png') | quote)) | regex_replace('\\s+', '') %}
|
|
||||||
{% set _png.data = 'data:image/png;base64,' ~ _png.b64 %}
|
|
||||||
<div class="qr-block">
|
<div class="qr-block">
|
||||||
<img
|
<img src="{{ server.dir | e }}/{{ user.name | e }}.png" alt="QR {{ user.name | e }}" width="160" height="160">
|
||||||
src="{{ _png.data }}"
|
|
||||||
alt="QR {{ user.name | e }}"
|
|
||||||
width="160"
|
|
||||||
height="160"
|
|
||||||
role="button"
|
|
||||||
tabindex="0"
|
|
||||||
data-lightbox-src="{{ _png.data }}"
|
|
||||||
data-lightbox-caption="{{ server.name | e }} · {{ user.name | e }}"
|
|
||||||
data-lightbox-download="{{ server.name | e }}-{{ user.name | e }}.png"
|
|
||||||
aria-label="Открыть QR-код {{ user.name | e }}"
|
|
||||||
>
|
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<nav class="files" aria-label="Файлы">
|
<nav class="files" aria-label="Файлы">
|
||||||
<a class="file-download" href="{{ server.dir | e }}/{{ user.name | e }}.url" download="{{ server.name | e }}-{{ user.name | e }}.url" data-filename="{{ server.name | e }}-{{ user.name | e }}.url" data-text="{{ (user.url ~ '\n') | e }}">.url</a>
|
<a href="{{ server.dir | e }}/{{ user.name | e }}.url" download>.url</a>
|
||||||
<a class="file-download" href="{{ server.dir | e }}/{{ user.name | e }}.txt" download="{{ server.name | e }}-{{ user.name | e }}.txt" data-filename="{{ server.name | e }}-{{ user.name | e }}.txt" data-text="{{ ('Server: ' ~ server.name ~ '\nDomain: ' ~ server.domain ~ ':' ~ server.port ~ '\nUser: ' ~ user.name ~ '\nPassword: ' ~ user.password ~ '\n\nURL:\n' ~ user.url ~ '\n') | e }}">.txt</a>
|
<a href="{{ server.dir | e }}/{{ user.name | e }}.txt" download>.txt</a>
|
||||||
{% if user.has_png | default(false) and _png.b64 %}
|
{% if user.has_png | default(false) %}
|
||||||
<a class="file-download" href="{{ server.dir | e }}/{{ user.name | e }}.png" download="{{ server.name | e }}-{{ user.name | e }}.png" data-filename="{{ server.name | e }}-{{ user.name | e }}.png" data-png-b64="{{ _png.b64 }}">.png</a>
|
<a href="{{ server.dir | e }}/{{ user.name | e }}.png" download>.png</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<a class="file-download" href="{{ server.dir | e }}/{{ user.name | e }}.qr.txt" download="{{ server.name | e }}-{{ user.name | e }}.qr.txt" data-filename="{{ server.name | e }}-{{ user.name | e }}.qr.txt" data-text="{{ lookup('file', hysteria2_output_dir ~ '/' ~ server.dir ~ '/' ~ user.name ~ '.qr.txt', errors='ignore') | default('URL: ' ~ user.url ~ '\n', true) | e }}">.qr.txt</a>
|
<a href="{{ server.dir | e }}/{{ user.name | e }}.qr.txt" download>.qr.txt</a>
|
||||||
</nav>
|
</nav>
|
||||||
</article>
|
</article>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -756,22 +360,6 @@
|
|||||||
<footer>Сгенерировано Ansible · {{ generated_at | default('') }}</footer>
|
<footer>Сгенерировано Ansible · {{ generated_at | default('') }}</footer>
|
||||||
<div class="toast" id="toast">Скопировано!</div>
|
<div class="toast" id="toast">Скопировано!</div>
|
||||||
|
|
||||||
<div class="lightbox" id="lightbox" role="dialog" aria-modal="true" aria-hidden="true" aria-labelledby="lightbox-caption">
|
|
||||||
<div class="lightbox-panel" role="document">
|
|
||||||
<button type="button" class="lightbox-close" id="lightbox-close" aria-label="Закрыть">×</button>
|
|
||||||
<div class="lightbox-media">
|
|
||||||
<img id="lightbox-img" src="" alt="">
|
|
||||||
</div>
|
|
||||||
<p class="lightbox-caption" id="lightbox-caption"></p>
|
|
||||||
<div class="lightbox-actions">
|
|
||||||
<button type="button" class="lightbox-download" id="lightbox-download">
|
|
||||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>
|
|
||||||
Скачать QR
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
function copyField(id, btn) {
|
function copyField(id, btn) {
|
||||||
var el = document.getElementById(id);
|
var el = document.getElementById(id);
|
||||||
@@ -796,230 +384,6 @@
|
|||||||
t.classList.add('show');
|
t.classList.add('show');
|
||||||
setTimeout(function() { t.classList.remove('show'); }, 1800);
|
setTimeout(function() { t.classList.remove('show'); }, 1800);
|
||||||
}
|
}
|
||||||
|
|
||||||
(function () {
|
|
||||||
function activateTab(id) {
|
|
||||||
document.querySelectorAll('.tab[data-tab]').forEach(function (btn) {
|
|
||||||
var on = btn.getAttribute('data-tab') === id;
|
|
||||||
btn.classList.toggle('active', on);
|
|
||||||
btn.setAttribute('aria-selected', on ? 'true' : 'false');
|
|
||||||
});
|
|
||||||
document.querySelectorAll('.tab-panel').forEach(function (panel) {
|
|
||||||
var on = panel.id === 'tab-' + id;
|
|
||||||
panel.classList.toggle('active', on);
|
|
||||||
if (on) panel.removeAttribute('hidden');
|
|
||||||
else panel.setAttribute('hidden', '');
|
|
||||||
});
|
|
||||||
try { history.replaceState(null, '', '#' + id); } catch (e) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
document.querySelectorAll('.tab[data-tab]').forEach(function (btn) {
|
|
||||||
btn.addEventListener('click', function () {
|
|
||||||
activateTab(btn.getAttribute('data-tab'));
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
var hash = (location.hash || '#stats').replace(/^#/, '');
|
|
||||||
if (!document.getElementById('tab-' + hash)) hash = 'stats';
|
|
||||||
activateTab(hash);
|
|
||||||
})();
|
|
||||||
|
|
||||||
(function () {
|
|
||||||
var box = document.getElementById('lightbox');
|
|
||||||
var img = document.getElementById('lightbox-img');
|
|
||||||
var caption = document.getElementById('lightbox-caption');
|
|
||||||
var closeBtn = document.getElementById('lightbox-close');
|
|
||||||
var downloadBtn = document.getElementById('lightbox-download');
|
|
||||||
var downloadSrc = '';
|
|
||||||
|
|
||||||
function triggerDataUrlDownload(dataUrl, filename) {
|
|
||||||
var a = document.createElement('a');
|
|
||||||
a.href = dataUrl;
|
|
||||||
a.download = filename;
|
|
||||||
a.rel = 'noopener';
|
|
||||||
document.body.appendChild(a);
|
|
||||||
a.click();
|
|
||||||
a.remove();
|
|
||||||
}
|
|
||||||
|
|
||||||
function triggerFileDownload(blob, filename) {
|
|
||||||
var url = URL.createObjectURL(blob);
|
|
||||||
var a = document.createElement('a');
|
|
||||||
a.href = url;
|
|
||||||
a.download = filename;
|
|
||||||
a.rel = 'noopener';
|
|
||||||
document.body.appendChild(a);
|
|
||||||
a.click();
|
|
||||||
a.remove();
|
|
||||||
setTimeout(function () { URL.revokeObjectURL(url); }, 1500);
|
|
||||||
}
|
|
||||||
|
|
||||||
function downloadQrFromCanvas(filename) {
|
|
||||||
if (!img.complete || !img.naturalWidth) return false;
|
|
||||||
try {
|
|
||||||
var canvas = document.createElement('canvas');
|
|
||||||
canvas.width = img.naturalWidth;
|
|
||||||
canvas.height = img.naturalHeight;
|
|
||||||
canvas.getContext('2d').drawImage(img, 0, 0);
|
|
||||||
// toDataURL sync — download stays in the user-gesture (Safari/Chrome)
|
|
||||||
triggerDataUrlDownload(canvas.toDataURL('image/png'), filename);
|
|
||||||
return true;
|
|
||||||
} catch (err) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function downloadQrImage(e) {
|
|
||||||
e.preventDefault();
|
|
||||||
e.stopPropagation();
|
|
||||||
var filename = downloadBtn.getAttribute('data-filename') || 'qr.png';
|
|
||||||
var src = downloadSrc || img.currentSrc || img.src;
|
|
||||||
|
|
||||||
// Embedded data: URLs work on file:// (no CORS / tainted canvas)
|
|
||||||
if (src && src.indexOf('data:') === 0) {
|
|
||||||
triggerDataUrlDownload(src, filename);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (downloadQrFromCanvas(filename)) return;
|
|
||||||
if (!src || location.protocol === 'file:') return;
|
|
||||||
|
|
||||||
fetch(src)
|
|
||||||
.then(function (res) {
|
|
||||||
if (!res.ok) throw new Error('fetch failed');
|
|
||||||
return res.blob();
|
|
||||||
})
|
|
||||||
.then(function (blob) { triggerFileDownload(blob, filename); })
|
|
||||||
.catch(function () { /* avoid navigating to the image URL */ });
|
|
||||||
}
|
|
||||||
|
|
||||||
function openLightbox(src, text, alt, filename) {
|
|
||||||
var safeName = filename || 'qr.png';
|
|
||||||
img.src = src;
|
|
||||||
img.alt = alt || text || 'QR';
|
|
||||||
caption.textContent = text || '';
|
|
||||||
downloadSrc = src;
|
|
||||||
downloadBtn.setAttribute('data-filename', safeName);
|
|
||||||
downloadBtn.setAttribute('aria-label', 'Скачать ' + safeName);
|
|
||||||
box.classList.add('open');
|
|
||||||
box.setAttribute('aria-hidden', 'false');
|
|
||||||
document.body.classList.add('lightbox-open');
|
|
||||||
closeBtn.focus();
|
|
||||||
}
|
|
||||||
|
|
||||||
function closeLightbox() {
|
|
||||||
box.classList.remove('open');
|
|
||||||
box.setAttribute('aria-hidden', 'true');
|
|
||||||
document.body.classList.remove('lightbox-open');
|
|
||||||
img.removeAttribute('src');
|
|
||||||
downloadSrc = '';
|
|
||||||
downloadBtn.removeAttribute('data-filename');
|
|
||||||
}
|
|
||||||
|
|
||||||
document.querySelectorAll('[data-lightbox-src]').forEach(function (el) {
|
|
||||||
function openFromEl() {
|
|
||||||
openLightbox(
|
|
||||||
el.getAttribute('data-lightbox-src'),
|
|
||||||
el.getAttribute('data-lightbox-caption'),
|
|
||||||
el.getAttribute('alt'),
|
|
||||||
el.getAttribute('data-lightbox-download')
|
|
||||||
);
|
|
||||||
}
|
|
||||||
el.addEventListener('click', openFromEl);
|
|
||||||
el.addEventListener('keydown', function (e) {
|
|
||||||
if (e.key === 'Enter' || e.key === ' ') {
|
|
||||||
e.preventDefault();
|
|
||||||
openFromEl();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
downloadBtn.addEventListener('click', downloadQrImage);
|
|
||||||
closeBtn.addEventListener('click', closeLightbox);
|
|
||||||
box.addEventListener('click', function (e) {
|
|
||||||
if (e.target === box) closeLightbox();
|
|
||||||
});
|
|
||||||
document.addEventListener('keydown', function (e) {
|
|
||||||
if (e.key === 'Escape' && box.classList.contains('open')) closeLightbox();
|
|
||||||
});
|
|
||||||
})();
|
|
||||||
|
|
||||||
(function () {
|
|
||||||
function triggerDataUrlDownload(dataUrl, filename) {
|
|
||||||
var a = document.createElement('a');
|
|
||||||
a.href = dataUrl;
|
|
||||||
a.download = filename;
|
|
||||||
a.rel = 'noopener';
|
|
||||||
document.body.appendChild(a);
|
|
||||||
a.click();
|
|
||||||
a.remove();
|
|
||||||
}
|
|
||||||
|
|
||||||
function triggerFileDownload(blob, filename) {
|
|
||||||
var url = URL.createObjectURL(blob);
|
|
||||||
var a = document.createElement('a');
|
|
||||||
a.href = url;
|
|
||||||
a.download = filename;
|
|
||||||
a.rel = 'noopener';
|
|
||||||
document.body.appendChild(a);
|
|
||||||
a.click();
|
|
||||||
a.remove();
|
|
||||||
setTimeout(function () { URL.revokeObjectURL(url); }, 1500);
|
|
||||||
}
|
|
||||||
|
|
||||||
function pngFromCard(link, filename) {
|
|
||||||
var card = link.closest('.user-card');
|
|
||||||
var qrImg = card && card.querySelector('img[data-lightbox-src], .qr-block img');
|
|
||||||
if (!qrImg) return false;
|
|
||||||
var src = qrImg.currentSrc || qrImg.src || '';
|
|
||||||
if (src.indexOf('data:image/') === 0) {
|
|
||||||
triggerDataUrlDownload(src, filename);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (!qrImg.complete || !qrImg.naturalWidth) return false;
|
|
||||||
try {
|
|
||||||
var canvas = document.createElement('canvas');
|
|
||||||
canvas.width = qrImg.naturalWidth;
|
|
||||||
canvas.height = qrImg.naturalHeight;
|
|
||||||
canvas.getContext('2d').drawImage(qrImg, 0, 0);
|
|
||||||
triggerDataUrlDownload(canvas.toDataURL('image/png'), filename);
|
|
||||||
return true;
|
|
||||||
} catch (err) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
document.querySelectorAll('a.file-download').forEach(function (link) {
|
|
||||||
link.addEventListener('click', function (e) {
|
|
||||||
e.preventDefault();
|
|
||||||
e.stopPropagation();
|
|
||||||
var filename = link.getAttribute('data-filename') || link.getAttribute('download') || 'download';
|
|
||||||
var href = link.getAttribute('href');
|
|
||||||
var fallbackText = link.getAttribute('data-text');
|
|
||||||
var pngB64 = link.getAttribute('data-png-b64');
|
|
||||||
var isPng = /\.png$/i.test(filename);
|
|
||||||
|
|
||||||
// Sync paths first — file:// blocks fetch (CORS) and taints canvas
|
|
||||||
if (pngB64) {
|
|
||||||
triggerDataUrlDownload('data:image/png;base64,' + pngB64, filename);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (isPng && pngFromCard(link, filename)) return;
|
|
||||||
if (fallbackText !== null) {
|
|
||||||
triggerFileDownload(new Blob([fallbackText], { type: 'text/plain;charset=utf-8' }), filename);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!href || location.protocol === 'file:') return;
|
|
||||||
|
|
||||||
fetch(href)
|
|
||||||
.then(function (res) {
|
|
||||||
if (!res.ok) throw new Error('fetch failed');
|
|
||||||
return res.blob();
|
|
||||||
})
|
|
||||||
.then(function (blob) { triggerFileDownload(blob, filename); })
|
|
||||||
.catch(function () { /* do not navigate to the file URL */ });
|
|
||||||
});
|
|
||||||
});
|
|
||||||
})();
|
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -7,171 +7,133 @@
|
|||||||
<style>
|
<style>
|
||||||
:root {
|
:root {
|
||||||
color-scheme: light dark;
|
color-scheme: light dark;
|
||||||
--bg: #0b0f14;
|
--bg: #0f1419;
|
||||||
--bg-soft: #121820;
|
--bg-card: #1a2332;
|
||||||
--bg-card: #161d27;
|
|
||||||
--bg-input: #0d1117;
|
--bg-input: #0d1117;
|
||||||
--border: #2a3544;
|
--border: #2d3a4f;
|
||||||
--text: #e6edf3;
|
--text: #e6edf3;
|
||||||
--muted: #8b949e;
|
--muted: #8b949e;
|
||||||
--accent: #58a6ff;
|
--accent: #58a6ff;
|
||||||
--accent-soft: rgba(88, 166, 255, 0.12);
|
--accent-soft: rgba(88, 166, 255, 0.15);
|
||||||
--success: #3fb950;
|
--success: #3fb950;
|
||||||
--success-soft: rgba(63, 185, 80, 0.15);
|
--success-soft: rgba(63, 185, 80, 0.15);
|
||||||
--radius: 14px;
|
--radius: 12px;
|
||||||
--shadow: 0 12px 40px rgba(0, 0, 0, 0.35);
|
--shadow: 0 8px 32px rgba(0, 0, 0, 0.35);
|
||||||
}
|
}
|
||||||
@media (prefers-color-scheme: light) {
|
@media (prefers-color-scheme: light) {
|
||||||
:root {
|
:root {
|
||||||
--bg: #eef2f7;
|
--bg: #f0f4f8;
|
||||||
--bg-soft: #f6f8fb;
|
|
||||||
--bg-card: #ffffff;
|
--bg-card: #ffffff;
|
||||||
--bg-input: #f6f8fa;
|
--bg-input: #f6f8fa;
|
||||||
--border: #d8dee4;
|
--border: #d0d7de;
|
||||||
--text: #1f2328;
|
--text: #1f2328;
|
||||||
--muted: #656d76;
|
--muted: #656d76;
|
||||||
--accent: #0969da;
|
--accent: #0969da;
|
||||||
--accent-soft: rgba(9, 105, 218, 0.08);
|
--accent-soft: rgba(9, 105, 218, 0.1);
|
||||||
--success: #1a7f37;
|
--success: #1a7f37;
|
||||||
--success-soft: rgba(26, 127, 55, 0.1);
|
--success-soft: rgba(26, 127, 55, 0.1);
|
||||||
--shadow: 0 10px 30px rgba(31, 35, 40, 0.08);
|
--shadow: 0 8px 24px rgba(31, 35, 40, 0.08);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||||
body {
|
body {
|
||||||
font-family: "Segoe UI", "SF Pro Display", "Helvetica Neue", Arial, sans-serif;
|
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
|
||||||
background:
|
background: var(--bg);
|
||||||
radial-gradient(ellipse 80% 50% at 20% -10%, var(--accent-soft), transparent),
|
|
||||||
radial-gradient(ellipse 60% 40% at 100% 0%, rgba(63, 185, 80, 0.08), transparent),
|
|
||||||
var(--bg);
|
|
||||||
color: var(--text);
|
color: var(--text);
|
||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
|
padding: 2rem 1rem 3rem;
|
||||||
}
|
}
|
||||||
.hero {
|
.container { max-width: 720px; margin: 0 auto; }
|
||||||
padding: 2rem 1.5rem 1.25rem;
|
header {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
margin-bottom: 2.5rem;
|
||||||
.hero h1 {
|
padding: 2rem 1.5rem;
|
||||||
font-size: clamp(1.75rem, 4vw, 2.25rem);
|
background: linear-gradient(135deg, var(--accent-soft), transparent);
|
||||||
font-weight: 800;
|
|
||||||
letter-spacing: -0.03em;
|
|
||||||
margin-bottom: 0.35rem;
|
|
||||||
color: var(--accent);
|
|
||||||
}
|
|
||||||
.hero p { color: var(--muted); font-size: 0.95rem; }
|
|
||||||
.hero .meta strong { color: var(--text); font-weight: 650; }
|
|
||||||
.badges {
|
|
||||||
display: flex;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
gap: 0.45rem;
|
|
||||||
justify-content: center;
|
|
||||||
margin-top: 1rem;
|
|
||||||
}
|
|
||||||
.badge {
|
|
||||||
display: inline-block;
|
|
||||||
padding: 0.25rem 0.75rem;
|
|
||||||
background: var(--accent-soft);
|
|
||||||
color: var(--accent);
|
|
||||||
border: 1px solid color-mix(in srgb, var(--accent) 30%, transparent);
|
|
||||||
border-radius: 999px;
|
|
||||||
font-size: 0.8rem;
|
|
||||||
font-weight: 650;
|
|
||||||
}
|
|
||||||
.badge-salamander {
|
|
||||||
background: rgba(63, 185, 80, 0.12);
|
|
||||||
color: var(--success);
|
|
||||||
border-color: color-mix(in srgb, var(--success) 35%, transparent);
|
|
||||||
}
|
|
||||||
.top-nav {
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
gap: 0.5rem;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
padding: 0 1rem 1rem;
|
|
||||||
}
|
|
||||||
.nav-link {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
padding: 0.45rem 0.9rem;
|
|
||||||
border-radius: 999px;
|
|
||||||
border: 1px solid var(--border);
|
|
||||||
background: var(--bg-card);
|
|
||||||
color: var(--accent);
|
|
||||||
text-decoration: none;
|
|
||||||
font-size: 0.82rem;
|
|
||||||
font-weight: 650;
|
|
||||||
}
|
|
||||||
.nav-link:hover { background: var(--accent-soft); border-color: var(--accent); }
|
|
||||||
.container {
|
|
||||||
max-width: 1080px;
|
|
||||||
margin: 0 auto;
|
|
||||||
padding: 0 1rem 3rem;
|
|
||||||
}
|
|
||||||
.server-obfs {
|
|
||||||
max-width: 640px;
|
|
||||||
margin: 0 auto 1.25rem;
|
|
||||||
padding: 1rem 1.15rem;
|
|
||||||
background: var(--bg-card);
|
|
||||||
border: 1px solid var(--border);
|
border: 1px solid var(--border);
|
||||||
border-radius: var(--radius);
|
border-radius: var(--radius);
|
||||||
box-shadow: var(--shadow);
|
box-shadow: var(--shadow);
|
||||||
text-align: left;
|
|
||||||
}
|
}
|
||||||
.users-grid {
|
header h1 {
|
||||||
display: grid;
|
font-size: 1.75rem;
|
||||||
grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
|
font-weight: 700;
|
||||||
gap: 1rem;
|
letter-spacing: -0.02em;
|
||||||
|
margin-bottom: 0.5rem;
|
||||||
|
}
|
||||||
|
header .meta {
|
||||||
|
color: var(--muted);
|
||||||
|
font-size: 0.9rem;
|
||||||
|
}
|
||||||
|
header .meta strong { color: var(--text); font-weight: 600; }
|
||||||
|
.badge {
|
||||||
|
display: inline-block;
|
||||||
|
margin-top: 1rem;
|
||||||
|
padding: 0.25rem 0.75rem;
|
||||||
|
background: var(--accent-soft);
|
||||||
|
color: var(--accent);
|
||||||
|
border-radius: 999px;
|
||||||
|
font-size: 0.8rem;
|
||||||
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
.user-card {
|
.user-card {
|
||||||
background: var(--bg-card);
|
background: var(--bg-card);
|
||||||
border: 1px solid var(--border);
|
border: 1px solid var(--border);
|
||||||
border-radius: var(--radius);
|
border-radius: var(--radius);
|
||||||
padding: 1.25rem;
|
|
||||||
box-shadow: var(--shadow);
|
box-shadow: var(--shadow);
|
||||||
display: flex;
|
padding: 1.5rem;
|
||||||
flex-direction: column;
|
margin-bottom: 1.25rem;
|
||||||
gap: 0.85rem;
|
|
||||||
}
|
}
|
||||||
.user-card h2 {
|
.user-card h2 {
|
||||||
font-size: 1.05rem;
|
font-size: 1.25rem;
|
||||||
|
margin-bottom: 1rem;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 0.5rem;
|
gap: 0.5rem;
|
||||||
}
|
}
|
||||||
.user-card h2::before {
|
.user-card h2::before {
|
||||||
content: "";
|
content: "";
|
||||||
width: 7px;
|
width: 8px;
|
||||||
height: 7px;
|
height: 8px;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
background: var(--success);
|
background: var(--success);
|
||||||
|
box-shadow: 0 0 8px var(--success);
|
||||||
}
|
}
|
||||||
|
.field { margin-bottom: 1rem; }
|
||||||
.field label {
|
.field label {
|
||||||
display: block;
|
display: block;
|
||||||
font-size: 0.7rem;
|
font-size: 0.75rem;
|
||||||
font-weight: 700;
|
font-weight: 600;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
letter-spacing: 0.06em;
|
letter-spacing: 0.05em;
|
||||||
color: var(--muted);
|
color: var(--muted);
|
||||||
margin-bottom: 0.35rem;
|
margin-bottom: 0.4rem;
|
||||||
|
}
|
||||||
|
.input-row {
|
||||||
|
display: flex;
|
||||||
|
gap: 0.5rem;
|
||||||
|
align-items: stretch;
|
||||||
}
|
}
|
||||||
.input-row { display: flex; gap: 0.45rem; }
|
|
||||||
.input-row input {
|
.input-row input {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
padding: 0.55rem 0.75rem;
|
padding: 0.65rem 0.85rem;
|
||||||
background: var(--bg-input);
|
background: var(--bg-input);
|
||||||
border: 1px solid var(--border);
|
border: 1px solid var(--border);
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
color: var(--text);
|
color: var(--text);
|
||||||
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
|
font-family: ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas, monospace;
|
||||||
font-size: 0.72rem;
|
font-size: 0.8rem;
|
||||||
|
}
|
||||||
|
.input-row input:focus {
|
||||||
|
outline: none;
|
||||||
|
border-color: var(--accent);
|
||||||
|
box-shadow: 0 0 0 3px var(--accent-soft);
|
||||||
}
|
}
|
||||||
.btn-copy {
|
.btn-copy {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
width: 38px;
|
width: 42px;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
background: var(--bg-input);
|
background: var(--bg-input);
|
||||||
border: 1px solid var(--border);
|
border: 1px solid var(--border);
|
||||||
@@ -180,53 +142,65 @@
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
transition: color 0.15s, border-color 0.15s, background 0.15s;
|
transition: color 0.15s, border-color 0.15s, background 0.15s;
|
||||||
}
|
}
|
||||||
.btn-copy:hover { color: var(--accent); border-color: var(--accent); background: var(--accent-soft); }
|
.btn-copy:hover {
|
||||||
.btn-copy.copied { color: var(--success); border-color: var(--success); background: var(--success-soft); }
|
color: var(--accent);
|
||||||
.btn-copy svg { width: 16px; height: 16px; }
|
border-color: var(--accent);
|
||||||
|
background: var(--accent-soft);
|
||||||
|
}
|
||||||
|
.btn-copy.copied {
|
||||||
|
color: var(--success);
|
||||||
|
border-color: var(--success);
|
||||||
|
background: var(--success-soft);
|
||||||
|
}
|
||||||
|
.btn-copy svg { width: 18px; height: 18px; }
|
||||||
.qr-block {
|
.qr-block {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
padding: 0.75rem;
|
margin: 1.25rem 0;
|
||||||
|
padding: 1rem;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
border: 1px solid var(--border);
|
border: 1px solid var(--border);
|
||||||
}
|
}
|
||||||
.qr-block img {
|
@media (prefers-color-scheme: dark) {
|
||||||
width: 160px;
|
.qr-block { background: #fff; }
|
||||||
height: 160px;
|
|
||||||
image-rendering: pixelated;
|
|
||||||
cursor: zoom-in;
|
|
||||||
border-radius: 4px;
|
|
||||||
transition: transform 0.2s ease, box-shadow 0.2s ease;
|
|
||||||
}
|
}
|
||||||
.qr-block img:hover {
|
.qr-block img {
|
||||||
transform: scale(1.03);
|
max-width: 220px;
|
||||||
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.18);
|
width: 100%;
|
||||||
|
height: auto;
|
||||||
|
image-rendering: pixelated;
|
||||||
}
|
}
|
||||||
.files {
|
.files {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
gap: 0.4rem;
|
gap: 0.5rem;
|
||||||
margin-top: auto;
|
margin-top: 1rem;
|
||||||
padding-top: 0.75rem;
|
padding-top: 1rem;
|
||||||
border-top: 1px solid var(--border);
|
border-top: 1px solid var(--border);
|
||||||
}
|
}
|
||||||
.files a {
|
.files a {
|
||||||
padding: 0.3rem 0.6rem;
|
display: inline-flex;
|
||||||
border-radius: 6px;
|
align-items: center;
|
||||||
border: 1px solid var(--border);
|
gap: 0.35rem;
|
||||||
|
padding: 0.35rem 0.75rem;
|
||||||
background: var(--bg-input);
|
background: var(--bg-input);
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
border-radius: 6px;
|
||||||
color: var(--accent);
|
color: var(--accent);
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
font-size: 0.72rem;
|
font-size: 0.8rem;
|
||||||
font-weight: 600;
|
font-weight: 500;
|
||||||
|
transition: background 0.15s, border-color 0.15s;
|
||||||
|
}
|
||||||
|
.files a:hover {
|
||||||
|
background: var(--accent-soft);
|
||||||
|
border-color: var(--accent);
|
||||||
}
|
}
|
||||||
.files a:hover { background: var(--accent-soft); border-color: var(--accent); }
|
|
||||||
footer {
|
footer {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
padding: 1.5rem;
|
margin-top: 2rem;
|
||||||
color: var(--muted);
|
color: var(--muted);
|
||||||
font-size: 0.8rem;
|
font-size: 0.8rem;
|
||||||
border-top: 1px solid var(--border);
|
|
||||||
}
|
}
|
||||||
.toast {
|
.toast {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
@@ -246,236 +220,71 @@
|
|||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
z-index: 100;
|
z-index: 100;
|
||||||
}
|
}
|
||||||
.toast.show { transform: translateX(-50%) translateY(0); opacity: 1; }
|
.toast.show {
|
||||||
.lightbox {
|
transform: translateX(-50%) translateY(0);
|
||||||
position: fixed;
|
|
||||||
inset: 0;
|
|
||||||
z-index: 200;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
padding: 1rem;
|
|
||||||
box-sizing: border-box;
|
|
||||||
background: rgba(8, 12, 18, 0.72);
|
|
||||||
backdrop-filter: blur(10px);
|
|
||||||
-webkit-backdrop-filter: blur(10px);
|
|
||||||
opacity: 0;
|
|
||||||
visibility: hidden;
|
|
||||||
pointer-events: none;
|
|
||||||
transition: opacity 0.22s ease, visibility 0.22s ease;
|
|
||||||
}
|
|
||||||
.lightbox.open {
|
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
visibility: visible;
|
|
||||||
pointer-events: auto;
|
|
||||||
}
|
}
|
||||||
.lightbox-panel {
|
|
||||||
position: relative;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
width: min(96vw, calc(100dvh - 2rem));
|
|
||||||
height: calc(100dvh - 2rem);
|
|
||||||
max-height: calc(100dvh - 2rem);
|
|
||||||
padding: 2.5rem 1rem 0.85rem;
|
|
||||||
background: var(--bg-card);
|
|
||||||
border: 1px solid var(--border);
|
|
||||||
border-radius: 18px;
|
|
||||||
box-shadow: 0 24px 64px rgba(0, 0, 0, 0.45);
|
|
||||||
text-align: center;
|
|
||||||
overflow: hidden;
|
|
||||||
box-sizing: border-box;
|
|
||||||
transform: translateY(12px) scale(0.96);
|
|
||||||
transition: transform 0.22s ease;
|
|
||||||
}
|
|
||||||
.lightbox.open .lightbox-panel { transform: translateY(0) scale(1); }
|
|
||||||
.lightbox-media {
|
|
||||||
flex: 1 1 auto;
|
|
||||||
min-height: 0;
|
|
||||||
width: 100%;
|
|
||||||
container-type: size;
|
|
||||||
display: grid;
|
|
||||||
place-items: center;
|
|
||||||
}
|
|
||||||
.lightbox-panel img {
|
|
||||||
display: block;
|
|
||||||
width: min(100cqi, 100cqb);
|
|
||||||
height: min(100cqi, 100cqb);
|
|
||||||
max-width: 100%;
|
|
||||||
max-height: 100%;
|
|
||||||
aspect-ratio: 1;
|
|
||||||
object-fit: contain;
|
|
||||||
background: #fff;
|
|
||||||
border-radius: 12px;
|
|
||||||
padding: 0.75rem;
|
|
||||||
box-sizing: border-box;
|
|
||||||
image-rendering: pixelated;
|
|
||||||
}
|
|
||||||
.lightbox-caption {
|
|
||||||
flex-shrink: 0;
|
|
||||||
margin-top: 0.55rem;
|
|
||||||
font-size: 0.95rem;
|
|
||||||
font-weight: 650;
|
|
||||||
color: var(--text);
|
|
||||||
}
|
|
||||||
.lightbox-actions {
|
|
||||||
flex-shrink: 0;
|
|
||||||
margin-top: 0.65rem;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
}
|
|
||||||
.lightbox-download {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.45rem;
|
|
||||||
padding: 0.55rem 1rem;
|
|
||||||
border-radius: 999px;
|
|
||||||
border: 1px solid var(--border);
|
|
||||||
background: var(--bg-input);
|
|
||||||
color: var(--accent);
|
|
||||||
text-decoration: none;
|
|
||||||
font: inherit;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
font-weight: 650;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
.lightbox-download:hover {
|
|
||||||
border-color: var(--accent);
|
|
||||||
background: var(--accent-soft);
|
|
||||||
}
|
|
||||||
.lightbox-download svg { width: 16px; height: 16px; flex-shrink: 0; }
|
|
||||||
.lightbox-close {
|
|
||||||
position: absolute;
|
|
||||||
top: 0.65rem;
|
|
||||||
right: 0.65rem;
|
|
||||||
width: 36px;
|
|
||||||
height: 36px;
|
|
||||||
border: 1px solid var(--border);
|
|
||||||
border-radius: 999px;
|
|
||||||
background: var(--bg-input);
|
|
||||||
color: var(--muted);
|
|
||||||
cursor: pointer;
|
|
||||||
font-size: 1.25rem;
|
|
||||||
line-height: 1;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
}
|
|
||||||
.lightbox-close:hover {
|
|
||||||
color: var(--accent);
|
|
||||||
border-color: var(--accent);
|
|
||||||
background: var(--accent-soft);
|
|
||||||
}
|
|
||||||
body.lightbox-open { overflow: hidden; }
|
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<header class="hero">
|
<div class="container">
|
||||||
<h1>{{ hysteria2_output_name | e }}</h1>
|
<header>
|
||||||
<p class="meta">
|
<h1>Hysteria2</h1>
|
||||||
<strong>{{ hysteria2_domain | e }}:{{ hysteria2_listen_port }}</strong>
|
<p class="meta">
|
||||||
</p>
|
Сервер: <strong>{{ hysteria2_output_name }}</strong><br>
|
||||||
<div class="badges">
|
Домен: <strong>{{ hysteria2_domain }}:{{ hysteria2_listen_port }}</strong>
|
||||||
|
</p>
|
||||||
<span class="badge">{{ hysteria2_export_users | length }} {{ 'пользователь' if hysteria2_export_users | length == 1 else 'пользователей' }}</span>
|
<span class="badge">{{ hysteria2_export_users | length }} {{ 'пользователь' if hysteria2_export_users | length == 1 else 'пользователей' }}</span>
|
||||||
{% if (hysteria2_mode | default('')) == 'salamander' or (hysteria2_obfs_password | default('') | length > 0) %}
|
</header>
|
||||||
<span class="badge badge-salamander">Salamander</span>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<div class="top-nav">
|
|
||||||
<a class="nav-link" href="../index.html">← Общий каталог</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<main class="container">
|
|
||||||
{% if hysteria2_obfs_password | default('') | length > 0 %}
|
|
||||||
<div class="field server-obfs">
|
|
||||||
<label for="obfs-server">Пароль обфускации (Salamander)</label>
|
|
||||||
<div class="input-row">
|
|
||||||
<input type="text" id="obfs-server" value="{{ hysteria2_obfs_password | e }}" readonly>
|
|
||||||
<button type="button" class="btn-copy" onclick="copyField('obfs-server', this)" title="Копировать obfs-password" aria-label="Копировать obfs-password">
|
|
||||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="9" y="9" width="13" height="13" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<div class="users-grid">
|
|
||||||
{% for user in hysteria2_export_users %}
|
{% for user in hysteria2_export_users %}
|
||||||
<article class="user-card">
|
<article class="user-card">
|
||||||
<h2>{{ user.name | e }}</h2>
|
<h2>{{ user.name }}</h2>
|
||||||
|
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<label for="pwd-{{ loop.index }}">Пароль</label>
|
<label for="pwd-{{ loop.index }}">Пароль</label>
|
||||||
<div class="input-row">
|
<div class="input-row">
|
||||||
<input type="text" id="pwd-{{ loop.index }}" value="{{ user.password | e }}" readonly>
|
<input type="text" id="pwd-{{ loop.index }}" value="{{ user.password | e }}" readonly>
|
||||||
<button type="button" class="btn-copy" onclick="copyField('pwd-{{ loop.index }}', this)" title="Копировать пароль" aria-label="Копировать пароль">
|
<button type="button" class="btn-copy" onclick="copyField('pwd-{{ loop.index }}', this)" title="Копировать пароль" aria-label="Копировать пароль">
|
||||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="9" y="9" width="13" height="13" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg>
|
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="9" width="13" height="13" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<label for="url-{{ loop.index }}">Ссылка</label>
|
<label for="url-{{ loop.index }}">Ссылка подключения</label>
|
||||||
<div class="input-row">
|
<div class="input-row">
|
||||||
<input type="text" id="url-{{ loop.index }}" value="{{ user.url | e }}" readonly>
|
<input type="text" id="url-{{ loop.index }}" value="{{ user.url | e }}" readonly>
|
||||||
<button type="button" class="btn-copy" onclick="copyField('url-{{ loop.index }}', this)" title="Копировать ссылку" aria-label="Копировать ссылку">
|
<button type="button" class="btn-copy" onclick="copyField('url-{{ loop.index }}', this)" title="Копировать ссылку" aria-label="Копировать ссылку">
|
||||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="9" y="9" width="13" height="13" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2 2v1"/></svg>
|
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="9" width="13" height="13" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
{% set _png = namespace(b64='', data='') %}
|
{% if user.has_png %}
|
||||||
{% if user.has_png | default(false) %}
|
<div class="qr-block">
|
||||||
{% set _png.b64 = lookup('pipe', 'base64 < ' ~ ((hysteria2_output_dir ~ '/' ~ hysteria2_output_name ~ '/' ~ user.name ~ '.png') | quote)) | regex_replace('\\s+', '') %}
|
<img src="{{ user.name | e }}.png" alt="QR-код {{ user.name | e }}" width="220" height="220">
|
||||||
{% set _png.data = 'data:image/png;base64,' ~ _png.b64 %}
|
</div>
|
||||||
<div class="qr-block">
|
|
||||||
<img
|
|
||||||
src="{{ _png.data }}"
|
|
||||||
alt="QR {{ user.name | e }}"
|
|
||||||
width="160"
|
|
||||||
height="160"
|
|
||||||
role="button"
|
|
||||||
tabindex="0"
|
|
||||||
data-lightbox-src="{{ _png.data }}"
|
|
||||||
data-lightbox-caption="{{ hysteria2_output_name | e }} · {{ user.name | e }}"
|
|
||||||
data-lightbox-download="{{ hysteria2_output_name | e }}-{{ user.name | e }}.png"
|
|
||||||
aria-label="Открыть QR-код {{ user.name | e }}"
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<nav class="files" aria-label="Файлы">
|
<nav class="files" aria-label="Файлы">
|
||||||
<a class="file-download" href="{{ user.name | e }}.url" download="{{ hysteria2_output_name | e }}-{{ user.name | e }}.url" data-filename="{{ hysteria2_output_name | e }}-{{ user.name | e }}.url" data-text="{{ (user.url ~ '\n') | e }}">.url</a>
|
<a href="{{ user.name | e }}.url" download>{{ user.name | e }}.url</a>
|
||||||
<a class="file-download" href="{{ user.name | e }}.txt" download="{{ hysteria2_output_name | e }}-{{ user.name | e }}.txt" data-filename="{{ hysteria2_output_name | e }}-{{ user.name | e }}.txt" data-text="{{ ('Server: ' ~ hysteria2_output_name ~ '\nDomain: ' ~ hysteria2_domain ~ ':' ~ hysteria2_listen_port ~ '\nUser: ' ~ user.name ~ '\nPassword: ' ~ user.password ~ '\n\nURL:\n' ~ user.url ~ '\n') | e }}">.txt</a>
|
<a href="{{ user.name | e }}.txt" download>{{ user.name | e }}.txt</a>
|
||||||
{% if user.has_png | default(false) and _png.b64 %}
|
{% if user.has_png %}
|
||||||
<a class="file-download" href="{{ user.name | e }}.png" download="{{ hysteria2_output_name | e }}-{{ user.name | e }}.png" data-filename="{{ hysteria2_output_name | e }}-{{ user.name | e }}.png" data-png-b64="{{ _png.b64 }}">.png</a>
|
<a href="{{ user.name | e }}.png" download>{{ user.name | e }}.png</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<a class="file-download" href="{{ user.name | e }}.qr.txt" download="{{ hysteria2_output_name | e }}-{{ user.name | e }}.qr.txt" data-filename="{{ hysteria2_output_name | e }}-{{ user.name | e }}.qr.txt" data-text="{{ lookup('file', hysteria2_output_dir ~ '/' ~ hysteria2_output_name ~ '/' ~ user.name ~ '.qr.txt', errors='ignore') | default('URL: ' ~ user.url ~ '\n', true) | e }}">.qr.txt</a>
|
<a href="{{ user.name | e }}.qr.txt" download>{{ user.name | e }}.qr.txt</a>
|
||||||
</nav>
|
</nav>
|
||||||
</article>
|
</article>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
|
|
||||||
<footer>Сгенерировано Ansible · {{ generated_at | default('') }}</footer>
|
<footer>
|
||||||
<div class="toast" id="toast">Скопировано!</div>
|
Сгенерировано Ansible · {{ generated_at | default('') }}
|
||||||
|
</footer>
|
||||||
<div class="lightbox" id="lightbox" role="dialog" aria-modal="true" aria-hidden="true" aria-labelledby="lightbox-caption">
|
|
||||||
<div class="lightbox-panel" role="document">
|
|
||||||
<button type="button" class="lightbox-close" id="lightbox-close" aria-label="Закрыть">×</button>
|
|
||||||
<div class="lightbox-media">
|
|
||||||
<img id="lightbox-img" src="" alt="">
|
|
||||||
</div>
|
|
||||||
<p class="lightbox-caption" id="lightbox-caption"></p>
|
|
||||||
<div class="lightbox-actions">
|
|
||||||
<button type="button" class="lightbox-download" id="lightbox-download">
|
|
||||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>
|
|
||||||
Скачать QR
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="toast" id="toast">Скопировано!</div>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
function copyField(id, btn) {
|
function copyField(id, btn) {
|
||||||
var el = document.getElementById(id);
|
var el = document.getElementById(id);
|
||||||
@@ -500,203 +309,6 @@
|
|||||||
t.classList.add('show');
|
t.classList.add('show');
|
||||||
setTimeout(function() { t.classList.remove('show'); }, 1800);
|
setTimeout(function() { t.classList.remove('show'); }, 1800);
|
||||||
}
|
}
|
||||||
|
|
||||||
(function () {
|
|
||||||
var box = document.getElementById('lightbox');
|
|
||||||
var img = document.getElementById('lightbox-img');
|
|
||||||
var caption = document.getElementById('lightbox-caption');
|
|
||||||
var closeBtn = document.getElementById('lightbox-close');
|
|
||||||
var downloadBtn = document.getElementById('lightbox-download');
|
|
||||||
var downloadSrc = '';
|
|
||||||
|
|
||||||
function triggerDataUrlDownload(dataUrl, filename) {
|
|
||||||
var a = document.createElement('a');
|
|
||||||
a.href = dataUrl;
|
|
||||||
a.download = filename;
|
|
||||||
a.rel = 'noopener';
|
|
||||||
document.body.appendChild(a);
|
|
||||||
a.click();
|
|
||||||
a.remove();
|
|
||||||
}
|
|
||||||
|
|
||||||
function triggerFileDownload(blob, filename) {
|
|
||||||
var url = URL.createObjectURL(blob);
|
|
||||||
var a = document.createElement('a');
|
|
||||||
a.href = url;
|
|
||||||
a.download = filename;
|
|
||||||
a.rel = 'noopener';
|
|
||||||
document.body.appendChild(a);
|
|
||||||
a.click();
|
|
||||||
a.remove();
|
|
||||||
setTimeout(function () { URL.revokeObjectURL(url); }, 1500);
|
|
||||||
}
|
|
||||||
|
|
||||||
function downloadQrFromCanvas(filename) {
|
|
||||||
if (!img.complete || !img.naturalWidth) return false;
|
|
||||||
try {
|
|
||||||
var canvas = document.createElement('canvas');
|
|
||||||
canvas.width = img.naturalWidth;
|
|
||||||
canvas.height = img.naturalHeight;
|
|
||||||
canvas.getContext('2d').drawImage(img, 0, 0);
|
|
||||||
// toDataURL sync — download stays in the user-gesture (Safari/Chrome)
|
|
||||||
triggerDataUrlDownload(canvas.toDataURL('image/png'), filename);
|
|
||||||
return true;
|
|
||||||
} catch (err) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function downloadQrImage(e) {
|
|
||||||
e.preventDefault();
|
|
||||||
e.stopPropagation();
|
|
||||||
var filename = downloadBtn.getAttribute('data-filename') || 'qr.png';
|
|
||||||
var src = downloadSrc || img.currentSrc || img.src;
|
|
||||||
|
|
||||||
// Embedded data: URLs work on file:// (no CORS / tainted canvas)
|
|
||||||
if (src && src.indexOf('data:') === 0) {
|
|
||||||
triggerDataUrlDownload(src, filename);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (downloadQrFromCanvas(filename)) return;
|
|
||||||
if (!src || location.protocol === 'file:') return;
|
|
||||||
|
|
||||||
fetch(src)
|
|
||||||
.then(function (res) {
|
|
||||||
if (!res.ok) throw new Error('fetch failed');
|
|
||||||
return res.blob();
|
|
||||||
})
|
|
||||||
.then(function (blob) { triggerFileDownload(blob, filename); })
|
|
||||||
.catch(function () { /* avoid navigating to the image URL */ });
|
|
||||||
}
|
|
||||||
|
|
||||||
function openLightbox(src, text, alt, filename) {
|
|
||||||
var safeName = filename || 'qr.png';
|
|
||||||
img.src = src;
|
|
||||||
img.alt = alt || text || 'QR';
|
|
||||||
caption.textContent = text || '';
|
|
||||||
downloadSrc = src;
|
|
||||||
downloadBtn.setAttribute('data-filename', safeName);
|
|
||||||
downloadBtn.setAttribute('aria-label', 'Скачать ' + safeName);
|
|
||||||
box.classList.add('open');
|
|
||||||
box.setAttribute('aria-hidden', 'false');
|
|
||||||
document.body.classList.add('lightbox-open');
|
|
||||||
closeBtn.focus();
|
|
||||||
}
|
|
||||||
|
|
||||||
function closeLightbox() {
|
|
||||||
box.classList.remove('open');
|
|
||||||
box.setAttribute('aria-hidden', 'true');
|
|
||||||
document.body.classList.remove('lightbox-open');
|
|
||||||
img.removeAttribute('src');
|
|
||||||
downloadSrc = '';
|
|
||||||
downloadBtn.removeAttribute('data-filename');
|
|
||||||
}
|
|
||||||
|
|
||||||
document.querySelectorAll('[data-lightbox-src]').forEach(function (el) {
|
|
||||||
function openFromEl() {
|
|
||||||
openLightbox(
|
|
||||||
el.getAttribute('data-lightbox-src'),
|
|
||||||
el.getAttribute('data-lightbox-caption'),
|
|
||||||
el.getAttribute('alt'),
|
|
||||||
el.getAttribute('data-lightbox-download')
|
|
||||||
);
|
|
||||||
}
|
|
||||||
el.addEventListener('click', openFromEl);
|
|
||||||
el.addEventListener('keydown', function (e) {
|
|
||||||
if (e.key === 'Enter' || e.key === ' ') {
|
|
||||||
e.preventDefault();
|
|
||||||
openFromEl();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
downloadBtn.addEventListener('click', downloadQrImage);
|
|
||||||
closeBtn.addEventListener('click', closeLightbox);
|
|
||||||
box.addEventListener('click', function (e) {
|
|
||||||
if (e.target === box) closeLightbox();
|
|
||||||
});
|
|
||||||
document.addEventListener('keydown', function (e) {
|
|
||||||
if (e.key === 'Escape' && box.classList.contains('open')) closeLightbox();
|
|
||||||
});
|
|
||||||
})();
|
|
||||||
|
|
||||||
(function () {
|
|
||||||
function triggerDataUrlDownload(dataUrl, filename) {
|
|
||||||
var a = document.createElement('a');
|
|
||||||
a.href = dataUrl;
|
|
||||||
a.download = filename;
|
|
||||||
a.rel = 'noopener';
|
|
||||||
document.body.appendChild(a);
|
|
||||||
a.click();
|
|
||||||
a.remove();
|
|
||||||
}
|
|
||||||
|
|
||||||
function triggerFileDownload(blob, filename) {
|
|
||||||
var url = URL.createObjectURL(blob);
|
|
||||||
var a = document.createElement('a');
|
|
||||||
a.href = url;
|
|
||||||
a.download = filename;
|
|
||||||
a.rel = 'noopener';
|
|
||||||
document.body.appendChild(a);
|
|
||||||
a.click();
|
|
||||||
a.remove();
|
|
||||||
setTimeout(function () { URL.revokeObjectURL(url); }, 1500);
|
|
||||||
}
|
|
||||||
|
|
||||||
function pngFromCard(link, filename) {
|
|
||||||
var card = link.closest('.user-card');
|
|
||||||
var qrImg = card && card.querySelector('img[data-lightbox-src], .qr-block img');
|
|
||||||
if (!qrImg) return false;
|
|
||||||
var src = qrImg.currentSrc || qrImg.src || '';
|
|
||||||
if (src.indexOf('data:image/') === 0) {
|
|
||||||
triggerDataUrlDownload(src, filename);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (!qrImg.complete || !qrImg.naturalWidth) return false;
|
|
||||||
try {
|
|
||||||
var canvas = document.createElement('canvas');
|
|
||||||
canvas.width = qrImg.naturalWidth;
|
|
||||||
canvas.height = qrImg.naturalHeight;
|
|
||||||
canvas.getContext('2d').drawImage(qrImg, 0, 0);
|
|
||||||
triggerDataUrlDownload(canvas.toDataURL('image/png'), filename);
|
|
||||||
return true;
|
|
||||||
} catch (err) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
document.querySelectorAll('a.file-download').forEach(function (link) {
|
|
||||||
link.addEventListener('click', function (e) {
|
|
||||||
e.preventDefault();
|
|
||||||
e.stopPropagation();
|
|
||||||
var filename = link.getAttribute('data-filename') || link.getAttribute('download') || 'download';
|
|
||||||
var href = link.getAttribute('href');
|
|
||||||
var fallbackText = link.getAttribute('data-text');
|
|
||||||
var pngB64 = link.getAttribute('data-png-b64');
|
|
||||||
var isPng = /\.png$/i.test(filename);
|
|
||||||
|
|
||||||
// Sync paths first — file:// blocks fetch (CORS) and taints canvas
|
|
||||||
if (pngB64) {
|
|
||||||
triggerDataUrlDownload('data:image/png;base64,' + pngB64, filename);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (isPng && pngFromCard(link, filename)) return;
|
|
||||||
if (fallbackText !== null) {
|
|
||||||
triggerFileDownload(new Blob([fallbackText], { type: 'text/plain;charset=utf-8' }), filename);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!href || location.protocol === 'file:') return;
|
|
||||||
|
|
||||||
fetch(href)
|
|
||||||
.then(function (res) {
|
|
||||||
if (!res.ok) throw new Error('fetch failed');
|
|
||||||
return res.blob();
|
|
||||||
})
|
|
||||||
.then(function (blob) { triggerFileDownload(blob, filename); })
|
|
||||||
.catch(function () { /* do not navigate to the file URL */ });
|
|
||||||
});
|
|
||||||
});
|
|
||||||
})();
|
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
Reference in New Issue
Block a user