Open Build Service

rubygem-nginx-controller.changes Changed

rubygem-nginx-controller.spec Changed

nginx-controller-2.1.0.gem/checksums.yaml.gz -> nginx-controller-2.1.1.gem/checksums.yaml.gz Changed

nginx-controller-2.1.0.gem/data/lib/nginx_controller/docker/service.rb -> nginx-controller-2.1.1.gem/data/lib/nginx_controller/docker/service.rb Changed

@@ -202,33 +202,34 @@
 
       def access_rules
         @access_rules ||= begin
-          pairs = labels.select { |k, _| k =~ /\Avhosts-ng\/http\/access-rules/ }.map { |_, v|
-            begin
-              raw = Base64.strict_decode64(v)
-              data = JSON.parse(raw, symbolize_names: true)
-              loc = data:location.to_s.strip
-
-              # normalize leading and trailing slashes
-              unless loc.blank?
-                loc = "/#{loc}" unless loc.start_with?('/')
-                loc = loc.chomp('/') if loc.length > 1 && loc.end_with?('/')
-              end
-
-              next if loc.blank?
-              next unless data:allow || data:deny || data:auth
-
-              rule = {
-                location: loc,
-                allow: data:allow ? Array(data:allow) : nil,
-                deny: !data:allow && data:deny ? Array(data:deny) : nil,
-                auth: data:auth ? Array(data:auth) : nil,
-              }
-              loc, rule
-            rescue
-              nil
+          rules = {}
+          pairs = labels.select { |k, _| k =~ /\Avhosts-ng\/http\/access-rules/ }.map { |key, v|
+            key = key.gsub(/\Avhosts-ng\/http\/access-rules\//, '')
+            ridx, k, idx = key.split('/')
+            case k
+            when 'location' then
+              rulesridx ||= {}
+              rulesridx:location = v
+            when 'rule' then
+              rulesridx ||= {}
+              rulesridx:rule = v
+            when 'allow' then
+              rulesridx ||= {}
+              rulesridx:allow ||= 
+              rulesridx:allow << v
+            when 'deny' then
+              rulesridx ||= {}
+              rulesridx:deny ||= 
+              rulesridx:deny << v
+            when 'auth' then
+              rulesridx ||= {}
+              rulesridx:auth ||= 
+              rulesridx:auth << v
+            else
+              puts "unknown access rule key \"#{i}\""
             end
           }.compact
-          Hashpairs
+          Hashrules.values.map{|r| r:location, r}
         end
       end

nginx-controller-2.1.0.gem/data/lib/nginx_controller/templates/nginx-common.erb -> nginx-controller-2.1.1.gem/data/lib/nginx_controller/templates/nginx-common.erb Changed

nginx-controller-2.1.0.gem/metadata.gz -> nginx-controller-2.1.1.gem/metadata.gz Changed

Changes of Revision 13