odania 0.0.32 → 0.0.33

data/spec/lib/odania/varnish_spec.rb

@@ -1,37 +0,0 @@
-describe Odania::Varnish do
-	context 'generate' do
-		before do
-			$consul_mock.service.services = {
-				'odania_static' => [
-					OpenStruct.new({
-						'Node' => 'agent-one',
-						'Address' => '172.20.20.1',
-						'ServiceID' => 'odania_static_1',
-						'ServiceName' => 'odania_static',
-						'ServiceTags' => [],
-						'ServicePort' => 80,
-						'ServiceAddress' => '172.20.20.1'
-					}),
-					OpenStruct.new({
-						'Node' => 'agent-two',
-						'Address' => '172.20.20.2',
-						'ServiceID' => 'odania_static_2',
-						'ServiceName' => 'odania_static',
-						'ServiceTags' => [],
-						'ServicePort' => 80,
-						'ServiceAddress' => '172.20.20.1'
-					})
-				]
-			}
-		end
-
-		let(:global_cfg) {
-			JSON.parse File.read("#{BASE_DIR}/spec/fixtures/global_config.json")
-		}
-
-		it 'generates the varnish config' do
-			$consul_mock.config.set('global_plugins_config', global_cfg)
-			expect(subject.generate('/tmp/varnish')).to eq("odania-varnish|odania_varnish_#{Socket.gethostname.gsub(/[^0-9a-zA-Z_]/, '_')}")
-		end
-	end
-end

data/templates/varnish/backend.vcl.erb

@@ -1,51 +0,0 @@
-vcl 4.0;
-# generated varnish config: <%= ENVIRONMENT %>
-# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
-
-import std;
-import directors;
-
-probe www_probe {
-	.url = "/health";
-	.timeout = 1s;
-	.interval = <%= LOCAL_TEST_MODE ? '60s' : '4s' %>;
-	.window = 5;
-	.threshold = 3;
-}
-
-backend default {
-	.host = "<%= default_backend.host %>";
-	.port = "<%= default_backend.port %>";
-	.probe = www_probe;
-	.connect_timeout = 0.5s;
-	.first_byte_timeout = 20s;
-	.between_bytes_timeout = 5s;
-	.max_connections = 50;
-}
-
-<% backend_groups.each_pair do |group_name, backend_group| %>
-	<% backend_group.backends.each do |backend| %>
-		<% unless backend_name_already_taken(group_name, backend.instance_name) %>
-
-		backend <%= backend_name_for(group_name, backend.instance_name) %> {
-			.host = "<%= backend.host %>";
-			.port = "<%= backend.port %>";
-			.probe = www_probe;
-		}
-		<% end %>
-	<% end %>
-<% end %>
-
-sub vcl_init {
-<% backend_groups.each_pair do |group_name, backend_group| %>
-	new <%= Odania.varnish_sanitize(group_name) %>_director = directors.round_robin();
-	<% backend_group.backends.each do |backend| %>
-		<%= Odania.varnish_sanitize(backend_group.name) %>_director.add_backend(<%= Odania.varnish_sanitize(group_name) %>_<%= Odania.varnish_sanitize(backend.instance_name) %>);
-	<% end %>
-<% end %>
-
-	new core_backend_director = directors.round_robin();
-<% core_backends.each do |core_backend_name| %>
-	core_backend_director.add_backend(<%= core_backend_name %>);
-<% end %>
-}

data/templates/varnish/catch_all.vcl.erb

@@ -1,5 +0,0 @@
-vcl 4.0;
-# generated varnish config: <%= ENVIRONMENT %>
-# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
-
-# Catch all

data/templates/varnish/default.vcl.erb

@@ -1,18 +0,0 @@
-vcl 4.0;
-# generated varnish config: <%= ENVIRONMENT %>
-# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
-
-sub vcl_synth {
-	if (resp.status == 750) {
-		set resp.http.location = req.http.Location;
-		set resp.status = 301;
-		return (deliver);
-	}
-}
-
-include "/etc/varnish/backend.vcl";
-include "/etc/varnish/general.vcl";
-include "/etc/varnish/redirects.vcl";
-include "/etc/varnish/sites.vcl";
-include "/etc/varnish/catch_all.vcl";
-include "/etc/varnish/final.vcl";

data/templates/varnish/final.vcl.erb

@@ -1,11 +0,0 @@
-vcl 4.0;
-# generated varnish config: <%= ENVIRONMENT %>
-# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
-
-### We do not want to try anything we have not specified
-### so render the 404 page via the core backend
-sub vcl_recv {
-	set req.backend_hint = core_backend_director.backend();
-	set req.url = "/template/error?req_url=" + req.url + "&req_host=" + req.http.host;
-	return (hash);
-}

data/templates/varnish/general.vcl.erb

