mirror of
https://github.com/neocities/neocities.git
synced 2025-04-24 09:12:35 +02:00
Disable v6 check for trumpplan, tempfix for purge cache, uncomment
manifest entries
This commit is contained in:
parent
d0a59f5de1
commit
d2fc7a3a16
4 changed files with 12 additions and 7 deletions
|
@ -67,12 +67,13 @@ def trump_plan_eligible?
|
|||
ranges = []
|
||||
|
||||
if File.exist? trumpplan_path
|
||||
parsed_ip = IPAddress.parse request.ip
|
||||
return false if parsed_ip.ipv6? # NOT EXCLUSIVE ENOUGH
|
||||
|
||||
File.readlines(trumpplan_path).each do |range|
|
||||
ranges << IPAddress.parse(range.strip)
|
||||
end
|
||||
|
||||
parsed_ip = IPAddress.parse(request.ip)
|
||||
|
||||
matched_ip = false
|
||||
ranges.each do |range|
|
||||
if range.include? parsed_ip
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<!--[if (gt IE 9)|!(IE)]><!--><html lang="en"><!--<![endif]-->
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||
<link rel="manifest" href="/manifest.json">
|
||||
<!-- <link rel="manifest" href="/manifest.json"> -->
|
||||
|
||||
<title>Neocities: Create your own free website!</title>
|
||||
<meta itemprop="name" content="Neocities" />
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<head>
|
||||
<title><%= title %></title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<link rel="manifest" href="/manifest.json">
|
||||
<!-- <link rel="manifest" href="/manifest.json"> -->
|
||||
<meta itemprop="name" content="Neocities.org">
|
||||
<meta itemprop="description" content="Free web hosting and tools that allow anyone to create a website. Join our community today!">
|
||||
<meta name="description" content="Free web hosting and tools that allow anyone to create a website. Join our community today!">
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require 'open-uri'
|
||||
|
||||
class PurgeCacheWorker
|
||||
HTTP_TIMEOUT = 3
|
||||
HTTP_TIMEOUT = 10
|
||||
include Sidekiq::Worker
|
||||
sidekiq_options queue: :purgecache, retry: 2, backtrace: false, average_scheduled_poll_interval: 1
|
||||
|
||||
|
@ -22,9 +22,13 @@ class PurgeCacheWorker
|
|||
retry_encoded = false
|
||||
|
||||
begin
|
||||
HTTP.timeout(read: 10, write: 10, connect: 2).
|
||||
#cmd = %{timeout 5 curl -k -I -H "Host: #{URI::encode("#{username}.neocities.org")}" -H "Cache-Purge: 1" "#{url}"}
|
||||
#`#{cmd}`
|
||||
ctx = OpenSSL::SSL::SSLContext.new
|
||||
ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
|
||||
HTTP.follow.timeout(read: 10, write: 10, connect: 5).
|
||||
headers(host: URI::encode("#{username}.neocities.org"), cache_purge: '1').
|
||||
head(url)
|
||||
head(url, ssl_context: ctx)
|
||||
rescue URI::InvalidURIError
|
||||
raise if retry_encoded == true
|
||||
url = URI.encode url
|
||||
|
|
Loading…
Add table
Reference in a new issue