diff --git a/config.yml.template b/config.yml.template index 0ece0ae9..f45c97fa 100644 --- a/config.yml.template +++ b/config.yml.template @@ -17,6 +17,9 @@ development: paypal_api_signature: tonz letsencrypt_key: ./tests/files/letsencrypt.key letsencrypt_endpoint: https://acme-staging.api.letsencrypt.org/ + proxy_ips: + - 10.0.0.1 + - 10.0.0.2 test: database: 'postgres://localhost/neocities_test' database_pool: 1 @@ -35,3 +38,6 @@ test: paypal_api_signature: tonz letsencrypt_key: ./tests/files/letsencrypt.key letsencrypt_endpoint: https://acme-staging.api.letsencrypt.org/ + proxy_ips: + - 10.0.0.1 + - 10.0.0.2 diff --git a/workers/purge_cache_order_worker.rb b/workers/purge_cache_order_worker.rb index 2f78e516..aa506504 100644 --- a/workers/purge_cache_order_worker.rb +++ b/workers/purge_cache_order_worker.rb @@ -8,12 +8,8 @@ class PurgeCacheOrderWorker end def perform(username, path) - if ENV['RACK_ENV'] == 'test' - proxy_ips = ['10.0.0.1', '10.0.0.2'] - else - #proxy_ips = Resolv.getaddresses($config['cache_purge_ips_uri']) - proxy_ips = Resolv.getaddresses($config['cache_purge_ips_uri']).keep_if {|r| !r.match(/:/)} - end + proxy_ips = $config['proxy_ips'] + #proxy_ips = Resolv.getaddresses($config['cache_purge_ips_uri']).keep_if {|r| !r.match(/:/)} proxy_ips.each do |proxy_ip| PurgeCacheWorker.perform_async proxy_ip, username, path