@@ -1,118 +0,0 @@
-<%
-	 default_cache_time = ENVIRONMENT.eql?('production') ? '600s' : '1s'
-%>
-vcl 4.0;
-# generated varnish config: <%= ENVIRONMENT %>
-# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
-
-### Called when a client request is received
-sub vcl_recv {
-	## Internal requests for content/partials
-	## we use internal.core to not have this part open to public
-	if (req.http.host ~ "^internal.core$") {
-		if (req.url ~ "^/template/content") {
-			std.log("template content identified! Page:" + req.url);
-			set req.backend_hint = core_backend_director.backend();
-			return (hash);
-		} else if (req.url ~ "^/template/partial") {
-			std.log("template partial identified! Page:" + req.url);
-			set req.backend_hint = core_backend_director.backend();
-			return (hash);
-		} else if (req.url ~ "^/template/page") {
-			std.log("template page identified! Page:" + req.url);
-			set req.backend_hint = core_backend_director.backend();
-			return (hash);
-		}
-	}
-
-	### always cache these items:
-
-	# varnish is alive. Get health state from core plugin.
-	if (req.url ~ "^/health$") {
-		return (hash);
-	}
-
-	#if (req.method == "GET" && req.url ~ "\.(js)") {
-	#	return (hash);
-	#}
-
-	## images
-	#if (req.method == "GET" && req.url ~ "\.(gif|jpg|jpeg|bmp|png|tiff|tif|ico|img|tga|wmf)$") {
-	#	return (hash);
-	#}
-
-	## various other content pages
-	#if (req.method == "GET" && req.url ~ "\.(css)$") {
-	#	return (hash);
-	#}
-
-	## multimedia
-	#if (req.method == "GET" && req.url ~ "\.(svg|swf|ico|mp3|mp4|m4a|ogg|mov|avi|wmv)$") {
-	#	return (hash);
-	#}
-
-	## xml
-
-	#if (req.method == "GET" && req.url ~ "\.(xml)$") {
-	#	return (hash);
-	#}
-}
-
-### Called when the requested object has been retrieved from the backend, or the request to the backend has failed
-### TODO: hardly changed from varnish 3. Is it still working??? Check!!!
-sub vcl_backend_response {
-	if (bereq.method == "GET" && bereq.url ~ "\.(gif|jpg|jpeg|bmp|png|tiff|tif|ico|img|tga|wmf)$") {
-		unset beresp.http.set-cookie;
-		set beresp.ttl = <%= default_cache_time %>;
-	}
-
-	## various other content pages
-	if (bereq.method == "GET" && bereq.url ~ "\.(css)$") {
-		unset beresp.http.set-cookie;
-		set beresp.ttl = <%= default_cache_time %>;
-	}
-
-	if (bereq.method == "GET" && bereq.url ~ "\.(js)$") {
-		unset beresp.http.set-cookie;
-		set beresp.ttl = <%= default_cache_time %>;
-	}
-
-	## xml
-	if (bereq.method == "GET" && bereq.url ~ "\.(xml)$") {
-		unset beresp.http.set-cookie;
-		set beresp.ttl = <%= default_cache_time %>;
-	}
-
-	## multimedia
-	if (bereq.method == "GET" && bereq.url ~ "\.(svg|swf|ico|mp3|mp4|m4a|ogg|mov|avi|wmv)$") {
-		unset beresp.http.set-cookie;
-		set beresp.ttl = <%= default_cache_time %>;
-	}
-
-	# Allow items to be stale if needed.
-	set beresp.grace = 6h;
-
-	if (beresp.http.X-Do-Esi ~ "true") {
-		set beresp.do_esi = true;
-	}
-
-	<% if LOCAL_TEST_MODE %>
-	set beresp.ttl = 1s;
-	<% end %>
-}
-
-#
-#
-## Called before a cached object is delivered to the client
-#
-sub vcl_deliver {
-	set resp.http.X-Served-By = server.hostname;
-	if (obj.hits > 0) {
-		set resp.http.X-Cache = "HIT";
-		set resp.http.X-Cache-Hits = obj.hits;
-	} else {
-		set resp.http.X-Cache = "MISS";
-	}
-
-	return(deliver);
-}

data/templates/varnish/general_site.vcl.erb

