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 "git://github.com/gravitystorm/blogs.osm.org.git"
- depth 5
+ repository "https://github.com/gravitystorm/blogs.osm.org.git"
+ depth 1
user "blogs"
group "blogs"
- notifies :run, "execute[/srv/blogs.openstreetmap.org/Gemfile]", :immediately
+ notifies :run, "bundle_install[/srv/blogs.openstreetmap.org]", :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"
user "root"
group "root"
- notifies :run, "execute[/srv/blogs.openstreetmap.org]", :immediately
+ notifies :run, "bundle_exec[/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"
user "blogs"
group "blogs"
end
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
+
+cron_d "blogs" do
+ minute "*/30"
+ user "blogs"
+ command "/usr/local/bin/blogs-update"
+ mailto "admins@openstreetmap.org"
+end
+
+template "/etc/cron.daily/blogs-backup" do
+ source "backup.cron.erb"
owner "root"
group "root"
- mode "0644"
+ mode "0755"
end