salted-rails 0.0.6 → 0.0.7

data/README.md

@@ -79,6 +79,10 @@ Or for a more complicated example:
         # override default domain
         salted_config.domain = 'mydomain.com'
 
+        # load packages specified in a file (eg generated from your production system)
+        # use `dpkg --get-selections "*" > my_packages-datestamp` to generate the list
+        #salted_config.packages = 'config/my_packages-datestamp'
+
         # Define a machine  dev
         salted_config.define('dev') do |machine_config|
         end
@@ -101,6 +105,9 @@ Or for a more complicated example:
 
           # gui also configures virtualbox for standard rather than headless mode
           machine_config.roles <<= 'gui'
+
+          # Disable the syncing to /vagrant in digital_ocean (useful for development that is independent of local machine)
+          machine_config.sync_vagrant = false
         end
           
         salted_config.configure_vagrant(config)

data/lib/salted-rails/config.rb

@@ -7,29 +7,32 @@ require 'log4r'
 module SaltedRails
   class Config
 
-    attr_accessor :private_key_path
-    attr_accessor :machine
-    attr_accessor :hostname
+    attr_accessor :box
+    attr_accessor :ca_path
+    attr_accessor :copy_from_home
+    attr_accessor :admin_password
+    attr_accessor :web_password
+    attr_accessor :databases
     attr_accessor :domain
-    attr_accessor :rails_root
-    attr_accessor :salt_root
-    attr_accessor :mirror
+    attr_accessor :files
+    attr_accessor :forward_agent
+    attr_accessor :gems
+    attr_accessor :hostname
     attr_accessor :logger
+    attr_accessor :machine
+    attr_accessor :machines
     attr_accessor :memory
+    attr_accessor :mirror
+    attr_accessor :packages
     attr_accessor :ports
-    attr_accessor :disable_vagrant_sync
-    attr_accessor :ca_path
+    attr_accessor :mapped_ports
+    attr_accessor :private_key_path
+    attr_accessor :rails_root
     attr_accessor :region
-    attr_accessor :forward_agent
-    attr_accessor :files
-    attr_accessor :databases
     attr_accessor :roles
-    attr_accessor :gems
-    attr_accessor :ruby_version
-    attr_accessor :java_version
-    attr_accessor :php_version
-    attr_accessor :machines
-    attr_accessor :copy_from_home
+    attr_accessor :salt_root
+    attr_accessor :sync_vagrant
+    attr_accessor :versions
 
     def sanitize_dns_name(name)
       dns_name = name.downcase.gsub(/[^-0-9a-z]+/,'-').sub(/^-+/, '').sub(/-+$/, '')
@@ -45,15 +48,20 @@ module SaltedRails
       # see salt/vagrant/top.sls for other roles
       @roles = %w{ app web db }
       @domain = nil
+      @admin_password = nil
+      @web_password = nil
       @private_key_path = nil
       @mirror = nil
       @memory = nil
       @ports = [ 80, 443, 880, 3000 ]
-      @disable_vagrant_sync = true
+      @mapped_ports = { }
+      @sync_vagrant = nil
+      @box = nil
       @ca_path = nil
       @region = nil
       @forward_agent = true
-      @files = [ '.ruby-version', '.java-version', '.php-version', '.rvmrc', 'config/database.yml', 'Gemfile', 'Gemfile.lock' ].select{ |f| File.exist?(@rails_root + f) }
+      @files = [ '.ruby-version', '.java-version', '.php-version', 'config/database.yml', 'Gemfile', 'Gemfile.lock' ].select{ |f| File.exist?(@rails_root + f) }
+      @packages = nil
       @copy_from_home = [ ]
 
       ENV['REMOTE_MACHINE'] = 'true'
@@ -73,12 +81,12 @@ module SaltedRails
         end
       end
       @databases.each do |key, details|
-        @gems[details['adapter']] = true
+        @gems[details['adapter']] ||= true
       end
 
-      @ruby_version = nil
-      @java_version = nil
-      @php_version = nil
+      @roles << 'mysql' if @gems.include?('mysql') or @gems.include?('mysql2')
+
+      @versions= { }
 
       @machines = [ ]
       @hostname = nil
