X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f5c209a2991b26130dcae5cfcc613be001f5106d..88c3da7e61393b6f78f9e6c6619cb0458fdce55a:/cookbooks/blogs/recipes/default.rb diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb index 1d516a35a..0fb2cc7aa 100644 --- a/cookbooks/blogs/recipes/default.rb +++ b/cookbooks/blogs/recipes/default.rb @@ -20,50 +20,46 @@ include_recipe "accounts" include_recipe "apache" include_recipe "git" +include_recipe "ruby" -package %w[ - ruby - ruby-dev +package %W[ make gcc g++ libsqlite3-dev + sqlite3 ] -gem_package "bundler" do - version "~> 1.17.2" -end - directory "/srv/blogs.openstreetmap.org" do owner "blogs" group "blogs" - mode 0o755 + mode "755" end git "/srv/blogs.openstreetmap.org" do action :sync repository "https://github.com/gravitystorm/blogs.osm.org.git" - depth 5 + depth 1 user "blogs" group "blogs" - notifies :run, "execute[/srv/blogs.openstreetmap.org/Gemfile]", :immediately end -execute "/srv/blogs.openstreetmap.org/Gemfile" do +bundle_install "/srv/blogs.openstreetmap.org" do action :nothing - command "bundle install --deployment" - cwd "/srv/blogs.openstreetmap.org" + options "--deployment --without development test" + environment "BUNDLE_PATH" => "vendor/bundle" user "blogs" group "blogs" - notifies :run, "execute[/srv/blogs.openstreetmap.org]", :immediately + subscribes :run, "git[/srv/blogs.openstreetmap.org]", :immediately end -execute "/srv/blogs.openstreetmap.org" do +bundle_exec "/srv/blogs.openstreetmap.org" do action :nothing - command "bundle exec pluto build -t osm -o build" - cwd "/srv/blogs.openstreetmap.org" + command "pluto build -t osm -o build" + environment "BUNDLE_PATH" => "vendor/bundle" user "blogs" group "blogs" + subscribes :run, "git[/srv/blogs.openstreetmap.org]", :immediately end ssl_certificate "blogs.openstreetmap.org" do @@ -77,9 +73,34 @@ apache_site "blogs.openstreetmap.org" do variables :aliases => ["blogs.osm.org"] end -template "/etc/cron.d/blogs" do - source "cron.erb" +template "/usr/local/bin/blogs-update" do + source "blogs-update.erb" + owner "root" + group "root" + mode "0755" +end + +systemd_service "blogs-update" do + description "Update blog aggregator" + exec_start "/usr/local/bin/blogs-update" + user "blogs" + sandbox :enable_network => true + read_write_paths "/srv/blogs.openstreetmap.org" +end + +systemd_timer "blogs-update" do + description "Update blog aggregator" + on_boot_sec "15m" + on_unit_inactive_sec "30m" +end + +service "blogs-update.timer" do + action [:enable, :start] +end + +template "/etc/cron.daily/blogs-backup" do + source "backup.cron.erb" owner "root" group "root" - mode "0644" + mode "0755" end