Open Build Service

rubygem-bender-vhng.changes Changed

rubygem-bender-vhng.spec Changed

bender-vhng-2.1.12.gem/checksums.yaml.gz -> bender-vhng-2.1.13.gem/checksums.yaml.gz Changed

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

@@ -130,9 +130,11 @@
       host.http.access_rules.map do | rule |
         r = {location: rule.location}
         if rule.allow_from_all
+          r:rule = 'allow_all'
           deny = rule.deny_from.presence
           r:deny = deny if deny
         else
+          r:rule = 'deny_all'
           allow = rule.allow_from.presence || 
           r:allow = allow
         end
@@ -182,7 +184,20 @@
 
     if access.present?
       access.each.with_index do | rule, idx |
-        labels"vhosts-ng/http/access-rules/#{idx}" = Base64.strict_encode64(JSON.dump(rule))
+        labels"vhosts-ng/http/access-rules/#{idx}/location" = rule:location
+        labels"vhosts-ng/http/access-rules/#{idx}/rule" = rule:rule
+        if rule:rule == 'allow_all'
+          rule:deny&.each&.with_index do | ip, idx1 |
+            labels"vhosts-ng/http/access-rules/#{idx}/deny/#{idx1}" = ip
+          end
+        else
+          rule:allow&.each&.with_index do | ip, idx1 |
+            labels"vhosts-ng/http/access-rules/#{idx}/allow/#{idx1}" = ip
+          end
+        end
+        rule:auth&.each&.with_index do | pass, idx1 |
+          labels"vhosts-ng/http/access-rules/#{idx}/auth/#{idx1}" = pass.gsub(/\$/, '$$')
+        end
       end
     end

bender-vhng-2.1.12.gem/metadata.gz -> bender-vhng-2.1.13.gem/metadata.gz Changed

Changes of Revision 24