@@ -89,7 +97,26 @@ module SaltedRails
     end
 
     def normalize
-      unless @memory
+      @versions['mysql'] ||= '5.5' if @roles.include?('mysql')
+      @versions['teamcity'] ||= '8.0.4' if @roles.include?('teamcity')
+      @versions['rubymine'] ||= '5.4.3' if @roles.include?('rubymine')
+      @roles << 'gui' if @roles.include?('rubymine') and not @roles.include?('gui')
+
+      %w{ ruby php java }.each do |lang|
+        version = File.open(@rails_root + ".#{lang}-version", 'r') do |f_in|
+          f_in.gets.gsub(/\s/,'')
+        end rescue nil
+        @versions[lang] ||= version if version
+      end
+      unless @versions.include?('ruby')
+        File.open(@rails_root + '.rvmrc', 'r') do |f_in|
+          while (line = f_in.gets) and not @versions.include('ruby')
+            @versions['ruby'] = $1 if line =~ /^\s*environment_id=['"]([^"'@]+)/
+          end
+        end rescue nil
+      end
+
+      if @memory.nil?
         @memory = 512
         {
                 'gui' => 1536,
@@ -99,7 +126,8 @@ module SaltedRails
           @memory += extra if @roles.include?(role)
         end
       end
-      unless @domain
+
+      if @domain.nil?
         if @hostname
           @domain = @hostname.sub(/^[^.]*\.?/, '')
         else
@@ -107,6 +135,7 @@ module SaltedRails
           @domain = 'railsapp.test' if @domain == '.test'
         end
       end
+
       if @hostname.nil? or @hostname == ''
         if @machine == 'default'
           @hostname = @domain
@@ -119,33 +148,15 @@ module SaltedRails
           end
         end
       end
-      @ruby_version ||= File.open(@rails_root + '.ruby-version', 'r') do |f_in|
-        f_in.gets.gsub(/\s/,'')
-      end rescue nil
-      @ruby_version ||= File.open(@rails_root + '.rvmrc', 'r') do |f_in|
-        while !ruby_version && (line = f_in.gets) 
-          ruby_version = $1 if line =~ /^\s*environment_id=['"]([^"'@]+)/
-        end
-      end rescue nil
-      @ruby_version ||= '1.9.3'
-
-      @java_version ||= File.open(@rails_root + '.java-version', 'r') do |f_in|
-        f_in.gets.gsub(/\s/,'')
-      end rescue nil
-
-      @php_version ||= File.open(@rails_root + '.php-version', 'r') do |f_in|
-        f_in.gets.gsub(/\s/,'')
-      end rescue nil
 
       @private_key_path ||= '~/.ssh/id_rsa'
       @mirror ||= 'auto'
       @salt_root ||= File.dirname(__FILE__) + '/../../'
       @ca_path ||= '/etc/ssl/certs/ca-certificates.crt'
+      @box ||= 'preciseCloud32'
       @ca_path = nil unless File.exist?(@ca_path)
       @region ||= 'San Francisco 1'
 
