diff --git a/rootfs/etc/nginx/conf.d/include/ip_ranges.conf b/rootfs/etc/nginx/conf.d/include/ip_ranges.conf index 0289cec..946244f 100644 --- a/rootfs/etc/nginx/conf.d/include/ip_ranges.conf +++ b/rootfs/etc/nginx/conf.d/include/ip_ranges.conf @@ -1,174 +1,2 @@ +# Intentionally left blank -set_real_ip_from 13.124.199.0/24; - -set_real_ip_from 34.226.14.0/24; - -set_real_ip_from 52.124.128.0/17; - -set_real_ip_from 54.230.0.0/16; - -set_real_ip_from 54.239.128.0/18; - -set_real_ip_from 52.82.128.0/19; - -set_real_ip_from 99.84.0.0/16; - -set_real_ip_from 52.15.127.128/26; - -set_real_ip_from 35.158.136.0/24; - -set_real_ip_from 52.57.254.0/24; - -set_real_ip_from 18.216.170.128/25; - -set_real_ip_from 13.54.63.128/26; - -set_real_ip_from 13.59.250.0/26; - -set_real_ip_from 13.210.67.128/26; - -set_real_ip_from 35.167.191.128/26; - -set_real_ip_from 52.47.139.0/24; - -set_real_ip_from 52.199.127.192/26; - -set_real_ip_from 52.212.248.0/26; - -set_real_ip_from 205.251.192.0/19; - -set_real_ip_from 52.66.194.128/26; - -set_real_ip_from 54.239.192.0/19; - -set_real_ip_from 70.132.0.0/18; - -set_real_ip_from 13.32.0.0/15; - -set_real_ip_from 13.113.203.0/24; - -set_real_ip_from 34.195.252.0/24; - -set_real_ip_from 35.162.63.192/26; - -set_real_ip_from 34.223.12.224/27; - -set_real_ip_from 13.35.0.0/16; - -set_real_ip_from 204.246.172.0/23; - -set_real_ip_from 204.246.164.0/22; - -set_real_ip_from 52.56.127.0/25; - -set_real_ip_from 204.246.168.0/22; - -set_real_ip_from 13.228.69.0/24; - -set_real_ip_from 34.216.51.0/25; - -set_real_ip_from 71.152.0.0/17; - -set_real_ip_from 216.137.32.0/19; - -set_real_ip_from 205.251.249.0/24; - -set_real_ip_from 99.86.0.0/16; - -set_real_ip_from 52.46.0.0/18; - -set_real_ip_from 52.84.0.0/15; - -set_real_ip_from 54.233.255.128/26; - -set_real_ip_from 64.252.64.0/18; - -set_real_ip_from 52.52.191.128/26; - -set_real_ip_from 204.246.174.0/23; - -set_real_ip_from 64.252.128.0/18; - -set_real_ip_from 205.251.254.0/24; - -set_real_ip_from 143.204.0.0/16; - -set_real_ip_from 205.251.252.0/23; - -set_real_ip_from 52.78.247.128/26; - -set_real_ip_from 204.246.176.0/20; - -set_real_ip_from 52.220.191.0/26; - -set_real_ip_from 13.249.0.0/16; - -set_real_ip_from 54.240.128.0/18; - -set_real_ip_from 205.251.250.0/23; - -set_real_ip_from 52.222.128.0/17; - -set_real_ip_from 54.182.0.0/16; - -set_real_ip_from 54.192.0.0/16; - -set_real_ip_from 34.232.163.208/29; - -set_real_ip_from 2600:9000:eee::/48; - -set_real_ip_from 2600:9000:4000::/36; - -set_real_ip_from 2600:9000:3000::/36; - -set_real_ip_from 2600:9000:f000::/36; - -set_real_ip_from 2600:9000:fff::/48; - -set_real_ip_from 2600:9000:2000::/36; - -set_real_ip_from 2600:9000:1000::/36; - -set_real_ip_from 2600:9000:ddd::/48; - -set_real_ip_from 2600:9000:5300::/40; - -set_real_ip_from 103.21.244.0/22; - -set_real_ip_from 103.22.200.0/22; - -set_real_ip_from 103.31.4.0/22; - -set_real_ip_from 104.16.0.0/12; - -set_real_ip_from 108.162.192.0/18; - -set_real_ip_from 131.0.72.0/22; - -set_real_ip_from 141.101.64.0/18; - -set_real_ip_from 162.158.0.0/15; - -set_real_ip_from 172.64.0.0/13; - -set_real_ip_from 173.245.48.0/20; - -set_real_ip_from 188.114.96.0/20; - -set_real_ip_from 190.93.240.0/20; - -set_real_ip_from 197.234.240.0/22; - -set_real_ip_from 198.41.128.0/17; - -set_real_ip_from 2400:cb00::/32; - -set_real_ip_from 2405:b500::/32; - -set_real_ip_from 2606:4700::/32; - -set_real_ip_from 2803:f800::/32; - -set_real_ip_from 2c0f:f248::/32; - -set_real_ip_from 2a06:98c0::/29; diff --git a/src/backend/internal/ip_ranges.js b/src/backend/internal/ip_ranges.js index 41c221f..c6ed620 100644 --- a/src/backend/internal/ip_ranges.js +++ b/src/backend/internal/ip_ranges.js @@ -4,7 +4,6 @@ const https = require('https'); const fs = require('fs'); const _ = require('lodash'); const logger = require('../logger').ip_ranges; -const debug_mode = process.env.NODE_ENV !== 'production'; const error = require('../lib/error'); const internalNginx = require('./nginx'); const Liquid = require('liquidjs'); @@ -120,10 +119,6 @@ const internalIpRanges = { * @returns {Promise} */ generateConfig: (ip_ranges) => { - if (debug_mode) { - logger.info('Generating IP Ranges Config', ip_ranges); - } - let renderEngine = Liquid({ root: __dirname + '/../templates/' }); @@ -142,18 +137,10 @@ const internalIpRanges = { .parseAndRender(template, {ip_ranges: ip_ranges}) .then(config_text => { fs.writeFileSync(filename, config_text, {encoding: 'utf8'}); - - if (debug_mode) { - logger.debug('Wrote config:', filename, config_text); - } - resolve(true); }) .catch(err => { - if (debug_mode) { - logger.warn('Could not write ' + filename + ':', err.message); - } - + logger.warn('Could not write ' + filename + ':', err.message); reject(new error.ConfigurationError(err.message)); }); });