mirror of
https://github.com/itdoginfo/podkop.git
synced 2025-12-11 05:56:55 +03:00
v0.3.50 Adde Google AI, Play, HTZ, OVH of list
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=luci-app-podkop
|
PKG_NAME:=luci-app-podkop
|
||||||
PKG_VERSION:=0.3.49
|
PKG_VERSION:=0.3.50
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
LUCI_TITLE:=LuCI podkop app
|
LUCI_TITLE:=LuCI podkop app
|
||||||
|
|||||||
@@ -300,7 +300,7 @@ function createConfigSection(section, map, network) {
|
|||||||
o.value('russia_inside', 'Russia inside');
|
o.value('russia_inside', 'Russia inside');
|
||||||
o.value('russia_outside', 'Russia outside');
|
o.value('russia_outside', 'Russia outside');
|
||||||
o.value('ukraine_inside', 'Ukraine');
|
o.value('ukraine_inside', 'Ukraine');
|
||||||
o.value('geoblock', 'GEO Block');
|
o.value('geoblock', 'Geo Block');
|
||||||
o.value('block', 'Block');
|
o.value('block', 'Block');
|
||||||
o.value('porn', 'Porn');
|
o.value('porn', 'Porn');
|
||||||
o.value('news', 'News');
|
o.value('news', 'News');
|
||||||
@@ -313,6 +313,11 @@ function createConfigSection(section, map, network) {
|
|||||||
o.value('tiktok', 'Tik-Tok');
|
o.value('tiktok', 'Tik-Tok');
|
||||||
o.value('telegram', 'Telegram');
|
o.value('telegram', 'Telegram');
|
||||||
o.value('cloudflare', 'Cloudflare');
|
o.value('cloudflare', 'Cloudflare');
|
||||||
|
o.value('google_ai', 'Google AI');
|
||||||
|
o.value('google_play', 'Google Play');
|
||||||
|
o.value('hetzner', 'Hetzner ASN');
|
||||||
|
o.value('ovh', 'OVH ASN');
|
||||||
|
|
||||||
o.depends('domain_list_enabled', '1');
|
o.depends('domain_list_enabled', '1');
|
||||||
o.rmempty = false;
|
o.rmempty = false;
|
||||||
o.ucisection = s.section;
|
o.ucisection = s.section;
|
||||||
@@ -344,13 +349,13 @@ function createConfigSection(section, map, network) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (newValues.includes('russia_inside')) {
|
if (newValues.includes('russia_inside')) {
|
||||||
const allowedWithRussiaInside = ['russia_inside', 'meta', 'twitter', 'discord', 'telegram', 'cloudflare'];
|
const allowedWithRussiaInside = ['russia_inside', 'meta', 'twitter', 'discord', 'telegram', 'cloudflare', 'google_ai', 'google_play', 'hetzner', 'ovh'];
|
||||||
const removedServices = newValues.filter(v => !allowedWithRussiaInside.includes(v));
|
const removedServices = newValues.filter(v => !allowedWithRussiaInside.includes(v));
|
||||||
if (removedServices.length > 0) {
|
if (removedServices.length > 0) {
|
||||||
newValues = newValues.filter(v => allowedWithRussiaInside.includes(v));
|
newValues = newValues.filter(v => allowedWithRussiaInside.includes(v));
|
||||||
notifications.push(E('p', { class: 'alert-message warning' }, [
|
notifications.push(E('p', { class: 'alert-message warning' }, [
|
||||||
E('strong', {}, _('Russia inside restrictions')), E('br'),
|
E('strong', {}, _('Russia inside restrictions')), E('br'),
|
||||||
_('Warning: Russia inside can only be used with Meta, Twitter, Discord, Cloudflare and Telegram. %s already in Russia inside and have been removed from selection.')
|
_('Warning: Russia inside can only be used with Meta, Twitter, Discord, Cloudflare, Google AI, Google Play, Hetzner, OVH and Telegram. %s already in Russia inside and have been removed from selection.')
|
||||||
.format(removedServices.join(', '))
|
.format(removedServices.join(', '))
|
||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=podkop
|
PKG_NAME:=podkop
|
||||||
PKG_VERSION:=0.3.49
|
PKG_VERSION:=0.3.50
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_MAINTAINER:=ITDog <podkop@itdog.info>
|
PKG_MAINTAINER:=ITDog <podkop@itdog.info>
|
||||||
|
|||||||
@@ -16,9 +16,11 @@ SUBNETS_META="${GITHUB_RAW_URL}/Subnets/IPv4/meta.lst"
|
|||||||
SUBNETS_DISCORD="${GITHUB_RAW_URL}/Subnets/IPv4/discord.lst"
|
SUBNETS_DISCORD="${GITHUB_RAW_URL}/Subnets/IPv4/discord.lst"
|
||||||
SUBNETS_TELERAM="${GITHUB_RAW_URL}/Subnets/IPv4/telegram.lst"
|
SUBNETS_TELERAM="${GITHUB_RAW_URL}/Subnets/IPv4/telegram.lst"
|
||||||
SUBNETS_CLOUDFLARE="${GITHUB_RAW_URL}/Subnets/IPv4/cloudflare.lst"
|
SUBNETS_CLOUDFLARE="${GITHUB_RAW_URL}/Subnets/IPv4/cloudflare.lst"
|
||||||
|
SUBNETS_HETZNER="${GITHUB_RAW_URL}/Subnets/IPv4/hetzner.lst"
|
||||||
|
SUBNETS_OVH="${GITHUB_RAW_URL}/Subnets/IPv4/ovh.lst"
|
||||||
SING_BOX_CONFIG="/etc/sing-box/config.json"
|
SING_BOX_CONFIG="/etc/sing-box/config.json"
|
||||||
FAKEIP="198.18.0.0/15"
|
FAKEIP="198.18.0.0/15"
|
||||||
VALID_SERVICES="russia_inside russia_outside ukraine_inside geoblock block porn news anime youtube discord meta twitter hdrezka tiktok telegram cloudflare"
|
VALID_SERVICES="russia_inside russia_outside ukraine_inside geoblock block porn news anime youtube discord meta twitter hdrezka tiktok telegram cloudflare google_ai google_play hetzner ovh"
|
||||||
DNS_RESOLVERS="1.1.1.1 1.0.0.1 8.8.8.8 8.8.4.4 9.9.9.9 9.9.9.11 94.140.14.14 94.140.15.15 208.67.220.220 208.67.222.222 77.88.8.1 77.88.8.8"
|
DNS_RESOLVERS="1.1.1.1 1.0.0.1 8.8.8.8 8.8.4.4 9.9.9.9 9.9.9.11 94.140.14.14 94.140.15.15 208.67.220.220 208.67.222.222 77.88.8.1 77.88.8.8"
|
||||||
TEST_DOMAIN="fakeip.podkop.fyi"
|
TEST_DOMAIN="fakeip.podkop.fyi"
|
||||||
INTERFACES_LIST=""
|
INTERFACES_LIST=""
|
||||||
@@ -1448,6 +1450,12 @@ list_subnets_download() {
|
|||||||
"cloudflare")
|
"cloudflare")
|
||||||
URL=$SUBNETS_CLOUDFLARE
|
URL=$SUBNETS_CLOUDFLARE
|
||||||
;;
|
;;
|
||||||
|
"hetzner")
|
||||||
|
URL=$SUBNETS_HETZNER
|
||||||
|
;;
|
||||||
|
"ovh")
|
||||||
|
URL=$SUBNETS_OVH
|
||||||
|
;;
|
||||||
"discord")
|
"discord")
|
||||||
URL=$SUBNETS_DISCORD
|
URL=$SUBNETS_DISCORD
|
||||||
nft add set inet $table podkop_discord_subnets { type ipv4_addr\; flags interval\; auto-merge\; }
|
nft add set inet $table podkop_discord_subnets { type ipv4_addr\; flags interval\; auto-merge\; }
|
||||||
|
|||||||
Reference in New Issue
Block a user