From 7e569d28e3d5e9d8622da1a6c2d02a4a54c03398 Mon Sep 17 00:00:00 2001 From: Ed Chalstrey Date: Wed, 27 Apr 2022 15:25:05 +0100 Subject: [PATCH 1/3] final steps --- etl/README.md | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/etl/README.md b/etl/README.md index 60ae5bbf..02ab17bc 100644 --- a/etl/README.md +++ b/etl/README.md @@ -25,7 +25,11 @@ The building geometries are sourced from Ordnance Survey (OS) MasterMap (Topogra # :penguin: Making data available to Ubuntu -Before creating or updating a Colouring London database, you'll need to make sure the downloaded OS files are available to the Ubuntu machine where the database is hosted. If you are using Virtualbox, you could host share folder(s) containing the OS files with the VM (e.g. [see these instructions for Mac](https://medium.com/macoclock/share-folder-between-macos-and-ubuntu-4ce84fb5c1ad)). +Before creating or updating a Colouring London database, you'll need to make sure the downloaded OS files are available to the Ubuntu machine where the database is hosted. + +If you are using Virtualbox, you could host share folder(s) containing the OS files with the VM (e.g. [see these instructions for Mac](https://medium.com/macoclock/share-folder-between-macos-and-ubuntu-4ce84fb5c1ad)). + +For a production server hosted on a cloud computing platform (e.g. Azure), you could [use SCP](https://uoa-eresearch.github.io/vmhandbook/doc/copy-file-linux.html). # :new_moon: Creating a Colouring London database from scratch @@ -113,6 +117,8 @@ export PGHOST=localhost export PGDATABASE= ``` +Run any new database migrations from `../migrations` added since the last time the db was updated. + Move into the `etl` directory and set execute permission on all scripts. ```bash @@ -164,3 +170,16 @@ Mark buildings with geometries not present in the update as demolished. ```bash ./mark_demolitions.sh ``` + +#### On a production server + +**TODO:** Update this after PR [#794](https://github.com/colouring-cities/colouring-london/pull/794) + +Run the Colouring London [deployment scripts](https://github.com/colouring-cities/colouring-london-config#deployment). + +Restart PM2. + +```bash +cd /var/www/colouring-london +pm2 start ecosystem.config.js +``` \ No newline at end of file From f75cbe7bd0dde1f820599b637f7f461dfea0187f Mon Sep 17 00:00:00 2001 From: Ed Chalstrey Date: Wed, 27 Apr 2022 15:59:20 +0100 Subject: [PATCH 2/3] update comment --- etl/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etl/README.md b/etl/README.md index 02ab17bc..3eeb5d3e 100644 --- a/etl/README.md +++ b/etl/README.md @@ -117,7 +117,7 @@ export PGHOST=localhost export PGDATABASE= ``` -Run any new database migrations from `../migrations` added since the last time the db was updated. +First make sure to run `git pull` to catch any code changes and run any new database migrations from `../migrations` added since the last time the db was updated. Move into the `etl` directory and set execute permission on all scripts. From 1eb925dec1826e64fb92ecc90a6d38d8515803ae Mon Sep 17 00:00:00 2001 From: Ed Chalstrey Date: Wed, 27 Apr 2022 16:37:04 +0100 Subject: [PATCH 3/3] remove superfluous step --- etl/README.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/etl/README.md b/etl/README.md index 3eeb5d3e..0a5ea250 100644 --- a/etl/README.md +++ b/etl/README.md @@ -175,11 +175,4 @@ Mark buildings with geometries not present in the update as demolished. **TODO:** Update this after PR [#794](https://github.com/colouring-cities/colouring-london/pull/794) -Run the Colouring London [deployment scripts](https://github.com/colouring-cities/colouring-london-config#deployment). - -Restart PM2. - -```bash -cd /var/www/colouring-london -pm2 start ecosystem.config.js -``` \ No newline at end of file +Run the Colouring London [deployment scripts](https://github.com/colouring-cities/colouring-london-config#deployment). \ No newline at end of file