rubber 1.2.1 → 1.3.0

data/generators/vulcanize/templates/mysql/config/rubber/role/db/apparmor-mysql.conf

@@ -0,0 +1,46 @@
+<%
+  @path = '/etc/apparmor.d/usr.sbin.mysqld'
+  @post = "/etc/init.d/apparmor restart"
+  @backup = false
+%>
+
+#include <tunables/global>
+
+/usr/sbin/mysqld {
+  #include <abstractions/base>
+  #include <abstractions/nameservice>
+  #include <abstractions/user-tmp>
+  #include <abstractions/mysql>
+  #include <abstractions/winbind>
+
+  capability dac_override,
+  capability sys_resource,
+  capability setgid,
+  capability setuid,
+
+  network tcp,
+
+  /etc/hosts.allow r,
+  /etc/hosts.deny r,
+
+  /etc/mysql/*.pem r,
+  /etc/mysql/conf.d/ r,
+  /etc/mysql/conf.d/* r,
+  /etc/mysql/my.cnf r,
+  /usr/sbin/mysqld mr,
+  /usr/share/mysql/** r,
+  /var/log/mysql.log rw,
+  /var/log/mysql.err rw,
+  /var/lib/mysql/ r,
+  /var/lib/mysql/** rwk,
+  /var/log/mysql/ r,
+  /var/log/mysql/* rw,
+  /var/run/mysqld/mysqld.pid w,
+  /var/run/mysqld/mysqld.sock w,
+
+  /sys/devices/system/cpu/ r,
+  /sys/devices/system/cpu/** r,
+
+  <%= rubber_env.db_root_dir %>/ r,
+  <%= rubber_env.db_root_dir %>/** rwk,
+}

data/generators/vulcanize/templates/mysql/config/rubber/role/db/my.cnf

@@ -102,12 +102,8 @@ expire_logs_days  = 10
 max_binlog_size         = 100M
 #binlog_do_db   = include_database_name
 #binlog_ignore_db = include_database_name
-#
-# * BerkeleyDB
-#
-# Using BerkeleyDB is now discouraged as its support will cease in 5.1.12.
-skip-bdb
-#
+
+
 # * InnoDB
 #
 # InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.

data/generators/vulcanize/templates/mysql/config/rubber/rubber-mysql.yml

@@ -31,7 +31,7 @@ role_dependencies:
   db:primary=true: [mysql_master]
   db: [mysql_slave]
 
-packages: [mysql-client, libmysql-ruby]
+packages: [mysql-client, libmysqlclient15-dev, libmysql-ruby]
 gems: [mysql]
 
 roles:

data/generators/vulcanize/templates/nginx/config/rubber/deploy-nginx.rb

@@ -9,10 +9,10 @@ namespace :rubber do
     # rubber auto-roles don't get defined till after all tasks are defined
     on :load do
       rubber.serial_task self, :serial_restart, :roles => :nginx do
-        run "/etc/init.d/nginx restart"
+        sudo "/etc/init.d/nginx restart"
       end
       rubber.serial_task self, :serial_reload, :roles => :nginx do
-        run "if ! ps ax | grep -v grep | grep -c nginx &> /dev/null; then /etc/init.d/nginx start; else /etc/init.d/nginx reload; fi"
+        sudo "sh -c 'if ! ps ax | grep -v grep | grep -c nginx &> /dev/null; then /etc/init.d/nginx start; else /etc/init.d/nginx reload; fi'"
       end
     end
     
@@ -22,12 +22,12 @@ namespace :rubber do
     
     desc "Stops the nginx web server"
     task :stop, :roles => :nginx, :on_error => :continue do
-      run "/etc/init.d/nginx stop"
+      sudo "/etc/init.d/nginx stop"
     end
     
     desc "Starts the nginx web server"
     task :start, :roles => :nginx do
-      run "/etc/init.d/nginx start"
+      sudo "/etc/init.d/nginx start"
     end
     
     desc "Restarts the nginx web server"

data/generators/vulcanize/templates/passenger/config/rubber/deploy-passenger.rb

@@ -18,7 +18,7 @@ namespace :rubber do
     after "rubber:setup_app_permissions", "rubber:passenger:setup_passenger_permissions"
 
     task :setup_passenger_permissions, :roles => :passenger do
-      run "chown #{rubber_env.app_user}:#{rubber_env.app_user} #{current_path}/config/environment.rb"
+      sudo "chown #{rubber_env.app_user}:#{rubber_env.app_user} #{current_path}/config/environment.rb"
     end
 
     # passenger depends on apache for start/stop/restart, just need these defined

data/generators/vulcanize/templates/passenger/config/rubber/rubber-passenger.yml

@@ -1,4 +1,4 @@
-passenger_version: 2.2.10
+passenger_version: 2.2.11
 passenger_root: "#{ruby_prefix}/lib/ruby/gems/1.8/gems/passenger-#{passenger_version}"
 passenger_ruby: "#{ruby_prefix}/bin/ruby"
 passenger_lib: "#{passenger_root}/ext/apache2/mod_passenger.so"

data/generators/vulcanize/templates/redis/config/rubber/deploy-redis.rb

@@ -8,27 +8,27 @@ namespace :rubber do
     after "rubber:install_packages", "rubber:redis:custom_install"
 
     task :custom_install, :roles => :redis do
-      custom_package('http://ftp.us.debian.org/debian/pool/main/r/redis/', 'redis-server', '1.2.2-1', '! -x /usr/bin/redis-server')
+      custom_package('http://ftp.us.debian.org/debian/pool/main/r/redis/', 'redis-server', '1.2.5-1', '! -x /usr/bin/redis-server')
     end
 
     desc "Stops the redis server"
     task :stop, :roles => :redis, :on_error => :continue do
-      run "/etc/init.d/redis-server stop"
+      sudo "/etc/init.d/redis-server stop"
     end
 
     desc "Starts the redis server"
     task :start, :roles => :redis do
-      run "/etc/init.d/redis-server start"
+      sudo "/etc/init.d/redis-server start"
     end
 
     desc "Restarts the redis server"
     task :restart, :roles => :redis do
-      run "/etc/init.d/redis-server restart"
+      sudo "/etc/init.d/redis-server restart"
     end
 
     desc "Reloads the redis server"
     task :reload, :roles => :redis do
-      run "/etc/init.d/redis-server restart"
+      sudo "/etc/init.d/redis-server restart"
     end
 
   end

data/generators/vulcanize/templates/resque/config/rubber/deploy-resque.rb

@@ -32,7 +32,7 @@ namespace :rubber do
     after "rubber:setup_app_permissions", "rubber:resque:setup_resque_permissions"
 
     task :setup_resque_permissions, :roles => :resque do
-      run "chown -R #{rubber_env.app_user}:#{rubber_env.app_user} #{rubber_env.resque_web_dir}/config.ru"
+      sudo "chown -R #{rubber_env.app_user}:#{rubber_env.app_user} #{rubber_env.resque_web_dir}/config.ru"
     end
     
   end

data/generators/vulcanize/templates/sphinx/config/rubber/deploy-sphinx.rb

@@ -18,7 +18,7 @@ namespace :rubber do
     task :custom_install, :roles => :sphinx do
       # install sphinx from source
       ver = "0.9.8.1"
-      rubber.run_script 'install_sphinx', <<-ENDSCRIPT
+      rubber.sudo_script 'install_sphinx', <<-ENDSCRIPT
         # check if already installed
         if [ -x /usr/local/bin/searchd ]
           then echo 'Found sphinx searchd on system'
@@ -60,19 +60,20 @@ namespace :rubber do
     desc "Do sphinx setup tasks"
     task :setup, :roles => :sphinx do
       # Setup links to sphinx config/index as they need to persist between deploys
-      run "mkdir -p #{sphinx_root} #{sphinx_root}/config #{sphinx_root}/db"
-      run "chown -R #{runner}:#{runner} #{sphinx_root}"
+      sudo "mkdir -p #{sphinx_root} #{sphinx_root}/config #{sphinx_root}/db"
+      sudo "chown -R #{runner}:#{runner} #{sphinx_root}"
     end
 
     desc "Setup paths for sphinx runtime"
     task :config_dir, :roles => :sphinx do
-      run "rm -rf #{current_path}/sphinx && ln -sf #{sphinx_root} #{current_path}/sphinx"
+      sudo "rm -rf #{current_path}/sphinx"
+      sudo "ln -sf #{sphinx_root} #{current_path}/sphinx"
     end
 
     # runs the given ultrasphinx rake tasks
     def run_sphinx task
-      cmd = "cd #{current_path} && sudo -u #{runner} RAILS_ENV=#{RUBBER_ENV} rake #{task}"
-      run cmd
+      cmd = "sh -c 'cd #{current_path} && sudo -u #{runner} RAILS_ENV=#{RUBBER_ENV} rake #{task}'"
+      sudo cmd
     end
 
 

data/lib/rubber/dns/zerigo.rb

@@ -1,170 +1,105 @@
 require 'rubygems'
-require 'httparty'
+require 'zerigo_dns'
 
 module Rubber
   module Dns
 
+    class Zerigo < Base
 
-    class Zone
-      include HTTParty
-      format :xml
-
-      @@zones = {}
-      def self.get_zone(domain, provider_env)
-       @@zones[domain] ||= Zone.new(provider_env.customer_id, provider_env.email, provider_env.token, domain)
-      end
+      def initialize(env)
+        super(env, "zerigo")
 
-      def initialize(customer_id, email, token, domain)
-        self.class.basic_auth email, token
-        self.class.base_uri "https://ns.zerigo.com/accounts/#{customer_id}"
-        @domain = domain
-        refresh()
+        ::Zerigo::DNS::Base.user = provider_env.email
+        ::Zerigo::DNS::Base.password = provider_env.token
       end
 
-      def check_status(response)
-        code = response.code
-        if code < 200 || code > 299
-          msg = "Failed to access zerigo api (http_status=#{code})"
-          msg += ", check dns_providers.zerigo.customer_id/email/token in rubber.yml" if code == 401
-          raise msg
-        end
-        return response
+      def host_to_opts(host)
+        opts = {}
+        opts[:id] = host.id
+        opts[:host] = host.hostname || ''
+        opts[:type] = host.host_type
+        opts[:data] = host.data if host.data
+        opts[:ttl] = host.ttl if host.ttl
+        opts[:priority] = host.priority if host.priority
+        return opts
       end
 
-      def create_host(opts)
-        host = opts_to_host(opts, new_host())
-        check_status self.class.post("/zones/#{@zone['id']}/hosts.xml", :body => {:host => host})
+      def opts_to_host(opts, host={})
+        host['hostname'] = opts[:host]
+        host['host_type'] =  opts[:type]
+        host['data'] = opts[:data] if opts[:data]
+        host['ttl'] = opts[:ttl] if opts[:ttl]
+        host['priority'] = opts[:priority] if opts[:priority]
+        return host
       end
 
-      def find_host_records(opts={})
+      def find_hosts(opts = {})
+        opts = setup_opts(opts, [:host, :domain])
         result = []
+        zone = ::Zerigo::DNS::Zone.find_or_create(opts[:domain])
+        params = { :zone_id => zone.id }
+
         hn = opts[:host]
         ht = opts[:type]
         hd = opts[:data]
         has_host = hn && hn != '*'
-
-        url = "/zones/#{@zone['id']}/hosts.xml"
         if has_host
-          url << "?fqdn="
+          url = ""
           url << "#{hn}." if hn.strip.size > 0
-          url << "#{@domain}"
+          url << "#{opts[:domain]}"
+          params[:fqdn] = url
         end
-        hosts = self.class.get(url)
-
-        # returns 404 on not found, so don't check status
-        hosts = check_status hosts unless has_host
-
-        hosts['hosts'].each do |h|
-          keep = true
-          if ht && h['host_type'] != ht && ht != '*'
-            keep = false
-          end
-          if hd && h['data'] != hd
-            keep = false
-          end
-          result << host_to_opts(h) if keep
-        end if hosts['hosts']
-
-        return result
-      end
-
-      def update_host(host_id, opts)
-        host = opts_to_host(opts, new_host())
-        check_status self.class.put("/zones/#{@zone['id']}/hosts/#{host_id}.xml", :body => {:host => host})
-      end
 
-      def delete_host(host_id)
-        check_status self.class.delete("/zones/#{@zone['id']}/hosts/#{host_id}.xml")
-      end
-
-      def refresh
-        zone_id = @zone['id'] rescue nil
-        if zone_id
-          @zone = check_status self.class.get("/zones/#{zone_id}.xml")
-        else
-          zones = check_status self.class.get('/zones.xml')
-          @zone = zones["zones"].find {|z| z["domain"] == @domain }
+        begin
+          hosts = ::Zerigo::DNS::Host.find(:all, :params=> params)
+
+          hosts.each do |h|
+            keep = true
+            if ht && h.host_type != ht && ht != '*'
+              keep = false
+            end
+            if hd && h.data != hd
+              keep = false
+            end
+            result << h if keep
+          end if hosts
+        rescue ActiveResource::ResourceNotFound => e
         end
-        if ! @zone
-          zone = new_zone()
-          zone['domain'] = @domain
-          zones = check_status self.class.post('/zones.xml', :body => {:zone => zone})
-          @zone = zones['zone']
-        end
-      end
 
-      def zone_record
-        return @zone
-      end
-
-      private
-
-      def new_host
-        check_status(self.class.get("/zones/#{@zone['id']}/hosts/new.xml"))['host']
-      end
-
-      def new_zone
-        check_status(self.class.get("/zones/new.xml"))['zone']
-      end
-
-      def opts_to_host(opts, host={})
-        host['hostname'] = opts[:host]
-        host['host_type'] =  opts[:type]
-        host['data'] = opts[:data] if opts[:data]
-        host['ttl'] = opts[:ttl] if opts[:ttl]
-        host['priority'] = opts[:priority] if opts[:priority]
-        return host
-      end
-
-      def host_to_opts(host)
-        opts = {}
-        opts[:id] = host['id'] 
-        opts[:domain] = @domain
-        opts[:host] = host['hostname'] || ''
-        opts[:type] = host['host_type']
-        opts[:data] = host['data'] if host['data']
-        opts[:ttl] = host['ttl'] if host['ttl']
-        opts[:priority] = host['priority'] if host['priority']
-        return opts
-      end
-    end
-    
-    class Zerigo < Base
-
-      def initialize(env)
-        super(env, "zerigo")
+        return result
       end
 
       def find_host_records(opts = {})
-        opts = setup_opts(opts, [:host, :domain])
-        zone = Zone.get_zone(opts[:domain], provider_env)
-
-        zone.find_host_records(opts)
+        hosts = find_hosts(opts)
+        result = hosts.collect {|h| host_to_opts(h).merge(:domain => opts[:domain]) }
+        return result
       end
 
       def create_host_record(opts = {})
         opts = setup_opts(opts, [:host, :data, :domain, :type, :ttl])
-        zone = Zone.get_zone(opts[:domain], provider_env)
-
-        zone.create_host(opts)
+        zone = ::Zerigo::DNS::Zone.find_or_create(opts[:domain])
+        ::Zerigo::DNS::Host.create(opts_to_host(opts).merge(:zone_id => zone.id))
       end
 
       def destroy_host_record(opts = {})
         opts = setup_opts(opts, [:host, :domain])
-        zone = Zone.get_zone(opts[:domain], provider_env)
+        zone = ::Zerigo::DNS::Zone.find_or_create(opts[:domain])
 
-        find_host_records(opts).each do |h|
-          zone.delete_host(h[:id])
+        find_hosts(opts).each do |h|
+          h.destroy || raise("Failed to destroy #{h.hostname}")
         end
       end
 
       def update_host_record(old_opts={}, new_opts={})
         old_opts = setup_opts(old_opts, [:host, :domain])
         new_opts = setup_opts(new_opts.merge(:no_defaults =>true), [])
-        zone = Zone.get_zone(old_opts[:domain], provider_env)
+        zone = ::Zerigo::DNS::Zone.find_or_create(old_opts[:domain])
 
-        find_host_records(old_opts).each do |h|
-          zone.update_host(h[:id], h.merge(new_opts))
+        find_hosts(old_opts).each do |h|
+          opts_to_host(new_opts).each do |k, v|
+            h.send("#{k}=", v)
+          end
+          h.save || raise("Failed to update host #{h.hostname}")
         end
       end
 

data/lib/rubber/environment.rb

@@ -145,14 +145,14 @@ module Rubber
           global = global.clone()
           role_overrides = global.delete("roles") || {}
           host_overrides = global.delete("hosts") || {}
-          roles.to_a.each do |role|
-            role_overrides[role].each do |k, v|
+          Array(roles).each do |role|
+            Array(role_overrides[role]).each do |k, v|
               global[k] = Environment.combine(global[k], v)
-            end if role_overrides[role]
+            end
           end
-          host_overrides[host].each do |k, v|
+          Array(host_overrides[host]).each do |k, v|
             global[k] = Environment.combine(global[k], v)
-          end if host_overrides[host]
+          end
           return global
         end
         

data/lib/rubber/generator.rb

@@ -113,7 +113,7 @@ module Rubber
           FileUtils.mkdir_p(File.dirname(config_path)) if config_path
 
           # Write a backup of original
-          open("#{config_path}.bak", 'w') { |f| f.write(orig) } if config_path
+          open("#{config_path}.bak", 'w') { |f| f.write(orig) } if config_path && config.backup
 
           # Write out transformed file
           writer = config_path || "|#{config.write_cmd}"
@@ -130,21 +130,23 @@ module Rubber
 
           # Run post transform command if needed
           if config.post
-            if orig == result
-              LOGGER.info("Nothing to do, not running post command")
+            if fake_root
+              LOGGER.info("Not running post command as a fake root was given: #{config.post}")
             elsif no_post
               LOGGER.info("Not running post command as no post specified")
-            elsif fake_root
-              LOGGER.info("Not running post command as a fake root was given: #{config.post}")
             else
-              # this lets us abort a script if a command in the middle of it errors out
-              # stop_on_error_cmd = "function error_exit { exit 99; }; trap error_exit ERR"
-              config.post = "#{stop_on_error_cmd}\n#{config.post}" if stop_on_error_cmd
-
-              LOGGER.info{"Transformation executing post config command: #{config.post}"}
-              LOGGER.info `#{config.post}`
-              if $?.exitstatus != 0
-                raise "Post command failed execution:  #{config.post}"
+              if orig != result || force
+                # this lets us abort a script if a command in the middle of it errors out
+                # stop_on_error_cmd = "function error_exit { exit 99; }; trap error_exit ERR"
+                config.post = "#{stop_on_error_cmd}\n#{config.post}" if stop_on_error_cmd
+
+                LOGGER.info{"Transformation executing post config command: #{config.post}"}
+                LOGGER.info `#{config.post}`
+                if $?.exitstatus != 0
+                  raise "Post command failed execution:  #{config.post}"
+                end
+              else
+                LOGGER.info("Nothing to do, not running post command")
               end
             end
           end
@@ -174,22 +176,28 @@ module Rubber
       attr_accessor :additive
       # Lets one dynamically determine if a given file gets skipped during transformation
       attr_accessor :skip
+      # Backup file when transforming, defaults to true, set to false to prevent backup
+      attr_accessor :backup
       # use sudo to write the output file
       # attr_accessor :sudo
       # options passed in through code
       attr_accessor :options
 
+      def initialize
+        @backup = true
+      end
+      
       def get_binding
         binding
-    end
+      end
     
-    def rubber_env()
-      Rubber::Configuration.rubber_env
-    end
-  
-    def rubber_instances()
-      Rubber::Configuration.rubber_instances
-    end
+      def rubber_env()
+        Rubber::Configuration.rubber_env
+      end
+
+      def rubber_instances()
+        Rubber::Configuration.rubber_instances
+      end
 
     end