planet: first copy to s3

[chef.git] / cookbooks / planet / templates / default / users-deleted.erb

diff --git a/cookbooks/planet/templates/default/users-deleted.erb b/cookbooks/planet/templates/default/users-deleted.erb
index 6360d28c6ef568e99fe43b1eaaff656c466b52aa..1f739d1195d3db7e93125b907ad982d866dd8ba4 100644 (file)
--- a/cookbooks/planet/templates/default/users-deleted.erb
+++ b/cookbooks/planet/templates/default/users-deleted.erb
@@ -8,12 +8,12 @@ T=$(mktemp -d -t -p /var/tmp users.XXXXXXXXXX)
 export PGPASSFILE=/etc/replication/users-agreed.conf
 
 echo "# user IDs of deleted users. " > $T/users_deleted
-psql -h <%= node[:web][:readonly_database_host] %> -U planetdiff -t -c "select id from users where status='deleted' by id asc" openstreetmap >> $T/users_deleted
+psql -h <%= node[:web][:readonly_database_host] %> -U planetdiff -t -c "select id from users where status='deleted' order by id asc" openstreetmap >> $T/users_deleted
 
-if cmp -s "${T}/users_deleted "/store/planet/users_deleted.txt"; then
+if cmp -s "${T}/users_deleted" "/store/planet/users_deleted/users_deleted.txt"; then
   : # do nothing
 else
-  cp $T/users_deleted /store/planet/users_deleted.txt
+  cp $T/users_deleted /store/planet/users_deleted/users_deleted.txt
 fi
 
 rm -rf $T