odania 0.0.19 → 0.0.20

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2d2919e222e7bdf72e6ba76bb03a5ccd80d95428
4
- data.tar.gz: 27718e49bd96d940551b94b0a133836003c054ad
3
+ metadata.gz: 960a4bfe63694d469f6a2f978bead923b3e40e43
4
+ data.tar.gz: 7785ead06a91479888e17b2ab1107eea4e48f128
5
5
  SHA512:
6
- metadata.gz: 6ec01b9302890743c02c41e2907b6fdd65a4ee9398792d858df68e05c0568e7ad77c972488dc779a0033f54fff3c0280b4824ffa9714303066dea5d542a96fc4
7
- data.tar.gz: 1e19e9536c9c39c142bd98b1c0ebbbf2278dca7e5558e5283deb5273421fff1d4c741b7bca74126b3dbd68cc533f410b27581f9ffeb20f4f592071ceb2697783
6
+ metadata.gz: 0b4c8c38d0c7ca369661638b2fe614ad07e789c0709eafd6ee209eda8ce4bcfac0df40c273b182425c71fef5fae4a94a3b28b711fb7e39a463412ed30a014e7e
7
+ data.tar.gz: 805b28f4852c5372effebf10b6d6386c4d812615be404c8de59ec73f676ef9b246cd2ae0f5bd6a64721e4918640d581956b7b2998dffc0aa2fcac1be9f138a35
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- odania (0.0.19)
4
+ odania (0.0.20)
5
5
  deep_merge
6
6
  diplomat
7
7
  erubis
@@ -0,0 +1,17 @@
1
+ module Odania
2
+ class GenerateFinalVcl
3
+ attr_accessor :template
4
+
5
+ def initialize
6
+ self.template = File.new("#{BASE_DIR}/templates/varnish/final.vcl.erb").read
7
+ end
8
+
9
+ def render
10
+ Erubis::Eruby.new(self.template).result(binding)
11
+ end
12
+
13
+ def write(out_dir)
14
+ File.write("#{out_dir}/final.vcl", self.render)
15
+ end
16
+ end
17
+ end
@@ -1,6 +1,7 @@
1
1
  require_relative 'varnish/generators/generate_backend_vcl'
2
2
  require_relative 'varnish/generators/generate_catch_all_vcl'
3
3
  require_relative 'varnish/generators/generate_default_vcl'
4
+ require_relative 'varnish/generators/generate_final_vcl'
4
5
  require_relative 'varnish/generators/generate_general_vcl'
5
6
  require_relative 'varnish/generators/generate_redirects_vcl'
6
7
  require_relative 'varnish/generators/generate_sites_vcl'
@@ -44,6 +45,10 @@ module Odania
44
45
  gen = GenerateDefaultVcl.new
45
46
  gen.write(out_dir)
46
47
 
48
+ # Generate final vcl
49
+ gen = GenerateFinalVcl.new
50
+ gen.write(out_dir)
51
+
47
52
  puts
48
53
  puts 'Registering internal varnish plugin'
49
54
  register_plugin
@@ -1,3 +1,3 @@
1
1
  module Odania
2
- VERSION = '0.0.19'
2
+ VERSION = '0.0.20'
3
3
  end
@@ -15,3 +15,4 @@ include "/etc/varnish/general.vcl";
15
15
  include "/etc/varnish/redirects.vcl";
16
16
  include "/etc/varnish/sites.vcl";
17
17
  include "/etc/varnish/catch_all.vcl";
18
+ include "/etc/varnish/final.vcl";
@@ -0,0 +1,11 @@
1
+ vcl 4.0;
2
+ # generated varnish config: <%= ENVIRONMENT %>
3
+ # local test: <%= LOCAL_TEST_MODE ? 'ENABLED' : 'DISABLED' %>
4
+
5
+ ### We do not want to try anything we have not specified
6
+ ### so render the 404 page via the core backend
7
+ sub vcl_recv {
8
+ set req.backend_hint = core_backend_director.backend();
9
+ set req.url = "/template/error?req_url=" + req.url + "&req_host=" + req.http.host;
10
+ return (hash);
11
+ }
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: odania
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.19
4
+ version: 0.0.20
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mike Petersen
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-02-21 00:00:00.000000000 Z
11
+ date: 2016-02-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -208,6 +208,7 @@ files:
208
208
  - lib/odania/varnish/generators/generate_backend_vcl.rb
209
209
  - lib/odania/varnish/generators/generate_catch_all_vcl.rb
210
210
  - lib/odania/varnish/generators/generate_default_vcl.rb
211
+ - lib/odania/varnish/generators/generate_final_vcl.rb
211
212
  - lib/odania/varnish/generators/generate_general_vcl.rb
212
213
  - lib/odania/varnish/generators/generate_redirects_vcl.rb
213
214
  - lib/odania/varnish/generators/generate_site_assets_vcl.rb
@@ -229,6 +230,7 @@ files:
229
230
  - templates/varnish/backend.vcl.erb
230
231
  - templates/varnish/catch_all.vcl.erb
231
232
  - templates/varnish/default.vcl.erb
233
+ - templates/varnish/final.vcl.erb
232
234
  - templates/varnish/general.vcl.erb
233
235
  - templates/varnish/general_site.vcl.erb
234
236
  - templates/varnish/general_site_assets.vcl.erb