dust-deploy 0.8.2 → 0.8.3

data/bin/dust

@@ -97,7 +97,7 @@ module  Dust
     def check_dust_dir
       if Dir.pwd.split('.').last != 'dust'
         Dust.print_failed 'current directory does not end with .dust, are you in your dust directory?'
-        Dust.print_msg "try running 'dust new mynetwork' to let me create one for you with tons of examples!\n", 0
+        Dust.print_msg "try running 'dust new mynetwork' to let me create one for you with tons of examples!\n", :indent => 0
         return false
       end
 

data/changelog.md

@@ -1,6 +1,13 @@
 Changelog
 =============
 
+0.8.3
+------------
+
+-  cjdroute recipe fixes (manually adding rules not necessary anymore)
+-  small bugfixes
+
+
 0.8.2
 ------------
 

data/lib/dust/recipes/cjdroute.rb

@@ -27,12 +27,6 @@ class Cjdroute< Recipe
     # create the config file and place it into etc_dir
     return unless generate_config
 
-    # create the tuntap interface
-    return unless create_tuntap
-
-    # add route for cjdns network
-    return unless add_route
-
     start_cjdroute
   end
 
@@ -41,10 +35,12 @@ class Cjdroute< Recipe
   def default_config
     { 
       'git_repo' => 'git://github.com/cjdelisle/cjdns.git',
+      'git_branch' => 'master',
       'build_dir' => '/tmp/cjdns-tmp',
       'bin_dir' => '/usr/local/bin',
       'etc_dir' => '/etc/cjdns/',
       'tun' => 'cjdroute0',
+      'loglevel' => 'WARN'
     }
   end
 
@@ -142,7 +138,7 @@ class Cjdroute< Recipe
 
       # git clone cjdns repository
       ::Dust.print_msg "cloning cjdns repository into #{@config['build_dir']}\n"
-      ret = @node.exec "git clone #{@config['git_repo']} #{@config['build_dir']}", :live => true
+      ret = @node.exec "git clone #{@config['git_repo']} -b #{@config['git_branch']} #{@config['build_dir']}", :live => true
       return ::Dust.print_failed 'error cloning git repository' unless ret[:exit_code] == 0
     end
 
@@ -160,14 +156,14 @@ class Cjdroute< Recipe
 
   def run_cmake
     ::Dust.print_msg "running cmake\n"
-    ret = @node.exec "cd #{@config['build_dir']}/build; cmake ..", :live => true
+    ret = @node.exec "export Log_LEVEL=#{@config['loglevel']}; cd #{@config['build_dir']}/build; cmake ..", :live => true
     return ::Dust.print_failed 'error running cmake' unless ret[:exit_code] == 0
     true
   end
 
   def run_make
     ::Dust.print_msg "compiling cjdns\n"
-    ret = @node.exec "cd #{@config['build_dir']}/build; make", :live => true
+    ret = @node.exec "export Log_LEVEL=#{@config['loglevel']}; cd #{@config['build_dir']}/build; make", :live => true
     return ::Dust.print_failed 'error compiling cjdroute' unless ret[:exit_code] == 0
     true
   end
@@ -198,29 +194,6 @@ class Cjdroute< Recipe
     return @node.write "#{@config['etc_dir']}/cjdroute.conf", JSON.pretty_generate(cjdroute_conf)
   end
 
-  # creates the cjdroute tuntap device
-  def create_tuntap
-    unless @node.exec("/sbin/ip tuntap list |grep #{@config['tun']}")[:exit_code] == 0
-      ::Dust.print_msg "creating tun interface #{@config['tun']}"
-      return false unless ::Dust.print_result @node.exec("/sbin/ip tuntap add mode tun dev #{@config['tun']}")[:exit_code]
-    else
-      ::Dust.print_msg "tun interface #{@config['tun']} already exists, flushing ip addresses"
-      ::Dust.print_result @node.exec("ip addr flush dev #{@config['tun']}")[:exit_code]
-    end
-
-    true
-  end
-
-  # set the route for the cjdns network
-  def add_route
-    ::Dust.print_msg 'getting routing information'
-    ret = @node.exec "#{@config['bin_dir']}/cjdroute --getcmds < #{@config['etc_dir']}/cjdroute.conf"
-    return false unless ::Dust.print_result ret[:exit_code]
-
-    ::Dust.print_msg 'applying cjdns routes'
-    ::Dust.print_result @node.exec(ret[:stdout])[:exit_code]
-  end
-
   # kill any cjdroute processes that might be running
   def stop_cjdroute
     ::Dust.print_msg 'stopping cjdroute'

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - kris kechagia
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-12 00:00:00 +01:00
+date: 2012-03-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency