X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/4bfd3b66e6fc725fb406068a955bb3aeea394f90..d2d7922d1e3a80d48c78717397236f471a5be506:/cookbooks/web/definitions/rails_port.rb

diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb
index f3d89d057..8f277441f 100644
--- a/cookbooks/web/definitions/rails_port.rb
+++ b/cookbooks/web/definitions/rails_port.rb
@@ -44,6 +44,7 @@ define :rails_port, :action => [:create, :enable] do
   package "irb#{ruby_version}" if ruby_version.to_f < 1.9
   package "imagemagick"
   package "nodejs"
+  package "geoip-database"
 
   package "g++"
   package "pkg-config"
@@ -72,7 +73,7 @@ define :rails_port, :action => [:create, :enable] do
   directory rails_directory do
     owner rails_user
     group rails_group
-    mode 02775
+    mode 0o2775
   end
 
   git rails_directory do
@@ -102,13 +103,13 @@ define :rails_port, :action => [:create, :enable] do
     source "database.yml.erb"
     owner rails_user
     group rails_group
-    mode 0664
+    mode 0o664
     variables database_params
     notifies :run, "execute[#{rails_directory}]"
   end
 
   application_yml = edit_file "#{rails_directory}/config/example.application.yml" do |line|
-    line.gsub!(/^( *)server_url:.*$/, "\\1server_url: \"#{name}\"")
+    line.gsub!(/^( *)#?server_url:.*$/, "\\1server_url: \"#{name}\"")
 
     if params[:email_from]
       line.gsub!(/^( *)email_from:.*$/, "\\1email_from: \"#{params[:email_from]}\"")
@@ -122,10 +123,7 @@ define :rails_port, :action => [:create, :enable] do
 
     line.gsub!(/^( *)#geonames_username:.*$/, "\\1geonames_username: \"openstreetmap\"")
 
-    if params[:quova_username]
-      line.gsub!(/^( *)#quova_username:.*$/, "\\1quova_username: \"#{params[:quova_username]}\"")
-      line.gsub!(/^( *)#quova_password:.*$/, "\\1quova_password: \"#{params[:quova_password]}\"")
-    end
+    line.gsub!(/^( *)#geoip_database:.*$/, "\\1geoip_database: \"/usr/share/GeoIP/GeoIPv6.dat\"")
 
     if params[:gpx_dir]
       line.gsub!(/^( *)gpx_trace_dir:.*$/, "\\1gpx_trace_dir: \"#{params[:gpx_dir]}/traces\"")
@@ -145,7 +143,7 @@ define :rails_port, :action => [:create, :enable] do
     end
 
     if params[:memcache_servers]
-      line.gsub!(/^( *)#memcache_servers:.*$/, "\\1memcache_servers: [ \"#{params[:memcache_servers].join("\", \"")}\" ]")
+      line.gsub!(/^( *)#memcache_servers:.*$/, "\\1memcache_servers: [ \"#{params[:memcache_servers].join('", "')}\" ]")
     end
 
     if params[:potlatch2_key]
@@ -184,6 +182,16 @@ define :rails_port, :action => [:create, :enable] do
       line.gsub!(/^( *)#windowslive_auth_secret:.*$/, "\\1windowslive_auth_secret: \"#{params[:windowslive_auth_secret]}\"")
     end
 
+    if params[:github_auth_id]
+      line.gsub!(/^( *)#github_auth_id:.*$/, "\\1github_auth_id: \"#{params[:github_auth_id]}\"")
+      line.gsub!(/^( *)#github_auth_secret:.*$/, "\\1github_auth_secret: \"#{params[:github_auth_secret]}\"")
+    end
+
+    if params[:wikipedia_auth_id]
+      line.gsub!(/^( *)#wikipedia_auth_id:.*$/, "\\1wikipedia_auth_id: \"#{params[:wikipedia_auth_id]}\"")
+      line.gsub!(/^( *)#wikipedia_auth_secret:.*$/, "\\1wikipedia_auth_secret: \"#{params[:wikipedia_auth_secret]}\"")
+    end
+
     if params[:mapquest_key]
       line.gsub!(/^( *)#mapquest_key:.*$/, "\\1mapquest_key: \"#{params[:mapquest_key]}\"")
     end
@@ -192,6 +200,14 @@ define :rails_port, :action => [:create, :enable] do
       line.gsub!(/^( *)#mapzen_valhalla_key:.*$/, "\\1mapzen_valhalla_key: \"#{params[:mapzen_valhalla_key]}\"")
     end
 
+    if params[:thunderforest_key]
+      line.gsub!(/^( *)#thunderforest_key:.*$/, "\\1thunderforest_key: \"#{params[:thunderforest_key]}\"")
+    end
+
+    if params[:totp_key]
+      line.gsub!(/^( *)#totp_key:.*$/, "\\1totp_key: \"#{params[:totp_key]}\"")
+    end
+
     line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true")
     line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true")
 
@@ -201,7 +217,7 @@ define :rails_port, :action => [:create, :enable] do
   file "#{rails_directory}/config/application.yml" do
     owner rails_user
     group rails_group
-    mode 0664
+    mode 0o664
     content application_yml
     notifies :run, "execute[#{rails_directory}/public/assets]"
   end
@@ -210,7 +226,7 @@ define :rails_port, :action => [:create, :enable] do
     file "#{rails_directory}/config/piwik.yml" do
       owner rails_user
       group rails_group
-      mode 0664
+      mode 0o664
       content YAML.dump(params[:piwik_configuration])
       notifies :run, "execute[#{rails_directory}/public/assets]"
     end
@@ -234,7 +250,7 @@ define :rails_port, :action => [:create, :enable] do
 
   execute "#{rails_directory}/db/migrate" do
     action :nothing
-    command "bundle#{ruby_version} exec rake#{ruby_version} db:migrate"
+    command "bundle#{ruby_version} exec rake db:migrate"
     cwd rails_directory
     user rails_user
     group rails_group
@@ -245,7 +261,7 @@ define :rails_port, :action => [:create, :enable] do
 
   execute "#{rails_directory}/public/assets" do
     action :nothing
-    command "bundle#{ruby_version} exec rake#{ruby_version} assets:precompile"
+    command "bundle#{ruby_version} exec rake assets:precompile"
     environment "RAILS_ENV" => "production"
     cwd rails_directory
     user rails_user
@@ -262,20 +278,21 @@ define :rails_port, :action => [:create, :enable] do
     cwd "#{rails_directory}/lib/quad_tile"
     user rails_user
     group rails_group
-    not_if { File.exist?("#{rails_directory}/lib/quad_tile/Makefile") && File.mtime("#{rails_directory}/lib/quad_tile/Makefile") >= File.mtime("#{rails_directory}/lib/quad_tile/extconf.rb") }
+    not_if do
+      File.exist?("#{rails_directory}/lib/quad_tile/quad_tile_so.so") &&
+        File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/extconf.rb") &&
+        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 :run, "execute[#{rails_directory}/lib/quad_tile/Makefile]"
   end
 
   execute "#{rails_directory}/lib/quad_tile/Makefile" do
+    action :nothing
     command "make"
     cwd "#{rails_directory}/lib/quad_tile"
     user rails_user
     group rails_group
-    not_if do
-      File.exist?("#{rails_directory}/lib/quad_tile/quad_tile_so.so") &&
-        File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/Makefile") &&
-        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 :run, "execute[#{rails_directory}]"
   end
 
@@ -292,7 +309,7 @@ define :rails_port, :action => [:create, :enable] do
     source "rails.cron.erb"
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
     variables :directory => rails_directory
   end
 end