@@ -1,33 +0,0 @@
-vcl 4.0;
-# generated varnish config: <%= ENVIRONMENT %>
-# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
-
-sub vcl_recv {
-	std.log("pre varnish log info _general:" + req.http.host);
-
-	<% %w(direct dynamic).each do |type| %>
-		<% general_subdomain[type].each_pair do |url, page| %>
-			if (req.url ~ "^<%= prepare_url url %>") {
-				std.log("general page identified Page:'<%= url %>':" + req.url);
-
-				<% if 'direct'.eql? type %>
-				set req.backend_hint = <%= page.director %>.backend();
-				<% unless page.plugin_url.nil? %>set req.url = "<%= page.plugin_url %>";<% end %>
-				<% else %>
-				set req.backend_hint = core_backend_director.backend();
-				set req.url = "/template/page?req_url=" + req.url + "&req_host=" + req.http.host + "<%= template_url_for(domain, page) %>";
-				<% end %>
-
-				return (hash);
-			}
-		<% end %>
-	<% end %>
-
-	<% general_subdomain.get_redirects.each_pair do |src, target| %>
-		if (req.url ~ "<%= src %>") {
-			std.log("general redirect identified src:'<%= src %>':" + req.url);
-			set req.http.Location = "<%= target %>";
-			return (synth(750, "Permanently moved"));
-		}
-	<% end %>
-}

data/templates/varnish/general_site_assets.vcl.erb

@@ -1,21 +0,0 @@
-vcl 4.0;
-# generated varnish config: <%= ENVIRONMENT %>
-# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
-
-sub vcl_recv {
-	std.log("pre varnish log info '<%= domain.name %>':" + req.http.host);
-	if (req.http.host ~ "<%= domain.name %>$") {
-		std.log("varnish log info '<%= domain.name %>':" + req.http.host);
-
-		<% general_subdomain.assets.each_pair do |url, page| %>
-			if (req.url ~ "^<%= prepare_url url %>") {
-				std.log("asset identified '<%= domain.name %>' Page:'<%= url %>':" + req.url);
-
-				set req.backend_hint = <%= page.director %>.backend();
-				<% unless page.plugin_url.nil? %>set req.url = "<%= page.plugin_url %>";<% end %>
-
-				return (hash);
-			}
-		<% end %>
-	}
-}

data/templates/varnish/redirects.vcl.erb

@@ -1,12 +0,0 @@
-vcl 4.0;
-# generated varnish config: <%= ENVIRONMENT %>
-# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
-
-sub vcl_recv {
-	<% redirects.each_pair do |src, target| %>
-	if (req.http.host == "<%= src %>") {
-		set req.http.Location = "<%= target %>";
-		return (synth(750, "Permanently moved"));
-	}
-	<% end %>
-}

data/templates/varnish/site.vcl.erb

@@ -1,93 +0,0 @@
-<%
-is_first = true
-%>
-vcl 4.0;
-# generated varnish config: <%= ENVIRONMENT %>
-# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
-
-sub vcl_recv {
-	std.log("pre varnish log info '<%= domain.name %>':" + req.http.host);
-	if (req.http.host ~ "<%= domain.name %>$") {
-		std.log("varnish log info '<%= domain.name %>':" + req.http.host);
-
-		# General part
-		<% domain.get_redirects.each_pair do |src, target| %>
-			if (req.url ~ "<%= src %>") {
-				std.log("general redirect identified '<%= domain.name %>' src:'<%= src %>':" + req.url);
-				set req.http.Location = "<%= target %>";
-				return (synth(750, "Permanently moved"));
-			}
-		<% end %>
-
-		<% subdomain = domain.subdomains['_general'] %>
-		<% %w(direct dynamic).each do |type| %>
-			<% subdomain[type].each_pair do |url, page| %>
-				if (req.url ~ "^<%= prepare_url url %>") {
-					std.log("page identified '<%= subdomain.name %>.<%= domain.name %>' Page:'<%= url %>':" + req.url);
-
-					<% if 'direct'.eql? type %>
-					set req.backend_hint = <%= page.director %>.backend();
-					<% unless page.plugin_url.nil? %>set req.url = "<%= page.plugin_url %>";<% end %>
-					<% else %>
-					set req.backend_hint = core_backend_director.backend();
-					set req.url = "/template/page?req_url=" + req.url + "&req_host=" + req.http.host + "<%= template_url_for(domain, page) %>";
-					<% end %>
-
-					return (hash);
-				}
-			<% end %>
-		<% end %>
-
-		<% domain.subdomains.each_pair do |subdomain_name, subdomain|
-			next if '_general'.eql? subdomain_name %>
-			<%= is_first ? '' : 'else ' %>if (req.http.host ~ "^<%= subdomain.name %>.<%= domain.name %>$") {
-				std.log("subdomain identified '<%= subdomain.name %>.<%= domain.name %>':" + req.http.host + " url: " + req.url );
-
-	 			<% %w(direct dynamic).each do |type| %>
-					<% subdomain[type].each_pair do |url, page| %>
-						if (req.url ~ "^<%= prepare_url url %>") {
-							std.log("page identified '<%= subdomain.name %>.<%= domain.name %>' Page:'<%= url %>':" + req.url);
-
-							<% if 'direct'.eql? type %>
-							set req.backend_hint = <%= page.director %>.backend();
-							<% unless page.plugin_url.nil? %>set req.url = "<%= page.plugin_url %>";<% end %>
-							<% else %>
-							set req.backend_hint = core_backend_director.backend();
-							set req.url = "/template/page?req_url=" + req.url + "&req_host=" + req.http.host + "<%= template_url_for(domain, page) %>";
-							<% end %>
-
-							return (hash);
-						}
-					<% end %>
-				<% end %>
-
-				<% subdomain.get_redirects.each_pair do |src, target| %>
-					if (req.url ~ "<%= src %>") {
-						std.log("redirect identified '<%= subdomain.name %>.<%= domain.name %>' src:'<%= src %>':" + req.url);
-						set req.http.Location = "<%= target %>";
-						return (synth(750, "Permanently moved"));
-					}
-				<% end %>
-
-				set req.backend_hint = core_backend_director.backend();
-				set req.url = "/base/identify?req_url=" + req.url + "&req_host=" + req.http.host + "&domain=<%= domain.name %>";
-				return (hash);
-			}
-			<% is_first = false %>
-		<% end %>
-
-		# Important: This needs to be directly after the subdomain config
-		<%= is_first ? '' : 'else' %> {
-			# Redirect to default subdomain
-			std.log("varnish log info 'redirect to default':" + req.url);
-			set req.http.Location = "http://<%= default_subdomain_for(domain) %>.<%= domain.name %>" + req.url;
-			return (synth(750, "Permanently moved"));
-		}
-	}
-}
-
-sub vcl_deliver {
-	if (req.http.host ~ "<%= domain.name %>$") {
-		# What to do?
-	}
-}

