# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
property :directory, String
property :user, String
property :group, String
-property :repository, String, :default => "git://git.openstreetmap.org/rails.git"
+property :repository, String, :default => "https://git.openstreetmap.org/public/rails.git"
property :revision, String, :default => "live"
property :run_migrations, [TrueClass, FalseClass], :default => false
property :email_from, String, :default => "OpenStreetMap <support@openstreetmap.org>"
property :github_auth_secret, String
property :wikipedia_auth_id, String
property :wikipedia_auth_secret, String
-property :mapquest_key, String
-property :mapzen_valhalla_key, String
property :thunderforest_key, String
property :totp_key, String
+property :csp_enforce, [TrueClass, FalseClass], :default => false
property :csp_report_url, String
property :piwik_configuration, Hash
+property :trace_use_job_queue, [TrueClass, FalseClass], :default => false
action :create do
package %W[
libxml2-dev
libxslt1-dev
libmemcached-dev
+ libffi-dev
]
package %w[
gem_package "bundler#{new_resource.ruby}" do
package_name "bundler"
- version "1.3.5"
+ version "1.16.2"
gem_binary "gem#{new_resource.ruby}"
options "--format-executable"
end
- file "/usr/lib/ruby/1.8/rack.rb" do
- action :delete
- end
-
- declare_resource :directory, "/usr/lib/ruby/1.8/rack" do
- action :delete
- recursive true
+ gem_package "bundler#{new_resource.ruby}" do
+ package_name "pkg-config"
+ gem_binary "gem#{new_resource.ruby}"
end
declare_resource :directory, rails_directory do
user new_resource.user
group new_resource.group
notifies :run, "execute[#{rails_directory}/Gemfile]"
+ notifies :run, "execute[#{rails_directory}/app/assets/javascripts/i18n]"
notifies :run, "execute[#{rails_directory}/public/assets]"
notifies :delete, "file[#{rails_directory}/public/export/embed.html]"
- notifies :run, "execute[#{rails_directory}]"
+ notifies :restart, "passenger_application[#{rails_directory}]"
end
declare_resource :directory, "#{rails_directory}/tmp" do
:name => new_resource.database_name,
:username => new_resource.database_username,
:password => new_resource.database_password
- notifies :run, "execute[#{rails_directory}]"
+ notifies :restart, "passenger_application[#{rails_directory}]"
end
application_yml = edit_file "#{rails_directory}/config/example.application.yml" do |line|
line.gsub!(/^( *)#wikipedia_auth_secret:.*$/, "\\1wikipedia_auth_secret: \"#{new_resource.wikipedia_auth_secret}\"")
end
- if new_resource.mapquest_key
- line.gsub!(/^( *)#mapquest_key:.*$/, "\\1mapquest_key: \"#{new_resource.mapquest_key}\"")
- end
-
- if new_resource.mapzen_valhalla_key
- line.gsub!(/^( *)#mapzen_valhalla_key:.*$/, "\\1mapzen_valhalla_key: \"#{new_resource.mapzen_valhalla_key}\"")
- end
-
if new_resource.thunderforest_key
line.gsub!(/^( *)#thunderforest_key:.*$/, "\\1thunderforest_key: \"#{new_resource.thunderforest_key}\"")
end
line.gsub!(/^( *)#totp_key:.*$/, "\\1totp_key: \"#{new_resource.totp_key}\"")
end
+ if new_resource.csp_enforce
+ line.gsub!(/^( *)csp_enforce:.*$/, "\\1csp_enforce: \"#{new_resource.csp_enforce}\"")
+ end
+
if new_resource.csp_report_url
line.gsub!(/^( *)#csp_report_url:.*$/, "\\1csp_report_url: \"#{new_resource.csp_report_url}\"")
end
line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true")
line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true")
+ line.gsub!(/^( *)trace_use_job_queue:.*$/, "\\1trace_use_job_queue: false")
line
end
- file "#{rails_directory}/config/application.yml" do
+ file "create:#{rails_directory}/config/application.yml" do
+ path "#{rails_directory}/config/application.yml"
owner new_resource.user
group new_resource.group
mode 0o664
content application_yml
notifies :run, "execute[#{rails_directory}/public/assets]"
+ only_if { ::File.exist?("#{rails_directory}/config/example.application.yml") }
+ end
+
+ file "delete:#{rails_directory}/config/application.yml" do
+ path "#{rails_directory}/config/application.yml"
+ action :delete
+ not_if { ::File.exist?("#{rails_directory}/config/example.application.yml") }
+ end
+
+ settings = new_resource.to_hash.transform_keys(&:to_s).slice(
+ "email_from",
+ "status",
+ "messages_domain",
+ "attachments_dir",
+ "log_path",
+ "logstash_path",
+ "potlatch2_key",
+ "id_key",
+ "oauth_key",
+ "nominatim_url",
+ "osrm_url",
+ "google_auth_id",
+ "google_auth_secret",
+ "google_openid_realm",
+ "facebook_auth_id",
+ "facebook_auth_secret",
+ "windowslive_auth_id",
+ "windowslive_auth_secret",
+ "github_auth_id",
+ "github_auth_secret",
+ "wikipedia_auth_id",
+ "wikipedia_auth_secret",
+ "thunderforest_key",
+ "totp_key",
+ "csp_enforce",
+ "csp_report_url",
+ "trace_use_job_queue"
+ ).reject { |_k, v| v.nil? }.merge(
+ "server_protocol" => "https",
+ "server_url" => new_resource.site,
+ "publisher_url" => "https://plus.google.com/111953119785824514010",
+ "support_email" => "support@openstreetmap.org",
+ "email_return_path" => "bounces@openstreetmap.org",
+ "geonames_username" => "openstreetmap",
+ "geoip_database" => "/usr/share/GeoIP/GeoIPv6.dat"
+ )
+
+ if new_resource.memcache_servers
+ settings["memcache_servers"] = new_resource.memcache_servers.to_a
+ end
+
+ if new_resource.gpx_dir
+ settings["gpx_trace_dir"] = "#{new_resource.gpx_dir}/traces"
+ settings["gpx_image_dir"] = "#{new_resource.gpx_dir}/images"
+ end
+
+ file "#{rails_directory}/config/settings.local.yml" do
+ owner new_resource.user
+ group new_resource.group
+ mode 0o664
+ content YAML.dump(settings)
+ notifies :run, "execute[#{rails_directory}/public/assets]"
+ only_if { ::File.exist?("#{rails_directory}/config/settings.yml") }
end
if new_resource.piwik_configuration
group "root"
environment "NOKOGIRI_USE_SYSTEM_LIBRARIES" => "yes"
subscribes :run, "gem_package[bundler#{new_resource.ruby}]"
- notifies :run, "execute[#{rails_directory}]"
+ notifies :restart, "passenger_application[#{rails_directory}]"
end
execute "#{rails_directory}/db/migrate" do
user new_resource.user
group new_resource.group
subscribes :run, "git[#{rails_directory}]"
- notifies :run, "execute[#{rails_directory}]"
+ notifies :restart, "passenger_application[#{rails_directory}]"
only_if { new_resource.run_migrations }
end
- execute "#{rails_directory}/public/assets" do
+ execute "#{rails_directory}/app/assets/javascripts/i18n" do
action :nothing
- command "bundle#{new_resource.ruby} exec rake assets:precompile"
+ command "bundle#{new_resource.ruby} exec rake i18n:js:export"
environment "RAILS_ENV" => "production"
cwd rails_directory
user new_resource.user
group new_resource.group
- notifies :run, "execute[#{rails_directory}]"
+ notifies :run, "execute[#{rails_directory}/public/assets]"
end
- file "#{rails_directory}/public/export/embed.html" do
+ execute "#{rails_directory}/public/assets" do
action :nothing
- end
-
- execute "#{rails_directory}/lib/quad_tile/extconf.rb" do
- command "ruby extconf.rb"
- cwd "#{rails_directory}/lib/quad_tile"
+ command "bundle#{new_resource.ruby} exec rake assets:precompile"
+ environment "RAILS_ENV" => "production"
+ cwd rails_directory
user new_resource.user
group new_resource.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/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]"
+ notifies :restart, "passenger_application[#{rails_directory}]"
end
- execute "#{rails_directory}/lib/quad_tile/Makefile" do
+ file "#{rails_directory}/public/export/embed.html" do
action :nothing
- command "make"
- cwd "#{rails_directory}/lib/quad_tile"
- user new_resource.user
- group new_resource.group
- notifies :run, "execute[#{rails_directory}]"
end
- execute rails_directory do
+ passenger_application rails_directory do
action :nothing
- command "passenger-config restart-app --ignore-app-not-running #{rails_directory}"
- user "root"
- group "root"
only_if { ::File.exist?("/usr/bin/passenger-config") }
end
end
action :restart do
- execute rails_directory do
- action :run
- command "passenger-config restart-app --ignore-app-not-running #{rails_directory}"
- user "root"
- group "root"
+ passenger_application rails_directory do
+ action :restart
end
end
projects / chef.git / blobdiff