wordpress: Use DOS line ending. Disable WP auto updater

[chef.git] / cookbooks / planet / templates / default / planet-update-file.erb

diff --git a/cookbooks/planet/templates/default/planet-update-file.erb b/cookbooks/planet/templates/default/planet-update-file.erb
index 36786e23248fc360c9de3c7add158ad42f1b97d5..73a778bbaaa812c9bd33455683f0e05b0b41d3d7 100644 (file)
--- a/cookbooks/planet/templates/default/planet-update-file.erb
+++ b/cookbooks/planet/templates/default/planet-update-file.erb
@@ -4,20 +4,21 @@
 
 # setup
 
 
 # setup
 

+SUFFIX="osh.pbf"
+

 PLANETDIR="/var/lib/planet"
 PLANETDIR="/var/lib/planet"

-PLANETPREV="${PLANETDIR}/planet-previous.pbf"
-PLANETCURR="${PLANETDIR}/planet.pbf"
-PLANETNEW="${PLANETDIR}/planet-new.pbf"
-PLANETTMP="${PLANETDIR}/planet-tmp.pbf"
+PLANETPREV="${PLANETDIR}/planet-previous.${SUFFIX}"
+PLANETCURR="${PLANETDIR}/planet.${SUFFIX}"
+PLANETNEW="${PLANETDIR}/planet-new.${SUFFIX}"

 
 

-pyosmium-up-to-date -v -o "$PLANETNEW" "$PLANETCURR"
+pyosmium-up-to-date -vvv -o "$PLANETNEW" "$PLANETCURR"

 retval=$?
 
 while [ $retval -eq 1 ]; do
 retval=$?
 
 while [ $retval -eq 1 ]; do

-    mv "$PLANETNEW" "$PLANETTMP"
-    pyosmium-up-to-date -v -o "$PLANETNEW" "$PLANETTMP"
+    mv "$PLANETCURR" "$PLANETPREV"
+    mv "$PLANETNEW" "$PLANETCURR"
+    pyosmium-up-to-date -vvv -o "$PLANETNEW" "$PLANETCURR"

     retval=$?
     retval=$?

-    rm "$PLANETTMP"

 done
 
 if [ $retval -ne 0 ]; then
 done
 
 if [ $retval -ne 0 ]; then