]> git.openstreetmap.org Git - chef.git/commitdiff
projects / chef.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 1eebadd)
Merge pull request #276 from Firefishy/git-timeout-tweak
authorGrant <git@firefishy.com>
Sat, 22 Feb 2020 21:13:04 +0000 (21:13 +0000)
committerGitHub <noreply@github.com>
Sat, 22 Feb 2020 21:13:04 +0000 (21:13 +0000)
git: tweak description for apache keepalive timeout

cookbooks/planet/files/default/ccbysa_history_cgi/HEADER.cgi patch | blob | history
cookbooks/planet/files/default/cgi/HEADER.cgi patch | blob | history
cookbooks/planet/files/default/history_cgi/HEADER.cgi patch | blob | history
cookbooks/planet/files/default/html/robots.txt patch | blob | history
cookbooks/planet/files/default/replication-cgi/HEADER.cgi patch | blob | history

diff --git a/cookbooks/planet/files/default/ccbysa_history_cgi/HEADER.cgi b/cookbooks/planet/files/default/ccbysa_history_cgi/HEADER.cgi
index 25247379714faa433892abcfaaf899ff9b753b2c..6d1810e63f1fb4d6d76cb6c5d53437ec0632fb94 100644 (file)
--- a/cookbooks/planet/files/default/ccbysa_history_cgi/HEADER.cgi
+++ b/cookbooks/planet/files/default/ccbysa_history_cgi/HEADER.cgi
@@ -4,10 +4,10 @@ print """
 <html>
  <head>
   <title>OpenStreetMap historical CC BY-SA 2.0 licensed data</title>
-  <link href="/style.css" rel="stylesheet" type="text/css">
+  <link href="https://planet.openstreetmap.org/style.css" rel="stylesheet" type="text/css">
  </head>
  <body>
-<img id="logo" src="/logo.png" alt="OSM logo" width="128" height="128">
+<img id="logo" src="https://planet.openstreetmap.org/logo.png" alt="OSM logo" width="128" height="128">
 <h1>planet.openstreetmap.org - CC BY-SA experimental history files.</h1>
 <p>These files are the last experimental history files produced under the CC BY-SA license. More recent data under the ODbL license is <a href="/planet/full-history/">available here</a>.<p>
 <p>The <tt>full-planet-120401-final.osm.bz2</tt> file is the last dump of data before <a href="https://blog.osmfoundation.org/2012/07/26/automated-redactions-complete/">redactions were run to remove data which could not be released under ODbL</a>. The <tt>full-planet-120601-1150.osm.bz2</tt> is the last dump of data available under CC BY-SA, but after the redactions were run. This means it may have less data in some areas, although many redactions were quickly re-mapped.</p>
diff --git a/cookbooks/planet/files/default/cgi/HEADER.cgi b/cookbooks/planet/files/default/cgi/HEADER.cgi
index 6b1f7ac0c4ee12b57d2f626f2184dc7326c2240e..0ce17f64acb5951fc025753e06c1fed9dc61c36f 100644 (file)
--- a/cookbooks/planet/files/default/cgi/HEADER.cgi
+++ b/cookbooks/planet/files/default/cgi/HEADER.cgi
@@ -59,10 +59,10 @@ print """
 <html>
  <head>
   <title>Index of /</title>
-  <link href="/style.css" rel="stylesheet" type="text/css">
+  <link href="https://planet.openstreetmap.org/style.css" rel="stylesheet" type="text/css">
  </head>
  <body>
-<img id="logo" src="/logo.png" alt="OSM logo" width="128" height="128">
+<img id="logo" src="https://planet.openstreetmap.org/logo.png" alt="OSM logo" width="128" height="128">
 <h1>Planet OSM</h1>
 
 <p>
diff --git a/cookbooks/planet/files/default/history_cgi/HEADER.cgi b/cookbooks/planet/files/default/history_cgi/HEADER.cgi
index 51ac8458141d10f6f9f77b9e4e38f92eda373698..460acd319413e08bc4d1884e3ef8af360ab2903a 100755 (executable)
--- a/cookbooks/planet/files/default/history_cgi/HEADER.cgi
+++ b/cookbooks/planet/files/default/history_cgi/HEADER.cgi
@@ -10,7 +10,7 @@ def nice_size(file):
     MB = 1024. * KB
     GB = 1024. * MB
     TB = 1024. * GB
-    
+
     if size < KB:
         size, suffix = size, ''
     elif size < MB:
