Add mobile interface to wiki

[chef.git] / cookbooks / web / definitions / rails_port.rb

diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb
index 9fa88c52e686354b60ad86a1548c181396e30185..dcee9cbfe513fef5d1a599f41dcf0e8ff02cb73c 100644 (file)
--- a/cookbooks/web/definitions/rails_port.rb
+++ b/cookbooks/web/definitions/rails_port.rb
@@ -19,7 +19,7 @@
 
 require "yaml"
 
 
 require "yaml"
 

-define :rails_port, :action => [ :create, :enable ] do
+define :rails_port, :action => [:create, :enable] do

   name = params[:name]
   ruby_version = params[:ruby] || "1.9.1"
   rails_directory = params[:directory] || "/srv/#{name}"
   name = params[:name]
   ruby_version = params[:ruby] || "1.9.1"
   rails_directory = params[:directory] || "/srv/#{name}"


@@ -40,8 +40,8 @@ define :rails_port, :action => [ :create, :enable ] do
 
   package "ruby#{ruby_version}"
   package "ruby#{ruby_version}-dev"
 
   package "ruby#{ruby_version}"
   package "ruby#{ruby_version}-dev"

-  package "rubygems#{ruby_version}"
-  package "irb#{ruby_version}"
+  package "rubygems#{ruby_version}" if ruby_version.to_f < 1.9
+  package "irb#{ruby_version}" if ruby_version.to_f < 1.9

   package "imagemagick"
   package "nodejs"
 
   package "imagemagick"
   package "nodejs"
 


@@ -69,8 +69,12 @@ define :rails_port, :action => [ :create, :enable ] do
     recursive true
   end
 
     recursive true
   end
 

-  file "#{rails_directory}/tmp/restart.txt" do
+  execute rails_directory do

     action :nothing
     action :nothing

+    command "passenger-config restart-app #{rails_directory}"
+    user "root"
+    group "root"
+    only_if { File.exist?("/usr/bin/passenger-config") }

   end
 
   file "#{rails_directory}/public/export/embed.html" do
   end
 
   file "#{rails_directory}/public/export/embed.html" do


@@ -79,22 +83,22 @@ define :rails_port, :action => [ :create, :enable ] do
 
   execute "#{rails_directory}/public/assets" do
     action :nothing
 
   execute "#{rails_directory}/public/assets" do
     action :nothing

-    command "rake#{ruby_version} assets:precompile"
+    command "bundle#{ruby_version} exec rake#{ruby_version} assets:precompile"

     environment "RAILS_ENV" => "production"
     cwd rails_directory
     user rails_user
     group rails_group
     environment "RAILS_ENV" => "production"
     cwd rails_directory
     user rails_user
     group rails_group

-    notifies :delete, "file[#{rails_directory}/public/export/embed.html]"
-    notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
+    notifies :delete, "file[#{rails_directory}/public/export/embed.html]", :immediate
+    notifies :run, "execute[#{rails_directory}]", :immediate

   end
 
   execute "#{rails_directory}/db/migrate" do
     action :nothing
   end
 
   execute "#{rails_directory}/db/migrate" do
     action :nothing

-    command "rake#{ruby_version} db:migrate"
+    command "bundle#{ruby_version} exec rake#{ruby_version} db:migrate"

     cwd rails_directory
     user rails_user
     group rails_group
     cwd rails_directory
     user rails_user
     group rails_group

-    notifies :run, "execute[#{rails_directory}/public/assets]"
+    notifies :run, "execute[#{rails_directory}/public/assets]", :immediate

   end
 
   execute "#{rails_directory}/Gemfile" do
   end
 
   execute "#{rails_directory}/Gemfile" do


@@ -105,9 +109,9 @@ define :rails_port, :action => [ :create, :enable ] do
     group "root"
     environment "NOKOGIRI_USE_SYSTEM_LIBRARIES" => "yes"
     if run_migrations
     group "root"
     environment "NOKOGIRI_USE_SYSTEM_LIBRARIES" => "yes"
     if run_migrations

-      notifies :run, "execute[#{rails_directory}/db/migrate]"
+      notifies :run, "execute[#{rails_directory}/db/migrate]", :immediate

     else
     else

-      notifies :run, "execute[#{rails_directory}/public/assets]"
+      notifies :run, "execute[#{rails_directory}/public/assets]", :immediate

     end
     subscribes :run, "gem_package[bundler#{ruby_version}]"
   end
     end
     subscribes :run, "gem_package[bundler#{ruby_version}]"
   end


@@ -124,7 +128,7 @@ define :rails_port, :action => [ :create, :enable ] do
     revision rails_revision
     user rails_user
     group rails_group
     revision rails_revision
     user rails_user
     group rails_group

