Open Build Service

rubygem-bender-vhng.spec Changed

bender-vhng-2.0.0.gem/checksums.yaml.gz -> bender-vhng-2.0.1.gem/checksums.yaml.gz Changed

bender-vhng-2.0.0.gem/data/lib/bender/classes/Plugins/Webserver/01-Filesystems.rb -> bender-vhng-2.0.1.gem/data/lib/bender/classes/Plugins/Webserver/01-Filesystems.rb Changed

@@ -89,16 +89,16 @@
         mount: mntPath,
         read_only: false
       },
-      logs: {
-        volume: {
-          device: ":%s" % service.host_logPath(host),
-          options: "addr=%s"%service.mySvcConf("/VolumeStorage/Server"), service.mySvcConf("/VolumeStorage/Options"), 'ro'.compact.join(','),
-          type: 'nfs'
-        },
-        mount: File.join(service.containerVHostRoot(host),
-          service.mySvcConf("/ContainerPaths/AccessLogPath")),
-        read_only: true
-      }
+      #logs: {
+      #  volume: {
+      #    device: ":%s" % service.host_logPath(host),
+      #    options: "addr=%s"%service.mySvcConf("/VolumeStorage/Server"), service.mySvcConf("/VolumeStorage/Options"), 'ro'.compact.join(','),
+      #    type: 'nfs'
+      #  },
+      #  mount: File.join(service.containerVHostRoot(host),
+      #    service.mySvcConf("/ContainerPaths/AccessLogPath")),
+      #  read_only: true
+      #}
     }
   end
 
@@ -157,17 +157,17 @@
 
     addNFSExport(path, export, service, env)
 
-    path = service.host_logPath(host)
-    log.debug "  + enable nfs export of #{path}"
+    #path = service.host_logPath(host)
+    #log.debug "  + enable nfs export of #{path}"
 
-    export = "%s %s(%s,fsid=%d)" % 
-      path,
-      service.mySvcConf('/NFS/Logs/ACL'),
-      service.mySvcConf('/NFS/Logs/Options'),
-      host.service.id
-    
+    #export = "%s %s(%s,fsid=%d)" % 
+    #  path,
+    #  service.mySvcConf('/NFS/Logs/ACL'),
+    #  service.mySvcConf('/NFS/Logs/Options'),
+    #  host.service.id
+    #
     
-    addNFSExport(path, export, service, env)
+    #addNFSExport(path, export, service, env)
   end
 
   def disableNFSExport(host, service, env)
@@ -176,10 +176,10 @@
 
     removeNFSExport(path, service, env)
 
-    path = service.host_logPath(host)
-    log.debug '  + disable nfs export of #{path}'
+    #path = service.host_logPath(host)
+    #log.debug '  + disable nfs export of #{path}'
 
-    removeNFSExport(path, service, env)
+    #removeNFSExport(path, service, env)
   end
 
   def addNFSExport(path, export, service, env)

bender-vhng-2.0.0.gem/data/lib/bender/classes/Plugins/Webserver/95-Docker.rb -> bender-vhng-2.0.1.gem/data/lib/bender/classes/Plugins/Webserver/95-Docker.rb Changed

@@ -1,4 +1,5 @@
 require 'bender/classes/Plugin'
+require 'securerandom'
 
 $pluginClass = :Docker
 
@@ -84,9 +85,12 @@
       "%s=%s" % k,v
     end      
 
+    random = SecureRandom.alphanumeric(8)
+
     volumes = {}
     mounts = 
     env:volumes.map do | k, v |
+      name = "#{k}-#{random}"
       cfg = {
         'driver' => 'local',
         'driver_opts' => {
@@ -96,10 +100,10 @@
         }
       }
 
-      volumesk.to_s = cfg
+      volumesname = cfg
       mounts << {
         'type' => 'volume',
-        'source' => k.to_s,
+        'source' => name,
         'target' => v:mount,
         'read_only' => v:read_only
       }
@@ -212,9 +216,14 @@
     fname = File.join(basePath, service.mySvcConf("/MandatoryPaths/Path@name='DockerComposeDir'/path"),
     "vhost-#{host.service.login}.yml")
     
-    service.run "docker service scale vhost-#{host.service.login}_www=0" if exists?(host) && running?(host) && env:dirty
-    service.run "docker stack rm vhost-#{host.service.login}" if exists?(host) && env:dirty
-    service.run "docker stack deploy --with-registry-auth --compose-file \"#{fname}\" vhost-#{host.service.login}" if !exists?(host) || env:dirty
+    if env:dirty
+      service.run "docker service scale vhost-#{host.service.login}_www=0" if exists?(host) && running?(host)
+      service.run "docker stack rm vhost-#{host.service.login}" if exists?(host) && env:dirty
+      service.run "docker stack deploy --with-registry-auth --compose-file \"#{fname}\" vhost-#{host.service.login}"
+    else
+      # force update the stack
+      service.run "docker service update --force vhost-#{host.service.login}_www"
+    end
   end
 
   def running?(host)

bender-vhng-2.0.0.gem/metadata.gz -> bender-vhng-2.0.1.gem/metadata.gz Changed

Changes of Revision 6