@@ -21,7 +21,7 @@ def nice_size(file):
         size, suffix = size/GB, 'GB'
     else:
         size, suffix = size/TB, 'TB'
-    
+
     if size < 10:
         return '%.1f %s' % (round(size,1), suffix)
     else:
@@ -58,16 +58,16 @@ print """
 <html>
  <head>
   <title>Index of /planet/full-history</title>
-  <link href="../../style.css" rel="stylesheet" type="text/css">
+  <link href="https://planet.openstreetmap.org/style.css" rel="stylesheet" type="text/css">
  </head>
  <body>
-<img id="logo" src="../../logo.png" alt="OSM logo" width="128" height="128">
+<img id="logo" src="https://planet.openstreetmap.org/logo.png" alt="OSM logo" width="128" height="128">
 <h1>Planet OSM</h1>
 
 <p>
 The files found here are complete copies of the OpenStreetMap.org
-database, including editing history. These are published under an 
-Open Data Commons Open Database License 1.0 licensed. For more 
+database, including editing history. These are published under an
+Open Data Commons Open Database License 1.0 licensed. For more
 information, <a href="https://wiki.openstreetmap.org/wiki/Planet.osm/full">see the project wiki</a>.
 </p>
 
@@ -94,13 +94,13 @@ information, <a href="https://wiki.openstreetmap.org/wiki/Planet.osm/full">see t
     </td>
     <td>
         <p>
-        You are granted permission to use OpenStreetMap data by 
-        <a href="https://osm.org/copyright">the OpenStreetMap License</a>, which also describes 
+        You are granted permission to use OpenStreetMap data by
+        <a href="https://osm.org/copyright">the OpenStreetMap License</a>, which also describes
         your obligations.
         </p>
         <p>
         You can <a href="https://wiki.openstreetmap.org/wiki/Planet.osm/full#Processing">process the file</a>
-        or extracts with a variety of tools, although some tools for processing OSM data will 
+        or extracts with a variety of tools, although some tools for processing OSM data will
        only work on 'current' planets and will not process a 'history' planet available here.
         </p>
     </td>
@@ -108,7 +108,7 @@ information, <a href="https://wiki.openstreetmap.org/wiki/Planet.osm/full">see t
         <p>
         The complete history planet is extremely large, so you may prefer to use one of
         <a href="https://wiki.openstreetmap.org/wiki/Planet.osm/full#Extracts">the available extracts</a>
-        (individual countries or states) from third parties. 
+        (individual countries or states) from third parties.
         </p>
     </td>
   </tr>
diff --git a/cookbooks/planet/files/default/html/robots.txt b/cookbooks/planet/files/default/html/robots.txt
index 3f3940cbcc8cfa3b6cb627da9535eff99b9fb9bf..806b5ec1853752e627c00776700851f4c02fe04e 100644 (file)
--- a/cookbooks/planet/files/default/html/robots.txt
+++ b/cookbooks/planet/files/default/html/robots.txt
@@ -1,8 +1,7 @@
-#No bz2 chomping bots please
+# No bz2 chomping bots please
 
 User-agent: wget
 Allow: /
 
 User-agent: *
 Disallow: /
-
diff --git a/cookbooks/planet/files/default/replication-cgi/HEADER.cgi b/cookbooks/planet/files/default/replication-cgi/HEADER.cgi
index edde59d2774e94f6c6f005aaaeaeceed9899eee2..269ce0f7235d0fde11398ba6892f22ab33ad77af 100644 (file)
--- a/cookbooks/planet/files/default/replication-cgi/HEADER.cgi
+++ b/cookbooks/planet/files/default/replication-cgi/HEADER.cgi
@@ -4,10 +4,10 @@ print """
 <html>
  <head>
   <title>OpenStreetMap replication diffs</title>
-  <link href="/style.css" rel="stylesheet" type="text/css">
+  <link href="https://planet.openstreetmap.org/style.css" rel="stylesheet" type="text/css">
  </head>
  <body>
-<img id="logo" src="/logo.png" alt="OSM logo" width="128" height="128">
+<img id="logo" src="https://planet.openstreetmap.org/logo.png" alt="OSM logo" width="128" height="128">
 <h1>planet.openstreetmap.org - replication diffs</h1>
 <p>OpenStreetMap is <i>open data</i>, licensed under the <a href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL)</p>
 <p>&nbsp;</p>
Chef configuration management public repo for configuring & maintaining the OpenStreetMap servers.