diff --git a/scripts/synchronize_routing_tables.sh b/scripts/synchronize_routing_tables.sh old mode 100644 new mode 100755 index 699029e..9268bcc --- a/scripts/synchronize_routing_tables.sh +++ b/scripts/synchronize_routing_tables.sh @@ -1,15 +1,9 @@ #!/bin/bash - - cd data # dump des tables de routage -#pg_dump --file osm_roads.sql --host localhost --port 5432 --username osmbr \ -#--no-password --verbose --format=p --no-owner --section=pre-data --section=data --no-privileges --no-tablespaces --no-unlogged-table-data --no-comments \ -#--table public.osm_roads osm - pg_dump --file osm_roads_pgr.sql --host 192.168.56.131 --port 5432 --username redadeg \ --no-password --verbose --format=p --no-owner --section=pre-data --section=data --no-privileges --no-tablespaces --no-unlogged-table-data --no-comments \ --table public.osm_roads_pgr redadeg @@ -24,17 +18,17 @@ pg_dump --file osm_roads_pgr_vertices_pgr.sql --host 192.168.56.131 --port 5432 # on zippe +rm osm_roads_pgr.zip zip osm_roads_pgr.zip osm_roads_pgr.sql osm_roads_pgr_noded.sql osm_roads_pgr_vertices_pgr.sql # on envoi sur le serveur -rsync -av --progress osm_roads_pgr.zip breizhpovh2:/data/www/vhosts/ar-redadeg_openstreetmap_bzh/htdocs/scripts/data/ +#rsync -av --progress osm_roads_pgr.zip breizhpovh2:/data/www/vhosts/ar-redadeg_openstreetmap_bzh/htdocs/scripts/data/ # on envoie des commande pour maj les tables de routage ssh breizhpovh2 "cd /data/www/vhosts/ar-redadeg_openstreetmap_bzh/htdocs/scripts/data/ ; \ -rm osm_roads_pgr.zip osm_roads_pgr.sql osm_roads_pgr_noded.sql osm_roads_pgr_vertices_pgr.sql \ -unzip -f osm_roads_pgr.zip ; \ -psql -U redadeg -d redadeg -c 'DROP TABLE osm_roads_pgr; DROP TABLE osm_roads_pgr_noded; DROP TABLE osm_roads_pgr_vertices_pgr;' +unzip osm_roads_pgr.zip ; \ +psql -U redadeg -d redadeg -c 'DROP TABLE IF EXISTS osm_roads_pgr; DROP TABLE IF EXISTS osm_roads_pgr_noded; DROP TABLE IF EXISTS osm_roads_pgr_vertices_pgr;' \ psql -U redadeg -d redadeg < osm_roads_pgr.sql ; \ psql -U redadeg -d redadeg < osm_roads_pgr_noded.sql ; \ -psql -U redadeg -d redadeg < osm_roads_pgr_vertices_pgr.sql" - +psql -U redadeg -d redadeg < osm_roads_pgr_vertices_pgr.sql ;\ +rm -f osm_roads_pgr.sql osm_roads_pgr_noded.sql osm_roads_pgr_vertices_pgr.sql ;" diff --git a/scripts/update_server_routing_tables.sh b/scripts/update_server_routing_tables.sh deleted file mode 100755 index 91464ce..0000000 --- a/scripts/update_server_routing_tables.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -# depuis le mac - -cd data - -# dump des tables de routage - -#pg_dump --file osm_roads.sql --host localhost --port 5432 --username osmbr \ -#--no-password --verbose --format=p --no-owner --section=pre-data --section=data --no-privileges --no-tablespaces --no-unlogged-table-data --no-comments \ -#--table public.osm_roads osm - -pg_dump --file osm_roads_pgr.sql --host 192.168.56.131 --port 5432 --username redadeg \ ---no-password --verbose --format=p --no-owner --section=pre-data --section=data --no-privileges --no-tablespaces --no-unlogged-table-data --no-comments \ ---table public.osm_roads_pgr redadeg - -pg_dump --file osm_roads_pgr_noded.sql --host 192.168.56.131 --port 5432 --username redadeg \ ---no-password --verbose --format=p --no-owner --section=pre-data --section=data --no-privileges --no-tablespaces --no-unlogged-table-data --no-comments \ ---table public.osm_roads_pgr_noded redadeg - -pg_dump --file osm_roads_pgr_vertices_pgr.sql --host 192.168.56.131 --port 5432 --username redadeg \ ---no-password --verbose --format=p --no-owner --section=pre-data --section=data --no-privileges --no-tablespaces --no-unlogged-table-data --no-comments \ ---table public.osm_roads_pgr_vertices_pgr redadeg - - -# on zippe -zip osm_roads_pgr.zip osm_roads_pgr.sql osm_roads_pgr_noded.sql osm_roads_pgr_vertices_pgr.sql - -# on envoi sur le serveur -rsync -av --progress osm_roads_pgr.zip breizhpovh2:/data/www/vhosts/ar-redadeg_openstreetmap_bzh/htdocs/scripts/data/ - -# on envoie des commande pour maj les tables de routage -ssh breizhpovh2 "cd /data/www/vhosts/ar-redadeg_openstreetmap_bzh/htdocs/scripts/data/ ; \ -unzip -f osm_roads_pgr.zip ; \ -psql -U redadeg -d redadeg -c 'DROP TABLE osm_roads_pgr; DROP TABLE osm_roads_pgr_noded; DROP TABLE osm_roads_pgr_vertices_pgr;' -psql -U redadeg -d redadeg < osm_roads_pgr.sql ; \ -psql -U redadeg -d redadeg < osm_roads_pgr_noded.sql ; \ -psql -U redadeg -d redadeg < osm_roads_pgr_vertices_pgr.sql" -