phpipam2masq 1.0.3 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdfa6fce3a2f12fbfe0844ee15c9d331ad43e4e4a267490ab32f184136e105ed
-  data.tar.gz: f437e08008dd874957fdc6f4dc422ee210313bb9824fb1bbc9124223b19ab795
+  metadata.gz: 3d2b2e2e68a3163105329070cf3ea53d876742fe1b7157e382f28a2e600a24f5
+  data.tar.gz: 0e92a708a4bed3f0fdc3d5625c42a47afb255122a3a1969d62e2972ab7163ff4
 SHA512:
-  metadata.gz: 730fe2449828280400e396c20eb2b40ec1f6a4f0d3d1ca94227a6113fca47053b7e3c313ee32bfdbb65ad97c89bb9a47400a5a31cf5c2047941476742bdaab2e
-  data.tar.gz: 5ad003c92a6163d912adff30a15808d7ca7fc2348f31c4206d264b243146711ace2dcf43bd9137fade3b6bb7fef294dbfb13dbfed31052a4d9944c631b7c0445
+  metadata.gz: bdd78b35bd2d85b2473f147a39cd8296649aba17dcfbffe86e00cd7f3eb39fe33ef44b5ff8f73d51f718a4138e260ab169e75f8a3bcb5852b42b793e6e8cf682
+  data.tar.gz: 174f3ddf9937410039ade2d10982099b8f17659e1b14f65f2d41877cf08d187077ed72246d4fae282188c2693f38997c0a4af512213fb351d957908ea75766a5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phpipam2masq (0.1.4)
+    phpipam2masq (1.0.7)
       awesome_print (~> 1.0)
       facets (~> 3.0)
       faraday (~> 0.15)
@@ -36,7 +36,7 @@ GEM
     json (2.1.0)
     method_source (0.9.0)
     multipart-post (2.0.0)
-    mustermann (1.0.2)
+    mustermann (1.0.3)
     nesty (1.0.2)
     pry (0.11.3)
       coderay (~> 1.1.0)
@@ -58,7 +58,7 @@ GEM
       rack-protection (= 2.0.3)
       tilt (~> 2.0)
     tilt (2.0.8)
-    trollop (2.1.2)
+    trollop (2.9.9)
 
 PLATFORMS
   ruby

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 David Parker
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/exe/dnsmasqconfigupdater.rb

@@ -9,6 +9,8 @@ get '/updateDnsmasq' do
 	output += Time.now.to_s
 	output += "\n#{%x(phpipam2masq.rb 2>&1)}"
 	output += Time.now.to_s
+	output += "\n#{%x(systemctl restart dnsmasq 2>&1 ; echo "Restart exit: $?")}"
+	output += Time.now.to_s
 	%Q(<pre>#{output}</pre>)
 end
 

data/exe/phpipam2masq.rb

@@ -89,7 +89,7 @@ hosts_entries = Array.new
 dhcp_hosts_entries = Array.new
 cnames_entries = Array.new
 addresses.values.each { |host|
-  if host[:tag] != config[:dhcptag] and host[:hostname].size > 0
+  if host[:tag] != config[:dhcptag] and not host[:hostname].nil? and host[:hostname].size > 0
     if host[:mac] and host[:mac].size > 0
       # static dhcp assignment
       if host[:optiontag]

data/lib/phpipam2masq/version.rb

@@ -1,3 +1,3 @@
 module Phpipam2masq
-  VERSION = "1.0.3"
+  VERSION = "1.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phpipam2masq
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.7
 platform: ruby
 authors:
 - Dave Parker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-07 00:00:00.000000000 Z
+date: 2018-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -147,6 +147,7 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - Procfile
 - README.md
 - bin/console