dust-deploy 0.13.0 → 0.13.1

data/bin/dust

@@ -268,6 +268,8 @@ module  Dust
       puts "\n\n------------------------------ SUMMARY ------------------------------".red unless $parallel
 
       @nodes.each do |node|
+        next unless node['server']
+
         messages = node['server'].messages.collect(level)
         next if messages.empty?
 

data/changelog.md

@@ -1,6 +1,14 @@
 Changelog
 =============
 
+0.13.1
+------------
+
+-  fixes small bug in summary
+-  readds and updates cjdroute public peers
+-  adds dnsmasq recipe
+
+
 0.13.0
 ------------
 

data/lib/dust/recipes/cjdroute.rb

@@ -42,6 +42,50 @@ class Cjdroute< Recipe
     }
   end
 
+  def public_peers
+    # list of public peers, taken from https://wiki.projectmeshnet.org/Public_peers
+    {
+      # derps nodes 
+      '173.255.219.67:10000' => {
+        'password' => 'null',
+        'publicKey' => 'lj52930v1vmg3jqyb399us501svntt499bvgk0c1fud4pmy42gj0.k'
+      },
+
+      '96.126.112.124:10000' => {
+        'password' => 'null',
+        'publicKey' => '7zy1gb9bw4xp82kjvh66w01jdgh6y3lk7cfnl0pgb0xnn26b2jn0.k'
+      },
+
+      # rainfly x
+      '76.105.229.241:13982' => {
+        'password' => 'general_public_1985',
+        'publicKey' => '7pu8nlqphgd1bux9sdpjg0c104217r3b3m1bvmdtbn7uwcj5cky0.k'
+      },
+
+      #  ds500ss 
+      '87.208.234.24:28078' => {
+        'password' => 'freedomnetsrai9yah4Kic5Kojah5que4xoCh',
+        'publicKey' => 'qb426vh42usw995jy60ll6rtslguv1ylpvwp44ymzky6f0u5qvq0.k'
+      },
+
+      # Dans nodes
+      '199.83.100.24:41902' => {
+        'password' => 'znuhtpf005705tp8snzbywynm6',
+        'publicKey' => 'xltnfur6xh2n36g79y1qpht910c13sq7lb049662x7trfx3gf190.k'
+      },
+
+      '173.192.138.43:26099' => {
+        'password' => 'fjhgf77nsnsp8mrkvyxbwj5jw0',
+        'publicKey' => 'bzmd25v05dctt77nqlgl8rxm24g0q8hwlkkcc64ss7pybbx2ndg0.k'
+      },
+
+      '74.221.208.153:51674' => {
+        'password' => 'jljwnfutfpt1nz3yjsj0dscpf7',
+        'publicKey' => '8hgr62ylugxjyyhxkz254qtz60p781kbswmhhywtbb5rpzc5lxj0.k'
+      }
+    }
+  end
+
   # installs cmake, git and other building tools needed
   def install_dependencies
     @node.messages.add("installing build dependencies\n")
@@ -132,6 +176,11 @@ class Cjdroute< Recipe
     # parse generated json
     cjdroute_conf = JSON.parse ret[:stdout]
 
+    # add some public peers, so we can get started directly
+    msg = @node.messages.add('adding public peers', :indent => 2)
+    cjdroute_conf['interfaces']['UDPInterface']['connectTo'] = public_peers
+    msg.ok
+
     # exchange tun0 with configured tun device
     cjdroute_conf['router']['interface']['tunDevice'] = @config['tun']
 

data/lib/dust/recipes/dnsmasq.rb

@@ -0,0 +1,39 @@
+class Dnsmasq < Recipe
+  desc 'dnsmasq:deploy', 'installs and configures dnsmasq'
+  def deploy
+    return unless @node.install_package 'dnsmasq'
+
+    dnsmasq_conf = ''
+    @config.each do |key, values|
+
+      # some settings can be specified multiple times
+      # this is represented in the node.yaml as arrays e.g.
+      # server: [ nameserver1, '/yourdomain/yournameserver/' ]
+      # this will be translated to
+      # server=nameserver1
+      # server=/yourdomain/yournameserver/
+      values.to_array.each do |value|
+
+        # dnsmasq has some settings which are just set without a value
+        # in the node.yaml, this has to be specified using e.g.
+        # no-resolv: true
+        # this will be translated by this script to
+        # no-resolv
+        # we're also skipping settings that are set to false
+        next if value.is_a? FalseClass
+
+        if value.is_a? TrueClass
+          dnsmasq_conf << "#{key}\n"
+
+        # all other settings have key=value pairs
+        else
+          dnsmasq_conf << "#{key}=#{value}\n"
+        end
+
+      end
+    end
+
+    @node.write '/etc/dnsmasq.conf', dnsmasq_conf
+    @node.restart_service 'dnsmasq' if @options.restart
+  end
+end

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dust-deploy
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -172,6 +172,7 @@ files:
 - lib/dust/recipes/cjdroute.rb
 - lib/dust/recipes/cups_client.rb
 - lib/dust/recipes/debsecan.rb
+- lib/dust/recipes/dnsmasq.rb
 - lib/dust/recipes/duplicity.rb
 - lib/dust/recipes/etc_hosts.rb
 - lib/dust/recipes/hash_check.rb