Rework cplanet file locations

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

diff --git a/cookbooks/cplanet/templates/default/update-planet.erb b/cookbooks/cplanet/templates/default/planet-update-file.erb
similarity index 77%
rename from cookbooks/cplanet/templates/default/update-planet.erb
rename to cookbooks/cplanet/templates/default/planet-update-file.erb
index 6c77eafa60e8a50436cce73a513316a6ed98b6fa..36786e23248fc360c9de3c7add158ad42f1b97d5 100644 (file)
--- a/cookbooks/cplanet/templates/default/update-planet.erb
+++ b/cookbooks/cplanet/templates/default/planet-update-file.erb
@@ -4,18 +4,18 @@
 
 # setup
 
-PLANETDIR="<%= @basedir %>/planet"
+PLANETDIR="/var/lib/planet"
 PLANETPREV="${PLANETDIR}/planet-previous.pbf"
 PLANETCURR="${PLANETDIR}/planet.pbf"
 PLANETNEW="${PLANETDIR}/planet-new.pbf"
 PLANETTMP="${PLANETDIR}/planet-tmp.pbf"
 
-pyosmium-up-to-date -v -o $PLANETNEW $PLANETCURR
+pyosmium-up-to-date -v -o "$PLANETNEW" "$PLANETCURR"
 retval=$?
 
 while [ $retval -eq 1 ]; do
     mv "$PLANETNEW" "$PLANETTMP"
-    pyosmium-up-to-date -v -o $PLANETNEW $PLANETTMP
+    pyosmium-up-to-date -v -o "$PLANETNEW" "$PLANETTMP"
     retval=$?
     rm "$PLANETTMP"
 done
@@ -28,4 +28,3 @@ fi
 
 mv "$PLANETCURR" "$PLANETPREV"
 mv "$PLANETNEW" "$PLANETCURR"
-