-    notifies :run, "execute[#{rails_directory}/Gemfile]"
+    notifies :run, "execute[#{rails_directory}/Gemfile]", :immediate

   end
 
   directory "#{rails_directory}/tmp" do
   end
 
   directory "#{rails_directory}/tmp" do


@@ -144,7 +148,7 @@ define :rails_port, :action => [ :create, :enable ] do
     group rails_group
     mode 0664
     variables database_params
     group rails_group
     mode 0664
     variables database_params

-    notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
+    notifies :run, "execute[#{rails_directory}]"

   end
 
   application_yml = edit_file "#{rails_directory}/config/example.application.yml" do |line|
   end
 
   application_yml = edit_file "#{rails_directory}/config/example.application.yml" do |line|


@@ -167,14 +171,6 @@ define :rails_port, :action => [ :create, :enable ] do
       line.gsub!(/^( *)#quova_password:.*$/, "\\1quova_password: \"#{params[:quova_password]}\"")
     end
 
       line.gsub!(/^( *)#quova_password:.*$/, "\\1quova_password: \"#{params[:quova_password]}\"")
     end
 

-    if params[:soft_memory_limit]
-      line.gsub!(/^( *)#soft_memory_limit:.*$/, "\\1soft_memory_limit: #{params[:soft_memory_limit]}")
-    end
-
-    if params[:hard_memory_limit]
-      line.gsub!(/^( *)#hard_memory_limit:.*$/, "\\1hard_memory_limit: #{params[:hard_memory_limit]}")
-    end
-

     if params[:gpx_dir]
       line.gsub!(/^( *)gpx_trace_dir:.*$/, "\\1gpx_trace_dir: \"#{params[:gpx_dir]}/traces\"")
       line.gsub!(/^( *)gpx_image_dir:.*$/, "\\1gpx_image_dir: \"#{params[:gpx_dir]}/images\"")
     if params[:gpx_dir]
       line.gsub!(/^( *)gpx_trace_dir:.*$/, "\\1gpx_trace_dir: \"#{params[:gpx_dir]}/traces\"")
       line.gsub!(/^( *)gpx_image_dir:.*$/, "\\1gpx_image_dir: \"#{params[:gpx_dir]}/images\"")


@@ -208,6 +204,22 @@ define :rails_port, :action => [ :create, :enable ] do
       line.gsub!(/^( *)nominatim_url:.*$/, "\\1nominatim_url: \"#{params[:nominatim_url]}\"")
     end
 
       line.gsub!(/^( *)nominatim_url:.*$/, "\\1nominatim_url: \"#{params[:nominatim_url]}\"")
     end
 

+    if params[:google_auth_id]
+      line.gsub!(/^( *)#google_auth_id:.*$/, "\\1google_auth_id: \"#{params[:google_auth_id]}\"")
+      line.gsub!(/^( *)#google_auth_secret:.*$/, "\\1google_auth_secret: \"#{params[:google_auth_secret]}\"")
+      line.gsub!(/^( *)#google_openid_realm:.*$/, "\\1google_openid_realm: \"#{params[:google_openid_realm]}\"")
+    end
+
+    if params[:facebook_auth_id]
+      line.gsub!(/^( *)#facebook_auth_id:.*$/, "\\1facebook_auth_id: \"#{params[:facebook_auth_id]}\"")
+      line.gsub!(/^( *)#facebook_auth_secret:.*$/, "\\1facebook_auth_secret: \"#{params[:facebook_auth_secret]}\"")
+    end
+
+    if params[:windowslive_auth_id]
+      line.gsub!(/^( *)#windowslive_auth_id:.*$/, "\\1windowslive_auth_id: \"#{params[:windowslive_auth_id]}\"")
+      line.gsub!(/^( *)#windowslive_auth_secret:.*$/, "\\1windowslive_auth_secret: \"#{params[:windowslive_auth_secret]}\"")
+    end
+

     line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true")
     line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true")
 
     line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true")
     line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true")
 


@@ -219,7 +231,7 @@ define :rails_port, :action => [ :create, :enable ] do
     group rails_group
     mode 0664
     content application_yml
     group rails_group
     mode 0664
     content application_yml

-    notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
+    notifies :run, "execute[#{rails_directory}]"

   end
 
   if params[:piwik_configuration]
   end
 
   if params[:piwik_configuration]


@@ -256,7 +268,7 @@ define :rails_port, :action => [ :create, :enable ] do
         File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.c") &&
         File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.h")
     end
         File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.c") &&
         File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.h")
     end

-    notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
+    notifies :run, "execute[#{rails_directory}]"

   end
 
   template "/etc/cron.daily/rails-#{name}" do
   end
 
   template "/etc/cron.daily/rails-#{name}" do