]> git.openstreetmap.org Git - chef.git/commitdiff
projects / chef.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 95ff847)
tile: Update index page to modern HTML, add tests
authorPaul Norman <penorman@mac.com>
Thu, 4 Jul 2024 17:34:11 +0000 (10:34 -0700)
committerPaul Norman <penorman@mac.com>
Thu, 4 Jul 2024 17:38:59 +0000 (10:38 -0700)
cookbooks/tile/templates/default/index.html.erb patch | blob | history
test/integration/tile/inspec/apache_spec.rb patch | blob | history

diff --git a/cookbooks/tile/templates/default/index.html.erb b/cookbooks/tile/templates/default/index.html.erb
index 91305256e963f2445dfe1b0e427a22ae544ca40c..8a12402ff22b36a82aecb88bf413f7861a93ffe6 100644 (file)
--- a/cookbooks/tile/templates/default/index.html.erb
+++ b/cookbooks/tile/templates/default/index.html.erb
@@ -1,15 +1,14 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-  "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
 <head>
 <title>tile.openstreetmap.org</title>
 <head>
 <title>tile.openstreetmap.org</title>
-<!-- MANAGED VIA CHEF --!>
+<!-- MANAGED VIA CHEF -->
 <meta name="robots" content="noindex">
 <meta http-equiv="cache-control" content="no-cache">
 <meta http-equiv="pragma" content="no-cache">
 </head>
 <body>
 <meta name="robots" content="noindex">
 <meta http-equiv="cache-control" content="no-cache">
 <meta http-equiv="pragma" content="no-cache">
 </head>
 <body>
-You've reached the OpenStreetMap.org tile server. (<%= node['fqdn'] %>)<br />
+You've reached the OpenStreetMap.org tile server (<%= node['fqdn'] %>)<br />
 <dl>
 <dt>If you are a user...</dt>
 <dd>You probably want <a href="https://www.openstreetmap.org/">OpenStreetMap</a> itself.</dd>
 <dl>
 <dt>If you are a user...</dt>
 <dd>You probably want <a href="https://www.openstreetmap.org/">OpenStreetMap</a> itself.</dd>
diff --git a/test/integration/tile/inspec/apache_spec.rb b/test/integration/tile/inspec/apache_spec.rb
index 8006330b441e96365a635a878578c9623dfe1469..50a916801c2f32639cb34f7aaf097d2034c6f515 100644 (file)
--- a/test/integration/tile/inspec/apache_spec.rb
+++ b/test/integration/tile/inspec/apache_spec.rb
@@ -16,3 +16,11 @@ describe port(443) do
   it { should be_listening }
   its("protocols") { should cmp "tcp" }
 end
   it { should be_listening }
   its("protocols") { should cmp "tcp" }
 end
+
+describe http("http://localhost") do
+  its("status") { should cmp 301 }
+end
+
+describe http("https://localhost", :ssl_verify => false) do
+  its("status") { should cmp 200 }
+end
Chef configuration management public repo for configuring & maintaining the OpenStreetMap servers.