zabbix_vhost 0.6.0 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0283375e8a145accff8dcd461653f9db7543b8d0'
-  data.tar.gz: 6866a7046dc830e8eea1de8bf30ca9811a21e4c7
+  metadata.gz: 7e140ffbb7a8e7bdd27f7f2f62d5527a6ed74bee
+  data.tar.gz: a08706add8285bb358f9fdae5b65bd432010d994
 SHA512:
-  metadata.gz: 92ba9dbc887a713f185c47099524022a6245743e6c2e57fe77925f0248d730ba5d5d921afe6c0430fdcb708da05f2cc17e25c9e25676149d3afbe1b63b88df76
-  data.tar.gz: b5e1ea7af69edd3f93591a72726e368d64d5d00864c55cf7daa37743960a3e54b2a1469dd4fbc1ea1293bfa1730972433608cae3fec87f632af2c888c0ce9734
+  metadata.gz: 20bd8ad27db30629a997f34d0b94cbe356c2b234a406e84ba09f0d24a7ae9d3b3c09933dbb97fbcca17b0efbbe4fc9d910e8b4682456a378b239f22466952e5f
+  data.tar.gz: 53f5070c150af561ec94df7ffca46338e0d047cdd77dd2d3e2a12cc8536caeb08054128c1a7753196f8bbe366c491165977e4428bbd9a4d326f69c6399992b96

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zabbix_vhost (0.2.0)
+    zabbix_vhost (0.6.2)
       thor
 
 GEM

data/lib/zabbix_vhost/cli.rb

@@ -14,11 +14,14 @@ module ZabbixVhost
 
 
       data = configurations.collect do |c|
-        {
-          "{#DOMAIN}" => c.server_name,
-          "{#CONFIG_FILE}" => c.file_path
-        }
-      end
+
+        unless c.server_name.nil?
+          {
+            "{#DOMAIN}" => c.server_name,
+            "{#CONFIG_FILE}" => c.file_path
+          }
+        end
+      end.compact
 
       print JSON.generate({data: data})
 

data/lib/zabbix_vhost/config.rb

@@ -19,10 +19,10 @@ module ZabbixVhost
       @config_content = File.read(@file_path)
       ## Controlliamo se siamo in apache
       if_apache do
-        @server_name = @config_content.match(/^\s?ServerName (?<server_name>.*)/)[:server_name]
+        @server_name = @config_content.match(/^\s*ServerName (?<server_name>.*)/)[:server_name]
 
-        if @config_content.match(/^\s?ServerAlias/)
-          @server_alias = @config_content.match(/^\s?ServerAlias (?<names>.*)/)[:names].split(" ")
+        if @config_content.match(/^\s*ServerAlias/)
+          @server_alias = @config_content.match(/^\s*ServerAlias (?<names>.*)/)[:names].split(" ")
         end
 
         @ssl_active = !@config_content.match(/443/).nil?
@@ -78,7 +78,7 @@ module ZabbixVhost
     private
 
     def if_apache
-      if @config_content.match(/^\s?ServerName/)
+      if @config_content.match(/^\s*ServerName/)
         yield
       end
     end

data/lib/zabbix_vhost/version.rb

@@ -1,3 +1,3 @@
 module ZabbixVhost
-  VERSION = "0.6.0"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbix_vhost
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.3
 platform: ruby
 authors:
 - Marino Bonetti