-      @machines.each {|m| m.normalize}
-
       {
               'teamcity' => 8111,
               'cruisecontrolrb' => 3333
@@ -153,6 +164,9 @@ module SaltedRails
         @ports << port if @roles.include?(role) and not @ports.include?(port)
       end
 
+      @sync_vagrant = true if @sync_vagrant.nil?
+
+      @machines.each {|m| m.normalize}
     end
 
     def define(machine, &block)
@@ -178,21 +192,23 @@ module SaltedRails
 
     def to_hash
       {
+        'admin_password' => @admin_password,
+        'databases' => @databases,
+        'disable_vagrant_sync' => @disable_vagrant_sync,
         'domain' => @domain,
-        'mirror' => @mirror,
-        'machine' => @machine,
+        'files' => @files,
+        'forward_agent' => @forward_agent,
+        'gems' => @gems,
         'hostname' => @hostname,
+        'machine' => @machine,
+        'mapped_ports' => @mapped_ports,
         'memory' => @memory,
-        'disable_vagrant_sync' => @disable_vagrant_sync,
+        'mirror' => @mirror,
+        'ports' => @ports,
         'region' => @region,
-        'forward_agent' => @forward_agent,
-        'files' => @files,
-        'databases' => @databases,
-        'gems' => @gems,
-        'ruby_version' => @ruby_version,
-        'java_version' => @java_version,
-        'php_version' => @php_version,
-        'roles' => @roles
+        'roles' => @roles,
+        'user_password' => @user_password,
+        'versions' => @versions
       }
     end
 

data/lib/salted-rails/helper_base.rb

@@ -59,6 +59,21 @@ module SaltedRails
         end
         FileUtils.cp(@config.rails_root + f, dest)
       end
+      dest = salt_dir + 'packages.txt'
+      if @config.packages
+        src = @config.packages
+        src = @config.rails_root + src unless src =~ /^\//
+        dir = File.dirname(dest)
+        unless File.directory? dir
+          FileUtils.mkdir_p dir
+        end
+        if !File.exist?(dest) or (File.mtime(src) > File.mtime(dest))
+          @config.logger.info "SaltedRails: Copying #{src} to #{dest}"
+          FileUtils.cp(src, dest)
+        end
+      else
+        FileUtils.rm_f dest
+      end
       @config.copy_from_home.each do |f|
         dest = salt_dir + "home/" + f
         dir = File.dirname(dest)

data/lib/salted-rails/vagrant_helper.rb

@@ -35,9 +35,9 @@ module SaltedRails
         end
       end
       # create_empty_custom_files
-      pillarize_application_configuration
-      fix_hostname(vagrant_config)
+      misc_fixes(vagrant_config)
       configure_salt(vagrant_config)
+      pillarize_application_configuration
     end
 
     def configure_ubuntu_mirror(vagrant_config, config = @config)
@@ -53,9 +53,9 @@ module SaltedRails
       vagrant_config.vm.hostname = config.hostname
     end
 
-    def fix_hostname(vagrant_config, config = @config)
+    def misc_fixes(vagrant_config, config = @config)
       vagrant_config.vm.provision "shell" do |s|
-        s.path = config.salt_root + 'salt/bin/fix_hostname.sh'
+        s.path = config.salt_root + 'salt/bin/misc_fixes.sh'
       end
     end
 
@@ -64,7 +64,7 @@ module SaltedRails
         require 'vagrant-vbguest'
         require 'salted-rails/cloud_vbguest_installer'
         vagrant_config.vbguest.installer = SaltedRails::CloudVbguestInstaller
-        vagrant_config.vbguest.auto_update = false
+        #vagrant_config.vbguest.auto_update = false
         config.logger.info 'Configured vbguest installer' 
       rescue LoadError
         config.logger.info 'Skipping vbguest (plugin not available)' 
@@ -73,9 +73,13 @@ module SaltedRails
 
 
     def configure_virtualbox(vagrant_config, config = @config)
-      config.logger.info 'Configuring virtualbox box (UbuntuCloud_12.04_32bit)' 
-      vagrant_config.vm.box = 'UbuntuCloud_12.04_32bit'
-      vagrant_config.vm.box_url = 'http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-vagrant-i386-disk1.box'
+      config.logger.info "Configuring virtualbox box (#{config.box})" 
+      vagrant_config.vm.box = config.box
+      if config.box == 'preciseCloud32'
+        vagrant_config.vm.box_url = 'http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-vagrant-i386-disk1.box'
+      elsif config.box == 'precise32'
+        vagrant_config.vm.box_url = 'http://files.vagrantup.com/precise32.box'
+      end
     end
 
     def configure_digital_ocean(vagrant_config, config = @config)
@@ -87,7 +91,7 @@ module SaltedRails
         provider.image = 'Ubuntu 12.04 x32'
         provider.region = config.region
         provider.ca_path = config.ca_path if config.ca_path
-        override.vm.synced_folder '.', '/vagrant', :disabled => true if config.disable_vagrant_sync
+        override.vm.synced_folder '.', '/vagrant', :disabled => true unless config.sync_vagrant
         if config.private_key_path
           override.ssh.private_key_path = config.private_key_path
           private_key_name = 'Vagrant ' + config.private_key_path.sub(/~\//, '').sub(/\.ssh\//, '').sub(/^id_/, '').gsub(/\W+/, ' ')
@@ -129,8 +133,10 @@ module SaltedRails
     end
 
     def configure_ports(vagrant_config, port_offset=0, config = @config)
+      config.mapped_ports = { }
       config.ports.each do |port|
         host_port = port_offset + port + (port < 3000 ? 3000 : 0)
+        config.mapped_ports[port] = host_port
         vagrant_config.vm.network :forwarded_port, :guest => port, :host => host_port, auto_correct: true
       end
     end

data/lib/salted-rails/version.rb

@@ -1,3 +1,3 @@
 module SaltedRails
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/pillar/capistrano/top.sls

@@ -1,5 +1,5 @@
 base:
   '*':
-    - common
     - railsapp
     - capistrano
+    - common

data/pillar/common.sls

@@ -10,11 +10,4 @@ logs_dir: /var/log/
 
 www_dir: /srv/www/
 
-mysql-version: 5.5
-
-teamcity-version: 8.0.4
-
-rubymine-version: 5.4.3
-
-
-# vim: filetype=sls
+# vim: filetype=sls:

data/pillar/vagrant/top.sls

@@ -1,5 +1,5 @@
 base:
   '*':
-    - common
     - railsapp
     - vagrant
+    - common

data/salt/apt/load_packages.sls

@@ -0,0 +1,5 @@
+load_packages:
+  cmd.run:
+    - name: dpkg --set-selections < /srv/salt/generated/packages.txt && env DEBIAN_FRONTEND=noninteractive apt-get -y -u dselect-upgrade
+    - onlyif: test -s /srv/salt/generated/packages.txt
+

data/salt/apt/update_packages.sls

@@ -0,0 +1,5 @@
+load_packages:
+  cmd.run:
+    - name: dpkg --set-selections < /srv/salt/generated/packages.txt && apt-get -u dselect-upgrade
+    - /srv/salt/generated/packages.txt
+

data/salt/bin/change_mirror.sh

@@ -7,23 +7,27 @@ case "$1" in
     exec echo "usage: $0 country|mirror|auto|internode|url"
     ;;
 esac
-if grep 'http://archive.ubuntu.com/ubuntu' /etc/apt/sources.list > /dev/null; then
+if grep 'http://[a-z.]*archive.ubuntu.com/ubuntu' /etc/apt/sources.list > /dev/null; then
   case "$1" in
   [a-z][a-z]|usa)
       echo "Configuring mirror for region: $1"
-      exec sed -i.original -e 's#http://[archivesecurity]*.ubuntu.com/ubuntu#http://'"$1"'.archive.ubuntu.com/ubuntu/#' /etc/apt/sources.list
+      exec sed -i.original -e 's#http://[a-z.]*[archivesecurity]*.ubuntu.com/ubuntu#http://'"$1"'.archive.ubuntu.com/ubuntu/#' /etc/apt/sources.list
       ;;
   mirror|auto)
       echo "Configuring automatic selection of mirror"
