X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a68415b8f2bf106b6ea5948b0605c897b516ef4f..9b52f786e3cc0481c6655c2b60ab998a8b55cd6d:/cookbooks/web/recipes/frontend.rb?ds=inline diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb index 636cb56d7..71a7c4384 100644 --- a/cookbooks/web/recipes/frontend.rb +++ b/cookbooks/web/recipes/frontend.rb @@ -8,7 +8,7 @@ # 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, @@ -17,7 +17,7 @@ # limitations under the License. # -include_recipe "apache::ssl" +include_recipe "apache" include_recipe "web::rails" web_passwords = data_bag_item("web", "passwords") @@ -38,7 +38,8 @@ end apache_site "www.openstreetmap.org" do template "apache.frontend.erb" - variables :secret_key_base => web_passwords["secret_key_base"] + variables :status => node[:web][:status], + :secret_key_base => web_passwords["secret_key_base"] end template "/etc/logrotate.d/apache2" do @@ -47,3 +48,10 @@ template "/etc/logrotate.d/apache2" do group "root" mode 0o644 end + +service "rails-jobs" do + action [:enable, :start] + supports :restart => true + subscribes :restart, "rails_port[www.openstreetmap.org]" + subscribes :restart, "systemd_service[rails-jobs]" +end