le1t0-deprec 2.1.6.007 → 2.1.6.008

data/CHANGELOG

@@ -1,5 +1,9 @@
 # deprec changelog
 
+= 2.1.6.008 (Jun 10, 2010)
+
+* Fixed use of some variable names in various recipes relating to alternatives registration
+
 = 2.1.6.007 (Jun 10, 2010)
 
 * some adjustments to nagios recipe

data/bin/depify

@@ -47,10 +47,12 @@ files = {
     # your SCM below:
     set :scm, :git
    
-    set :ruby_vm_type,      :ree        # :ree, :mri
-    set :web_server_type,   :apache     # :apache, :nginx
-    set :app_server_type,   :passenger  # :passenger, :mongrel
-    set :db_server_type,    :mysql      # :mysql, :postgresql, :sqlite
+    set :ruby_choice,        :ree             # :ree, :mri
+    set :web_choice,         :apache          # :apache, :nginx
+    set :app_choice,         :passenger       # :passenger, :mongrel
+    set :db_choice,          :mysql           # :mysql, :postgresql, :sqlite
+    set :sphinx_choice,      :thinking_sphinx
+    set :imagemagick_choice, :imagemagick_src
     
     # set :packages_for_project, %w(libmagick9-dev imagemagick libfreeimage3) # list of packages to be installed
     # set :gems_for_project, %w(rmagick mini_magick image_science) # list of gems to be installed

data/lib/deprec/recipes/app/mongrel.rb

@@ -104,7 +104,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :config_project, :roles => :app do
         deprec2.push_configs(:mongrel, PROJECT_CONFIG_FILES[:mongrel])
         symlink_mongrel_cluster
-        send("symlink_#{web_server_type}_vhost")
+        send("symlink_#{web_choice}_vhost")
         symlink_monit_config
         symlink_logrotate_config
         activate_project
@@ -171,7 +171,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :activate_project, :roles => :app do
         symlink_mongrel_cluster
         symlink_monit_config
-        if web_server_type.to_s == 'apache'
+        if web_choice.to_s == 'apache'
           sudo "a2ensite #{application}" 
         end
       end

data/lib/deprec/recipes/app/passenger.rb

@@ -4,8 +4,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :passenger do
           
       set(:passenger_install_dir) {
-        
-        if ruby_vm_type == :ree
+        if ruby_choice == :ree
           base_dir = "#{ree_install_dir}/lib/ruby/gems/1.8/gems/"
           latest_passenger_version = capture("ls -d #{base_dir + 'passenger-*'} | tail -1").chomp
         else

data/lib/deprec/recipes/starling.rb

@@ -25,7 +25,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
         create_starling_user_and_group
         set_perms_for_starling_dirs
-        symlink_starling_for_rubyee if ruby_vm_type == :ree
+        symlink_starling_for_rubyee if ruby_choice == :ree
 
         SYSTEM_CONFIG_FILES[:starling].each do |file|
           deprec2.render_template(:starling, file.merge(:remote=>true))

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 1
   - 6
-  - 7
-  version: 2.1.6.007
+  - 8
+  version: 2.1.6.008
 platform: ruby
 authors: 
 - Le1t0