-      exec sed -i.original -e 's#http://[archivesecurity]*.ubuntu.com/ubuntu#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list
+      exec sed -i.original -e 's#http://[a-z.]*[archivesecurity]*.ubuntu.com/ubuntu#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list
+      ;;
+  sfo1)
+      echo "Configuring mirror for DIGITAL OCEAN: $1"
+      exec sed -i.original -e 's#http://[a-z.]*[archivesecurity]*.ubuntu.com/ubuntu#http://mirrors.sfo1.digitalocean.com/ubuntu/#' /etc/apt/sources.list
       ;;
   internode)
       echo "Configuring mirror for ISP: $1"
-      exec sed -i.original -e 's#http://[archivesecurity]*.ubuntu.com/ubuntu#http://mirror.internode.on.net/pub/ubuntu/ubuntu/#' /etc/apt/sources.list
+      exec sed -i.original -e 's#http://[a-z.]*[archivesecurity]*.ubuntu.com/ubuntu#http://mirror.internode.on.net/pub/ubuntu/ubuntu/#' /etc/apt/sources.list
       ;;
   [hmf]*://*ubuntu*)
       echo "Configuring mirror for $1"
-      exec sed -i.original -e 's#http://[archivesecurity]*.ubuntu.com/ubuntu#'"$1"'#' /etc/apt/sources.list
+      exec sed -i.original -e 's#http://[a-z.]*[archivesecurity]*.ubuntu.com/ubuntu#'"$1"'#' /etc/apt/sources.list
       ;;
   *)
       echo "Invalid mirror ($1) ignored!" >&2
