odania 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7556edee100f621b9f326c7b21df1a33f9315beb
-  data.tar.gz: 73108f618ec93623d8b638443910eee6ed3a8ecb
+  metadata.gz: 4d869250e9939f0bd3314c657810dfa7f54c0492
+  data.tar.gz: 83cd00c003898d412f13c10caaf5071d3094f583
 SHA512:
-  metadata.gz: a287b037fdc60d676f7f8030a05c275ba3ac7b08f86cf7f8a349f896eb695e8cb01c6a0f5f1a5a83186b82a159d7be9c72f5da9410c90cbc6cc8a1e6f295748d
-  data.tar.gz: 1418a94ca5a651178d94454bbf9b4c8f1f1a5b773b998757d68775669a7db4eb14f9f501322ebc790c04bfb827e99cfb78922262949adef1a07329f63dbe9a2e
+  metadata.gz: e5eada7c634669f18bb2e0687c986eda0e6a88e91c1f01f22099f83bb5d65c314112a3bfcf9b417b21b4e228d520a2406459f3bd7b6b47610bf01946faa6a4c6
+  data.tar.gz: e9d540901337d77fbaf3c513ed0910e43933a36dfd98ff2f2170c809538e96aaf9af0a5473803994f1221d0620e5d26cc45e6d1d8fb4f46136c340406723cd9c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    odania (0.0.24)
+    odania (0.0.25)
       deep_merge
       diplomat
       erubis

data/lib/odania/version.rb

@@ -1,3 +1,3 @@
 module Odania
-  VERSION = '0.0.24'
+  VERSION = '0.0.25'
 end

data/templates/varnish/site_assets.vcl.erb

@@ -10,8 +10,10 @@ sub vcl_recv {
 	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| %>
-			<% unless '_general'.eql? subdomain_name %><%= is_first ? '' : 'else ' %>if (req.http.host ~ "^<%= subdomain.name %>.<%= domain.name %>$") {<% end %>
+			<% 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| %>
@@ -25,10 +27,21 @@ sub vcl_recv {
 					}
 				<% end %>
 
-			<% unless '_general'.eql? subdomain_name %>
 			}
 			<% is_first = false %>
-			<% end %>
+		<% 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 %>
 	}
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odania
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Mike Petersen