mirror of
https://github.com/itdoginfo/podkop.git
synced 2025-12-06 19:46:52 +03:00
feat(podkop): add version display in UI
- Added version display in Podkop UI - Updated init script to fetch and display version
This commit is contained in:
@@ -16,7 +16,11 @@ return view.extend({
|
|||||||
var m, s, o;
|
var m, s, o;
|
||||||
|
|
||||||
m = new form.Map('podkop', _('Podkop configuration'), null, ['main', 'second']);
|
m = new form.Map('podkop', _('Podkop configuration'), null, ['main', 'second']);
|
||||||
|
fs.exec('/etc/init.d/podkop', ['show_version']).then(function (res) {
|
||||||
|
if (res.stdout) {
|
||||||
|
m.title = _('Podkop') + ' v' + res.stdout.trim();
|
||||||
|
}
|
||||||
|
});
|
||||||
s = m.section(form.TypedSection, 'main');
|
s = m.section(form.TypedSection, 'main');
|
||||||
s.anonymous = true;
|
s.anonymous = true;
|
||||||
|
|
||||||
|
|||||||
@@ -1346,7 +1346,6 @@ check_nft() {
|
|||||||
|
|
||||||
nolog "Checking PodkopTable rules..."
|
nolog "Checking PodkopTable rules..."
|
||||||
|
|
||||||
# Список всех возможных сетов
|
|
||||||
local sets="podkop_domains podkop_subnets podkop_subnets_discord localv4"
|
local sets="podkop_domains podkop_subnets podkop_subnets_discord localv4"
|
||||||
|
|
||||||
nolog "Sets statistics:"
|
nolog "Sets statistics:"
|
||||||
@@ -1359,7 +1358,6 @@ check_nft() {
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
# Показываем правила с счетчиками
|
|
||||||
nolog "Current chains and rules:"
|
nolog "Current chains and rules:"
|
||||||
nft list table inet PodkopTable | grep "chain\|counter"
|
nft list table inet PodkopTable | grep "chain\|counter"
|
||||||
|
|
||||||
@@ -1392,7 +1390,6 @@ check_logs() {
|
|||||||
nolog "Showing podkop logs from system journal..."
|
nolog "Showing podkop logs from system journal..."
|
||||||
|
|
||||||
if command -v logread >/dev/null 2>&1; then
|
if command -v logread >/dev/null 2>&1; then
|
||||||
# Попытка получить последние 50 записей
|
|
||||||
logread -e "podkop" | tail -n 50
|
logread -e "podkop" | tail -n 50
|
||||||
else
|
else
|
||||||
nolog "Error: logread command not found"
|
nolog "Error: logread command not found"
|
||||||
@@ -1430,10 +1427,8 @@ show_config() {
|
|||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Создаем временный файл для обработанного конфига
|
|
||||||
tmp_config=$(mktemp)
|
tmp_config=$(mktemp)
|
||||||
|
|
||||||
# Копируем и маскируем конфиденциальные данные
|
|
||||||
cat /etc/config/podkop | sed \
|
cat /etc/config/podkop | sed \
|
||||||
-e 's/\(option proxy_string\).*/\1 '\''MASKED'\''/g' \
|
-e 's/\(option proxy_string\).*/\1 '\''MASKED'\''/g' \
|
||||||
-e 's/\(option outbound_json\).*/\1 '\''MASKED'\''/g' \
|
-e 's/\(option outbound_json\).*/\1 '\''MASKED'\''/g' \
|
||||||
|
|||||||
Reference in New Issue
Block a user