data/templates/varnish/site_assets.vcl.erb

@@ -1,47 +0,0 @@
-<%
-is_first = true
-%>
-vcl 4.0;
-# generated varnish config: <%= ENVIRONMENT %>
-# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
-
-sub vcl_recv {
-	std.log("pre varnish log info '<%= domain.name %>':" + req.http.host);
-	if (req.http.host ~ "<%= domain.name %>$") {
-		std.log("varnish log info '<%= domain.name %>':" + req.http.host);
-
-		# subdomains
-		<% domain.subdomains.each_pair do |subdomain_name, subdomain| %>
-			<% next if '_general'.eql? subdomain_name %>
-			<%= is_first ? '' : 'else ' %>if (req.http.host ~ "^<%= subdomain.name %>.<%= domain.name %>$") {
-				std.log("subdomain identified '<%= subdomain.name %>.<%= domain.name %>':" + req.http.host + " url: " + req.url );
-
-				<% subdomain.assets.each_pair do |url, page| %>
-					if (req.url ~ "^<%= prepare_url url %>") {
-						std.log("page identified '<%= subdomain.name %>.<%= domain.name %>' Page:'<%= url %>':" + req.url);
-
-						set req.backend_hint = <%= page.director %>.backend();
-						<% unless page.plugin_url.nil? %>set req.url = "<%= page.plugin_url %>";<% end %>
-
-						return (hash);
-					}
-				<% end %>
-
-			}
-			<% is_first = false %>
-		<% end %>
-
-		# general
-		<% subdomain = domain.subdomain('_general') %>
-		<% subdomain.assets.each_pair do |url, page| %>
-			if (req.url ~ "^<%= prepare_url url %>") {
-				std.log("page identified '<%= subdomain.name %>.<%= domain.name %>' Page:'<%= url %>':" + req.url);
-
-				set req.backend_hint = <%= page.director %>.backend();
-				<% unless page.plugin_url.nil? %>set req.url = "<%= page.plugin_url %>";<% end %>
-
-				return (hash);
-			}
-		<% end %>
-	}
-}

data/templates/varnish/sites.vcl.erb

@@ -1,11 +0,0 @@
-vcl 4.0;
-# generated varnish config: <%= ENVIRONMENT %>
-# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
-
-# @see https://www.varnish-cache.org/lists/pipermail/varnish-misc/2011-January/005449.html
-
-# Sites
-<% domains.each_pair do |domain_name, domain| %>
-include "/etc/varnish/sites/<%= domain_name %>_assets.vcl";
-include "/etc/varnish/sites/<%= domain_name %>.vcl";
-<% end %>

data/templates/varnish/websocker.vcl.erb

@@ -1,18 +0,0 @@
-vcl 4.0;
-# generated varnish config: <%= ENVIRONMENT %>
-# local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
-# https://www.varnish-cache.org/docs/4.0/users-guide/vcl-example-websockets.html
-
-sub vcl_pipe {
-	if (req.http.upgrade)
-	{
-		set bereq.http.upgrade = req.http.upgrade;
-	}
-}
-
-sub vcl_recv {
-	if (req.http.Upgrade ~"(?i)websocket")
-	{
-		return (pipe);
-	}
-}