X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ad7ea408599881dea172ad63e1709e488ffa856a..52798119cec959afc55fabdae6501e73cbce8c4a:/cookbooks/serverinfo/recipes/default.rb diff --git a/cookbooks/serverinfo/recipes/default.rb b/cookbooks/serverinfo/recipes/default.rb index e5fd33d22..97051e1a1 100644 --- a/cookbooks/serverinfo/recipes/default.rb +++ b/cookbooks/serverinfo/recipes/default.rb @@ -17,7 +17,7 @@ # limitations under the License. # -include_recipe "apache::ssl" +include_recipe "apache" include_recipe "git" package "ruby" @@ -38,7 +38,7 @@ roles = { :rows => search(:role, "*:*") } file "/srv/hardware.openstreetmap.org/_data/nodes.json" do content nodes.to_json - mode 0644 + mode 0o644 owner "root" group "root" notifies :run, "execute[/srv/hardware.openstreetmap.org]" @@ -46,14 +46,14 @@ end file "/srv/hardware.openstreetmap.org/_data/roles.json" do content roles.to_json - mode 0644 + mode 0o644 owner "root" group "root" notifies :run, "execute[/srv/hardware.openstreetmap.org]" end directory "/srv/hardware.openstreetmap.org/_site" do - mode 0755 + mode 0o755 owner "nobody" group "nogroup" end @@ -66,6 +66,11 @@ execute "/srv/hardware.openstreetmap.org" do group "nogroup" end +ssl_certificate "hardware.openstreetmap.org" do + domains "hardware.openstreetmap.org" + notifies :reload, "service[apache2]" +end + apache_site "hardware.openstreetmap.org" do template "apache.erb" directory "/srv/hardware.openstreetmap.org/_site"