diff --git a/cypress/config/settings.cypress.json b/cypress/config/settings.cypress.json index f376d8804..702ee1487 100644 --- a/cypress/config/settings.cypress.json +++ b/cypress/config/settings.cypress.json @@ -24,7 +24,6 @@ "partialRequestsEnabled": true, "enableSpecialEpisodes": false, "forceIpv4First": false, - "dnsServers": "", "locale": "en" }, "plex": { diff --git a/jellyseerr-api.yml b/jellyseerr-api.yml index ddd942027..0bbe7ffb7 100644 --- a/jellyseerr-api.yml +++ b/jellyseerr-api.yml @@ -194,9 +194,6 @@ components: forceIpv4First: type: boolean example: false - dnsServers: - type: string - example: '1.1.1.1' trustProxy: type: boolean example: true diff --git a/server/index.ts b/server/index.ts index 88baedb86..008764193 100644 --- a/server/index.ts +++ b/server/index.ts @@ -83,12 +83,6 @@ app net.setDefaultAutoSelectFamily(false); } - if (settings.network.dnsServers.trim() !== '') { - dns.setServers( - settings.network.dnsServers.split(',').map((server) => server.trim()) - ); - } - // Register HTTP proxy if (settings.network.proxy.enabled) { await createCustomProxyAgent(settings.network.proxy); diff --git a/server/lib/settings/index.ts b/server/lib/settings/index.ts index 7fc09fb3f..d85f71379 100644 --- a/server/lib/settings/index.ts +++ b/server/lib/settings/index.ts @@ -137,7 +137,6 @@ export interface MainSettings { export interface NetworkSettings { csrfProtection: boolean; forceIpv4First: boolean; - dnsServers: string; trustProxy: boolean; proxy: ProxySettings; } @@ -510,7 +509,6 @@ class Settings { csrfProtection: false, trustProxy: false, forceIpv4First: false, - dnsServers: '', proxy: { enabled: false, hostname: '', diff --git a/server/lib/settings/migrations/0005_migrate_network_settings.ts b/server/lib/settings/migrations/0005_migrate_network_settings.ts index a6ad48445..6d4a826f3 100644 --- a/server/lib/settings/migrations/0005_migrate_network_settings.ts +++ b/server/lib/settings/migrations/0005_migrate_network_settings.ts @@ -10,7 +10,6 @@ const migrateNetworkSettings = (settings: any): AllSettings => { csrfProtection: settings.main.csrfProtection ?? false, trustProxy: settings.main.trustProxy ?? false, forceIpv4First: settings.main.forceIpv4First ?? false, - dnsServers: settings.main.dnsServers ?? '', proxy: settings.main.proxy ?? { enabled: false, hostname: '', @@ -25,7 +24,6 @@ const migrateNetworkSettings = (settings: any): AllSettings => { delete settings.main.csrfProtection; delete settings.main.trustProxy; delete settings.main.forceIpv4First; - delete settings.main.dnsServers; delete settings.main.proxy; return newSettings; }; diff --git a/server/utils/restartFlag.ts b/server/utils/restartFlag.ts index 24282a091..ffd64df3f 100644 --- a/server/utils/restartFlag.ts +++ b/server/utils/restartFlag.ts @@ -18,8 +18,7 @@ class RestartFlag { this.networkSettings.csrfProtection !== networkSettings.csrfProtection || this.networkSettings.trustProxy !== networkSettings.trustProxy || this.networkSettings.proxy.enabled !== networkSettings.proxy.enabled || - this.networkSettings.forceIpv4First !== networkSettings.forceIpv4First || - this.networkSettings.dnsServers !== networkSettings.dnsServers + this.networkSettings.forceIpv4First !== networkSettings.forceIpv4First ); } } diff --git a/src/components/Settings/SettingsNetwork/index.tsx b/src/components/Settings/SettingsNetwork/index.tsx index befed1fba..e715267e9 100644 --- a/src/components/Settings/SettingsNetwork/index.tsx +++ b/src/components/Settings/SettingsNetwork/index.tsx @@ -45,9 +45,6 @@ const messages = defineMessages('components.Settings.SettingsNetwork', { forceIpv4First: 'Force IPv4 Resolution First', forceIpv4FirstTip: 'Force Jellyseerr to resolve IPv4 addresses first instead of IPv6', - dnsServers: 'Custom DNS Servers', - dnsServersTip: - 'Comma-separated list of custom DNS servers, e.g. "1.1.1.1,[2606:4700:4700::1111]"', }); const SettingsNetwork = () => { @@ -93,7 +90,6 @@ const SettingsNetwork = () => { initialValues={{ csrfProtection: data?.csrfProtection, forceIpv4First: data?.forceIpv4First, - dnsServers: data?.dnsServers, trustProxy: data?.trustProxy, proxyEnabled: data?.proxy?.enabled, proxyHostname: data?.proxy?.hostname, @@ -116,7 +112,6 @@ const SettingsNetwork = () => { body: JSON.stringify({ csrfProtection: values.csrfProtection, forceIpv4First: values.forceIpv4First, - dnsServers: values.dnsServers, trustProxy: values.trustProxy, proxy: { enabled: values.proxyEnabled, @@ -426,34 +421,6 @@ const SettingsNetwork = () => { /> -