X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/40851f9e0d229e00f1699a913d9b29a95ae4c496..a8930abf977175e1034465cb4e93d4d3673e366c:/cookbooks/planet/templates/default/users-deleted.erb?ds=sidebyside diff --git a/cookbooks/planet/templates/default/users-deleted.erb b/cookbooks/planet/templates/default/users-deleted.erb index 6360d28c6..1f739d119 100644 --- 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