Open Build Service

rubygem-bender-vhng.changes Changed

rubygem-bender-vhng.spec Changed

bender-vhng-2.1.6.gem/checksums.yaml.gz -> bender-vhng-2.1.7.gem/checksums.yaml.gz Changed

bender-vhng-2.1.6.gem/data/config/webserver.xml -> bender-vhng-2.1.7.gem/data/config/webserver.xml Changed

bender-vhng-2.1.6.gem/data/lib/bender/classes/Plugins/Webserver/11-Varnish.rb -> bender-vhng-2.1.7.gem/data/lib/bender/classes/Plugins/Webserver/11-Varnish.rb Changed

@@ -60,8 +60,6 @@
   def varnishConfig(host, service, env)
     basePath = service.baseConfig.get_entry('/ICSystemConf/BaseDir')
 
-    template = File.join(bender_root, 'templates', service.serviceName, "varnish.erb")
-
     data = {}
 
     data:vcl = host.varnish.vcl
@@ -71,13 +69,39 @@
     data:host = host
     data:port = 80
 
-    fname = File.join(basePath, service.mySvcConf("/MandatoryPaths/Path@name='VarnishConf'/path"),
-      "#{host.service.name}.conf")
+    path = service.mySvcConf("/MandatoryPaths/Path@name='VarnishConf'/path")
+    ctPath = service.mySvcConf("/ContainerPaths/VarnishConfigPath")
 
-    ctFname = service.mySvcConf("/ContainerPaths/VarnishConfigPath")
+    varnishCf = service.mySvcConf("/ContainerPaths/VarnishConfigFile")
+    vclCf = service.mySvcConf("/ContainerPaths/VarnishVCLConfigFile")
+    backendCf = service.mySvcConf("/ContainerPaths/VarnishBackendConfigFile")
+    aclCf = service.mySvcConf("/ContainerPaths/VarnishACLConfigFile")
 
+    fname = File.join(basePath, path, "#{host.service.name}_#{varnishCf}")
+    ctFname = File.join(ctPath, varnishCf)
+    template = File.join(bender_root, 'templates', service.serviceName, "varnish.erb")
     env:configs:varnish_conf = {host: fname, container: ctFname}
+    out = service.render(template, data)
+    service.write(fname, out)
+
+    fname = File.join(basePath, path, "#{host.service.name}_#{aclCf}")
+    ctFname = File.join(ctPath, aclCf)
+    template = File.join(bender_root, 'templates', service.serviceName, "varnish_acl.erb")
+    env:configs:varnish_acl_conf = {host: fname, container: ctFname}
+    out = service.render(template, data)
+    service.write(fname, out)
+
+    fname = File.join(basePath, path, "#{host.service.name}_#{backendCf}")
+    ctFname = File.join(ctPath, backendCf)
+    template = File.join(bender_root, 'templates', service.serviceName, "varnish_backend.erb")
+    env:configs:varnish_backend_conf = {host: fname, container: ctFname}
+    out = service.render(template, data)
+    service.write(fname, out)
 
+    fname = File.join(basePath, path, "#{host.service.name}_#{vclCf}")
+    ctFname = File.join(ctPath, vclCf)
+    template = File.join(bender_root, 'templates', service.serviceName, "varnish_vcl.erb")
+    env:configs:varnish_vcl_conf = {host: fname, container: ctFname}
     out = service.render(template, data)
     service.write(fname, out)
   end

bender-vhng-2.1.6.gem/data/lib/bender/templates/webserver/varnish.erb -> bender-vhng-2.1.7.gem/data/lib/bender/templates/webserver/varnish.erb Changed

@@ -1,51 +1,6 @@
-#
-# This is an example VCL file for Varnish.
-#
-# It does not do anything by default, delegating control to the
-# builtin VCL. The builtin VCL is called when there is no explicit
-# return statement.
-#
-# See the VCL chapters in the Users Guide at https://www.varnish-cache.org/docs/
-# and https://www.varnish-cache.org/trac/wiki/VCLExamples for more examples.
+vcl 4.1;
 
-# Marker to tell the VCL compiler that this VCL has been adapted to the
-# new 4.0 format.
-vcl 4.0;
-
-# Default backend definition. Set this to point to your content server.
-backend default {
-    .host = "<%= backend_host %>";
-    .port = "<%= backend_port %>";
-}
-
-acl local {
-    "localhost";
-    "127.0.0.1";
-}
-
-include +glob "/srv/vhost/etc/varnish/*.vcl";
-
-<% if vcl.present? -%>
-<%= vcl -%>
-<% else -%>
-sub vcl_recv {
-    # Happens before we check if we have this in cache already.
-    #
-    # Typically you clean up the request here, removing cookies you don't need,
-    # rewriting the request, etc.
-}
-
-sub vcl_backend_response {
-    # Happens after we have read the response headers from the backend.
-    #
-    # Here you clean the response headers, removing silly Set-Cookie headers
-    # and other mistakes your backend does.
-}
-
-sub vcl_deliver {
-    # Happens when we have all the pieces we need, and are about to send the
-    # response to the client.
-    #
-    # You can do accounting or modifying the final object here.
-}
-<% end -%>
+include "./backend.vcl";
+include "./acl.vcl";
+include "./include.vcl";
+include "./system.vcl";

bender-vhng-2.1.7.gem/data/lib/bender/templates/webserver/varnish_acl.erb Added

bender-vhng-2.1.7.gem/data/lib/bender/templates/webserver/varnish_backend.erb Added

bender-vhng-2.1.7.gem/data/lib/bender/templates/webserver/varnish_vcl.erb Added

bender-vhng-2.1.6.gem/metadata.gz -> bender-vhng-2.1.7.gem/metadata.gz Changed

Changes of Revision 18