odania 0.0.31 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c63bc975f8ecf4857321c100a90e59bf2bc7e355
-  data.tar.gz: 31fcf52e7c496a86261634ce7de3dd88030f7af7
+  metadata.gz: b8825d66726c0bd366677b565db4efda65f94781
+  data.tar.gz: f0af777d50dd142c6e8abac8c88b5ad9c7f0bbca
 SHA512:
-  metadata.gz: 359b130170ad6cb8e356bca18659a58a9c5da3d08a482b07272731bb9b04dd0a2cf58aaa1ba397d6c72cb11c5ebe03318e02cabf9d73c6e7eccaf86d70649cbc
-  data.tar.gz: 6037c64b9154ff77e3675b18437bc4946cd52b7feaa4b04f4125aef2497979272346d313c5eb469491700e16586fb90f00d8cb015a80bbaa9c0dc243e516beee
+  metadata.gz: d68b5ee5db78792eb73574caf0a8aa4a4c31b85584167abe16c62c044a3aff78695e3e7756ab7eb41b9cc048a17df7d2624d2aa4d52dc9c698ad5bd3c127b246
+  data.tar.gz: 4bbbc38ab251fb28d5332b3ec9b8ad67439486ecf794410a970fa32d3beecf79c5f1d2c224750aa01a36ee516f0f1cdd53f4b29887ef4321ab7acccbfc8cc1e6

data/lib/odania/version.rb

@@ -1,3 +1,3 @@
 module Odania
-  VERSION = '0.0.31'
+  VERSION = '0.0.32'
 end

data/lib/odania.rb

@@ -33,6 +33,11 @@ module Odania
 		@varnish
 	end
 
+	def self.consul
+		Odania.configure
+		@consul
+	end
+
 	def self.configure(consul_url=nil)
 		@consul = Consul.new(consul_url) if @consul.nil?
 		$debug = false

data/spec/fixtures/global_config.json

@@ -39,6 +39,25 @@
 			}
 		},
 		"example.com": {
+
+			"_general": {
+				"config": {
+
+				},
+				"data": {
+					"external": {
+
+					},
+					"internal": {
+
+					},
+					"assets": {
+
+					}
+				}
+			},
+
+
 			"_general": {
 				"config": {
 				},

data/templates/varnish/general_site_assets.vcl.erb

@@ -9,7 +9,7 @@ sub vcl_recv {
 
 		<% 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);
+				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 %>

data/templates/varnish/site.vcl.erb

@@ -10,6 +10,34 @@ sub vcl_recv {
 	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 %>$") {
@@ -41,6 +69,9 @@ sub vcl_recv {
 					}
 				<% 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 %>
@@ -52,34 +83,6 @@ sub vcl_recv {
 			set req.http.Location = "http://<%= default_subdomain_for(domain) %>.<%= domain.name %>" + req.url;
 			return (synth(750, "Permanently moved"));
 		}
-
-		# 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 %>
 	}
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odania
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.32
 platform: ruby
 authors:
 - Mike Petersen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler