dust-deploy 0.12.0 → 0.12.1

data/README.md

@@ -59,7 +59,14 @@ you can then save the file, and tell dust to get to work:
      - checking if rsync is installed [ ok ]
 
 you should see dust connecting to the node, checking if the requested packages are installed, and if not, install them.
-dust works with aptitude, yum and emerge systems at the moment (testet with ubuntu, debian, gentoo, scientificlinux, centos).
+
+## supported distributions
+
+dust works with **aptitude**, **yum**, **emerge**, **pacman** (since 0.10.3) and **opkg** (since 0.12.0) systems at the moment (testet with recent versions of **ubuntu**, **debian**, **gentoo**, **fedora**, **scientificlinux**, **centos** and **archlinux** as well as **openwrt**). should work on rhel without any problem, too.
+
+
+## contribute
+
 feel free to contribute to dust, so that your system is also supported. contribution is easy! just send me a github pull request. You can find the repository here: https://github.com/kechagia/dust-deploy
 
 

data/changelog.md

@@ -1,6 +1,23 @@
 Changelog
 =============
 
+0.12.1
+------------
+
+-  introduces limits recipe, to maintain /etc/security/limits.d/*
+
+    recipes:
+      limits:
+        nginx:
+          - { domain: www-data, type: soft, item: nofile, value: 200000 }
+          - { domain: www-data, type: hard, item: nofile, value: 700000 } 
+
+-  nginx recipe now supports erb templates for nginx.conf as well
+-  removes cjdroute public peers, since they are not supported anymore.
+   you should find some friends on irc (efnet #cjdns)
+-  modifies cjdroute recipe, to work with new ./do building setup
+
+
 0.12.0
 ------------
 

data/lib/dust/helper.rb

@@ -2,7 +2,7 @@ class Object
   # turns an object into an array
   # this is needed, since 1.9 doesnt support "string".to_a and "string".each anymore
   def to_array
-    return [ self ] unless self.is_a? Enumerable
+    return [ self ] unless self.is_a? Array
     return self
   end
 end

data/lib/dust/recipes/cjdroute.rb

@@ -15,7 +15,6 @@ class Cjdroute< Recipe
     return unless @node.mkdir "#{@config['build_dir']}/build"
 
     # compiling action
-    return unless run_cmake
     return unless run_make
 
     stop_cjdroute
@@ -44,50 +43,6 @@ 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',
-        'trust' => 5000,
-        'authType' => 1
-      },
-
-      '96.126.112.124:10000' => {
-        'password' => 'null',
-        'publicKey' => '7zy1gb9bw4xp82kjvh66w01jdgh6y3lk7cfnl0pgb0xnn26b2jn0.k',
-        'trust' => 5000,
-        'authType' => 1
-      },
-
-      # rainfly x
-      '76.105.229.241:13982' => {
-        'password' => 'general_public_1985',
-        'publicKey' => '7pu8nlqphgd1bux9sdpjg0c104217r3b3m1bvmdtbn7uwcj5cky0.k',
-        'trust' => 5000,
-        'authType' => 1
-      },
-
-      # grey
-      '199.180.252.227:19081' => {
-        'password' => 'public_7h4yTNEnRSEUvfFLtsM3',
-        'publicKey' => 'z5htnv9jsj85b64cf61lbnl3dmqk5lpv3vxtz9g1jqlvb3b30b90.k',
-        'trust' => 5000,
-        'authType' => 1
-      },
-
-      #  ds500ss 
-      '87.208.234.24:28078' => {
-        'password' => 'freedomnetsrai9yah4Kic5Kojah5que4xoCh',
-        'publicKey' => 'qb426vh42usw995jy60ll6rtslguv1ylpvwp44ymzky6f0u5qvq0.k',
-        'trust' => 5000,
-        'authType' => 1
-      }
-    }
-  end
-
   # installs cmake, git and other building tools needed
   def install_dependencies
     ::Dust.print_msg "installing build dependencies\n"
@@ -125,6 +80,10 @@ class Cjdroute< Recipe
       end
 
       # git pull latest changes
+      ::Dust.print_msg "checking out branch '#{@config['git_branch']}'"
+      ret = @node.exec("cd #{@config['build_dir']}; git checkout #{@config['git_branch']}")[:exit_code]
+      return unless Dust.print_result(ret)
+
       ::Dust.print_msg "pulling latest changes from repository\n"
       ret = @node.exec "cd #{@config['build_dir']}; git pull", :live => true
       return ::Dust.print_failed 'error pulling from git repository' unless ret[:exit_code] == 0
@@ -158,17 +117,9 @@ class Cjdroute< Recipe
     true
   end
 
-
-  def run_cmake
-    ::Dust.print_msg "running cmake\n"
-    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 "export Log_LEVEL=#{@config['loglevel']}; cd #{@config['build_dir']}/build; make", :live => true
+    ret = @node.exec "export Log_LEVEL=#{@config['loglevel']}; cd #{@config['build_dir']}; ./do", :live => true
     return ::Dust.print_failed 'error compiling cjdroute' unless ret[:exit_code] == 0
     true
   end
@@ -187,11 +138,6 @@ class Cjdroute< Recipe
     # parse generated json
     cjdroute_conf = JSON.parse ret[:stdout]
 
-    # add some public peers, so we can get started directly
-    ::Dust.print_msg 'adding public peers', :indent => 2
-    cjdroute_conf['interfaces']['UDPInterface']['connectTo'] = public_peers
-    ::Dust.print_ok
-
     # exchange tun0 with configured tun device
     cjdroute_conf['router']['interface']['tunDevice'] = @config['tun']
 

data/lib/dust/recipes/limits.rb

@@ -0,0 +1,55 @@
+class Limits < Recipe
+
+  desc 'limit:deploy', 'maintains /etc/security/limits.d'
+  def deploy
+    # valid values
+    types = [ 'hard', 'soft' ]
+    items = [ 'core', 'data', 'fsize', 'memlock', 'nofile', 'rss', 'stack', 'cpu',
+              'nproc', 'as', 'maxlogins', 'maxsyslogins', 'priority', 'locks',
+              'sigpending', 'msgqueue', 'nice', 'rtprio', 'chroot' ]
+
+    unless @node.dir_exists? '/etc/security/limits.d'
+      return ::Dust.print_failed 'your system does not support /etc/security/limits.d'
+    end
+    puts
+
+    @config.each do |name, rules|
+      limits_conf = ''
+      ::Dust.print_msg "assembling system limits according to rule '#{name}'\n"
+      rules.to_array.each do |rule|
+
+        # check if entry is valid
+        unless rule['domain']
+          ::Dust.print_failed "domain cannot be empty, skipping", :indent => 2
+          next
+        end
+
+        unless rule['value']
+          ::Dust.print_failed "value cannot be empty, skipping", :indent => 2
+          next
+        end
+
+        unless items.include? rule['item']
+          ::Dust.print_failed "'#{rule['item']}' is not a valid item, skipping. valid items: #{items.join(',')}", :indent => 2
+          next
+        end
+
+        unless types.include? rule['type']
+          ::Dust.print_failed "'#{rule['type']}' is not a valid type, skipping. valid types: #{types.join(',')}", :indent => 2
+          next
+        end
+
+        # assemble rule
+        line = "#{rule['domain']}\t#{rule['type']}\t#{rule['item']}\t#{rule['value']}\n"
+        ::Dust.print_ok "adding '#{line.chomp}'", :indent => 2
+        limits_conf << line
+      end
+
+      # deploy rule file
+      ::Dust.print_msg "deploying limits to /etc/security/limits.d/#{name}"
+      ::Dust.print_result @node.write("/etc/security/limits.d/#{name}", limits_conf, :quiet => true)
+      puts
+    end
+  end
+
+end

data/lib/dust/recipes/nginx.rb

@@ -4,7 +4,7 @@ class Nginx < Recipe
     # abort if nginx cannot be installed
     return unless @node.install_package 'nginx'
 
-    @node.scp "#{@template_path}/nginx.conf", '/etc/nginx/nginx.conf'
+    @node.deploy_file "#{@template_path}/nginx.conf", '/etc/nginx/nginx.conf'
 
     # remove old sites that may be present
     ::Dust.print_msg 'deleting old sites in /etc/nginx/sites-*'

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dust-deploy
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000 Z
+date: 2012-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -175,9 +175,9 @@ files:
 - lib/dust/recipes/etc_hosts.rb
 - lib/dust/recipes/hash_check.rb
 - lib/dust/recipes/iptables.rb
+- lib/dust/recipes/limits.rb
 - lib/dust/recipes/locale.rb
 - lib/dust/recipes/logrotate.rb
-- lib/dust/recipes/memory_limit.rb
 - lib/dust/recipes/motd.rb
 - lib/dust/recipes/mysql.rb
 - lib/dust/recipes/newrelic.rb

data/lib/dust/recipes/memory_limit.rb

@@ -1,21 +0,0 @@
-class MemoryLimit < Recipe
-
-  desc 'memory_limit:deploy', 'sets up system wide memory limit per process'
-  def deploy
-    @node.collect_facts
-
-    # get system memory (in kb)
-    system_mem = ::Dust.convert_size @node['memorysize']
-
-    # don't allow a process to use more than 90% of the system memory
-    max_mem = (system_mem * 0.9).to_i
-
-    # if the remaining 10% are more than 512mb, use system_mem - 512mb as max instead
-    threshold = ::Dust.convert_size '512 MB'
-    max_mem = system_mem - threshold if max_mem > threshold
-
-    ::Dust.print_msg "setting max memory for a process to #{max_mem} kb"
-    @node.write '/etc/security/limits.d/00-memory-limit', "*          hard    as        #{max_mem}", :quiet => true
-    ::Dust.print_ok
-  end
-end