diff --git a/luci-app-podkop/Makefile b/luci-app-podkop/Makefile index 3eaf123..b34ec1a 100644 --- a/luci-app-podkop/Makefile +++ b/luci-app-podkop/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-podkop -PKG_VERSION:=0.3.49 +PKG_VERSION:=0.3.50 PKG_RELEASE:=1 LUCI_TITLE:=LuCI podkop app diff --git a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/podkop.js b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/podkop.js index 6b04667..46e68e8 100644 --- a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/podkop.js +++ b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/podkop.js @@ -300,7 +300,7 @@ function createConfigSection(section, map, network) { o.value('russia_inside', 'Russia inside'); o.value('russia_outside', 'Russia outside'); o.value('ukraine_inside', 'Ukraine'); - o.value('geoblock', 'GEO Block'); + o.value('geoblock', 'Geo Block'); o.value('block', 'Block'); o.value('porn', 'Porn'); o.value('news', 'News'); @@ -313,6 +313,11 @@ function createConfigSection(section, map, network) { o.value('tiktok', 'Tik-Tok'); o.value('telegram', 'Telegram'); 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.rmempty = false; o.ucisection = s.section; @@ -344,13 +349,13 @@ function createConfigSection(section, map, network) { } 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)); if (removedServices.length > 0) { newValues = newValues.filter(v => allowedWithRussiaInside.includes(v)); notifications.push(E('p', { class: 'alert-message warning' }, [ 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(', ')) ])); } diff --git a/podkop/Makefile b/podkop/Makefile index d73d6bf..340ab17 100644 --- a/podkop/Makefile +++ b/podkop/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=podkop -PKG_VERSION:=0.3.49 +PKG_VERSION:=0.3.50 PKG_RELEASE:=1 PKG_MAINTAINER:=ITDog diff --git a/podkop/files/usr/bin/podkop b/podkop/files/usr/bin/podkop index 99a1eeb..6b20f0a 100755 --- a/podkop/files/usr/bin/podkop +++ b/podkop/files/usr/bin/podkop @@ -16,9 +16,11 @@ SUBNETS_META="${GITHUB_RAW_URL}/Subnets/IPv4/meta.lst" SUBNETS_DISCORD="${GITHUB_RAW_URL}/Subnets/IPv4/discord.lst" SUBNETS_TELERAM="${GITHUB_RAW_URL}/Subnets/IPv4/telegram.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" 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" TEST_DOMAIN="fakeip.podkop.fyi" INTERFACES_LIST="" @@ -1448,6 +1450,12 @@ list_subnets_download() { "cloudflare") URL=$SUBNETS_CLOUDFLARE ;; + "hetzner") + URL=$SUBNETS_HETZNER + ;; + "ovh") + URL=$SUBNETS_OVH + ;; "discord") URL=$SUBNETS_DISCORD nft add set inet $table podkop_discord_subnets { type ipv4_addr\; flags interval\; auto-merge\; }