@@ -31,6 +35,6 @@ if grep 'http://archive.ubuntu.com/ubuntu' /etc/apt/sources.list > /dev/null; th
       ;;
   esac
 else
-  echo "/etc/apt/sources.list has already been changed (leaving as is)"
+  echo "/etc/apt/sources.list has already been changed to non ubuntu.com mirror (leaving as is)"
 fi
 exit 0

data/salt/bin/misc_fixes.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+#
+
+old=`cat /etc/hostname`
+case "$old" in
+*.*)
+  echo "Removing domain from /etc/hostname (was $old)"
+  sed -i "s@\..*\$@@" /etc/hostname
+  hostname -F /etc/hostname
+  new=`cat /etc/hostname`
+  echo "(now $new)"
+  if [ -z "`grep "$old" /etc/hosts`" ]; then
+    echo "Adding '127.0.1.1         $old $new' entry to /etc/hosts"
+    echo "127.0.1.1         $old $new" >> /etc/hosts
+  fi
+  ;;
+esac
+
+for f in bootstrap-salt.log bootstrap_salt.sh
+do
+  rm -f /tmp/$f.old
+  if [ -f /tmp/$f ]; then
+    echo Renaming /tmp/$f as /tmp/$f.old
+    mv /tmp/$f /tmp/$f.old
+  fi
+done

data/salt/bin/provision

@@ -1,8 +1,14 @@
 #!/bin/bash
 
+no_check=false
 case "$1" in
-run)
-	shift
+--no-check)
+        no_check=true
+        shift
+        ;;
+esac
+runit()
+{
 	case "$#" in
 	0)
 		echo "Running all states ..."
@@ -16,6 +22,33 @@ run)
 		done
 		;;
 	esac
+}
+case "$1" in
+run)
+	shift
+        if $no_check; then
+                # Color is used when there is no checking (piped output)
+                runit "$@"
+                exit
+        fi
+        runit "$@" 2>&1 | tee /tmp/t$$
+        echo
+        echo Checking results log:
+        ret=
+        if egrep '^\[ERROR *\]' /tmp/t$$; then
+                echo ERROR: `egrep '^\[ERROR *\]' /tmp/t$$ | wc -l` ERRORS FOUND IN LOG
+                ret=1
+        fi
+        if egrep '^ *Result: *False' /tmp/t$$ > /dev/null; then
+                echo 'WARNING (' `egrep '^ *Result: *False' /tmp/t$$ | wc -l` 'Results where False in log)'
+                ret=${ret:-2}
+        fi
+        if [ -z "$ret" ] ; then
+                echo SUCCESS
+        fi
+        rm -f /tmp/t$$
+        exit $ret
+
 	;;
 grains)
 	sudo salt-call grains.items
@@ -26,11 +59,15 @@ pillar)
 packages)
 	dpkg --get-selections | sed -n 's/\s\s*install//p'
 	;;
+search)
+        aptitude search "$@"
+        #apt-cache search "$@"
+        ;;
 install|remove|purge|update|upgrade|clean|autoremove)
 	sudo apt-get "$@"
 	;;
 *)
-	echo "usage: $0 grains|pillar|run [state]|packages|install package|remove package|purge package|autoclean|autoremove\n"
+	echo "usage: $0 grains|pillar|run [state]|packages|search|install package|remove package|purge package|autoclean|autoremove\n"
 	;;
 esac