Merge remote-tracking branch 'github/pull/517'

diff --git a/cookbooks/git/templates/default/apache.erb b/cookbooks/git/templates/default/apache.erb
index 30685fad936f7f76446b593092c4e9c9943554a2..3ab6be65eab5c49606c04954b99afd1b2350653f 100644 (file)
--- a/cookbooks/git/templates/default/apache.erb
+++ b/cookbooks/git/templates/default/apache.erb
@@ -53,6 +53,12 @@
         # KeepaliveTimeout longer than git config uploadpack.keepalive 5 second default
         KeepAliveTimeout 20
 
+        RewriteEngine on
+        RewriteRule ^/cgimap\.git.* https://github.com/zerebubuth/openstreetmap-cgimap [QSD,L,R=permanent]
+        # RewriteRule ^/planetdump\.git.* https://github.com/openstreetmap/planetdump [QSD,L,R=permanent]
+        # RewriteRule ^/gpx-import\.git.* https://github.com/openstreetmap/gpx-import [QSD,L,R=permanent]
+        # RewriteRule ^/potlatch2\.git.* https://github.com/openstreetmap/potlatch2 [QSD,L,R=permanent]
+
         ScriptAlias /public /usr/lib/git-core/git-http-backend/public
         ScriptAlias /private /usr/lib/git-core/git-http-backend/private
         Alias /gitweb /usr/share/gitweb

diff --git a/cookbooks/tilelog/recipes/default.rb b/cookbooks/tilelog/recipes/default.rb
index 8151a3bf579032722ce5322dcd02beb81be08f88..9d1935ff4882d803a9f3527e19dbad7b70f7f320 100644 (file)
--- a/cookbooks/tilelog/recipes/default.rb
+++ b/cookbooks/tilelog/recipes/default.rb
@@ -31,7 +31,7 @@ end
 python_package "tilelog" do
   python_virtualenv tilelog_directory
   python_version "3"
-  version "1.3.0"
+  version "1.4.0"
 end
 
 directory tilelog_output_directory do

diff --git a/cookbooks/tilelog/templates/default/tilelog.erb b/cookbooks/tilelog/templates/default/tilelog.erb
index 06014803ded05b24f7885f5ae050bf6a861d1091..86eea918b5fa9034f804563b90305cf83a267b91 100644 (file)
--- a/cookbooks/tilelog/templates/default/tilelog.erb
+++ b/cookbooks/tilelog/templates/default/tilelog.erb
@@ -18,7 +18,7 @@ export AWS_REGION="eu-west-1"
 TILEFILE="tiles-${DATE}.txt.xz"
 HOSTFILE="hosts-${DATE}.csv"
 
-nice -n 19 /opt/tilelog/bin/tilelog --date "${DATE}" \
+nice -n 19 /opt/tilelog/bin/tilelog --date "${DATE}" --generate-success \
   --tile "${TILEFILE}" --host "${HOSTFILE}"
 
 mv "${TILEFILE}" "${HOSTFILE}" "${OUTDIR}"