Merge pull request #1089 from colouring-cities/colouring-core-fixes
Colouring core fixes
This commit is contained in:
Mike Simpson
GitHub
commit
fc2cc07a1c
2
.github/ISSUE_TEMPLATE/bug_report.md
vendored
2
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@ -1,6 +1,6 @@
|
||||
---
|
||||
name: Bug report
|
||||
about: Describe a problem to help us improve Colouring London
|
||||
about: Describe a problem to help us improve Colouring Cities
|
||||
title: ''
|
||||
labels: ''
|
||||
assignees: ''
|
||||
|
||||
@ -6,8 +6,8 @@ The format is `fix/123-short-description`, `feature/description` or `feature/123
|
||||
|
||||
|
||||
For example
|
||||
* [PR 648](https://github.com/colouring-london/colouring-london/pull/684) used branch `fix/681-land-use-edit` referencing [#681](https://github.com/colouring-london/colouring-london/issues/681)
|
||||
* [PR 625](https://github.com/colouring-london/colouring-london/pull/625) used branch `feature/verification`
|
||||
* [PR 648](https://github.com/colouring-cities/colouring-core/pull/684) used branch `fix/681-land-use-edit` referencing [#681](https://github.com/colouring-cities/colouring-core/issues/681)
|
||||
* [PR 625](https://github.com/colouring-cities/colouring-core/pull/625) used branch `feature/verification`
|
||||
|
||||
## Commits
|
||||
|
||||
|
||||
18
README.md
18
README.md
@ -1,6 +1,6 @@
|
||||
# Colouring Cities Core Platform
|
||||
[](#contributors)
|
||||
|
||||
|
||||
|
||||
How many buildings are there in a city? What are their characteristics? Where
|
||||
are they located and how do they contribute to the city? How adaptable are
|
||||
@ -26,9 +26,17 @@ for download under a liberal open data license
|
||||
|
||||
## Setup and run
|
||||
|
||||
#### Customise the Application:
|
||||
|
||||
You can customise the Colouring Cities application by changing the values in the following file:
|
||||
|
||||
`app/src/cc-config.json`
|
||||
|
||||
For more information on the config system, see [docs/configuring-colouring-cities](docs/configuring-colouring-cities.md).
|
||||
|
||||
#### Test the application:
|
||||
|
||||
You can try out the Colouring London application by setting up your own development environment, which includes the option to load test data from OpenStreetMaps (OSM). See [docs/setup-dev-environment](docs/setup-dev-environment.md).
|
||||
You can try out the Colouring Cities application by setting up your own development environment, which includes the option to load test data from OpenStreetMaps (OSM). See [docs/setup-dev-environment](docs/setup-dev-environment.md).
|
||||
|
||||
_Last updated March 2022_
|
||||
|
||||
@ -50,8 +58,8 @@ and technical support.
|
||||
|
||||
## License
|
||||
|
||||
Colouring London
|
||||
Copyright (C) 2018-2022 Tom Russell and Colouring London contributors
|
||||
Colouring London/Colouring Cities
|
||||
Copyright (C) 2018-2022 Tom Russell and Colouring Cities contributors
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -107,6 +115,6 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/all-contri
|
||||
|
||||
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
|
||||
|
||||
Even more thanks go to Colouring London contributors, funders, project partners, consultees,
|
||||
Even more thanks go to Colouring Cities contributors, funders, project partners, consultees,
|
||||
advisers, supporters and friends - [everyone involved in the
|
||||
project](https://www.pages.colouring.london/whoisinvolved).
|
||||
|
||||
@ -16,7 +16,7 @@ const ContactPage = () => (
|
||||
|
||||
<p> You can send us comments or ask questions on our discussion threads at <a href="https://discuss.colouring.london/">https://discuss.colouring.london/</a>.</p>
|
||||
|
||||
<p> To view our technical site and platform code please visit Github at: <a href={ccconfig.githubURL}>https://github.com/colouring-london/colouring-london</a>.</p>
|
||||
<p> To view our technical site and platform code please visit Github at: <a href={ccconfig.githubURL}>https://github.com/colouring-cities/colouring-core</a>.</p>
|
||||
|
||||
<p>For press enquiries please contact <a href="https://www.turing.ac.uk/contact-us/press-office">The Alan Turing Institute press office</a></p>
|
||||
|
||||
|
||||
@ -54,7 +54,7 @@ const ContributorAgreementPage : React.SFC<any> = () => (
|
||||
<h3 className='h3'>What you are contributing to</h3>
|
||||
|
||||
<p>
|
||||
Colouring {config.cityName} is a free knowledge exchange platform and open database designed for public use. It has been set up to support a whole-of-society approach to improving the sustainability, resilience and inclusivity of cities. Colouring {config.cityName} is also part of the international Colouring Cities Research Programme (CCRP) run at the Alan Turing Institute. Its design is guided by principles set out in the United Nations New Urban Agenda, the Open Data Charter, the General Data Protection Regulation (GDPR), The Gemini Principles, the Open Data Institute's recommendations on personal data and data infrastructure, and specific Articles within the Declaration of Human rights. These are discussed on our <a href="https://github.com/colouring-london/colouring-london/issues/687">'Data ethics'</a> page, where we also use the Open Data Institute's data ethics canvas to answer questions on how we use and manage our data. We capture spatial statistics and do not collect text or images, though images may be integrated in the future. The type of spatial data we collect can be viewed by clicking on each data category, on 'Info' buttons and on the 'Building data categories' page. We are also planning a 'Showcase section' to enable platform users to share, and view, ways in which Colouring {config.cityName} data are used.
|
||||
Colouring {config.cityName} is a free knowledge exchange platform and open database designed for public use. It has been set up to support a whole-of-society approach to improving the sustainability, resilience and inclusivity of cities. Colouring {config.cityName} is also part of the international Colouring Cities Research Programme (CCRP) run at the Alan Turing Institute. Its design is guided by principles set out in the United Nations New Urban Agenda, the Open Data Charter, the General Data Protection Regulation (GDPR), The Gemini Principles, the Open Data Institute's recommendations on personal data and data infrastructure, and specific Articles within the Declaration of Human rights. These are discussed on our <a href="https://github.com/colouring-cities/colouring-core/issues/687">'Data ethics'</a> page, where we also use the Open Data Institute's data ethics canvas to answer questions on how we use and manage our data. We capture spatial statistics and do not collect text or images, though images may be integrated in the future. The type of spatial data we collect can be viewed by clicking on each data category, on 'Info' buttons and on the 'Building data categories' page. We are also planning a 'Showcase section' to enable platform users to share, and view, ways in which Colouring {config.cityName} data are used.
|
||||
</p>
|
||||
|
||||
<h3 className='h3'>Diversity and inclusivity</h3>
|
||||
|
||||
@ -35,7 +35,7 @@ export const Login: React.FC = () => {
|
||||
<InfoBox msg={msgText}>
|
||||
<br/>Please <a href="https://discuss.colouring.london/">discuss
|
||||
suggestions for improvements</a> and <a
|
||||
href="https://github.com/colouring-london/colouring-london/issues">
|
||||
href="https://github.com/colouring-cities/colouring-core/issues">
|
||||
report issues or problems</a>.
|
||||
</InfoBox>
|
||||
<ErrorBox msg={error} />
|
||||
|
||||
@ -38,7 +38,7 @@ export const SignUp: React.FC = () => {
|
||||
<InfoBox msg={msgName}>
|
||||
<br/>Please <a href="https://discuss.colouring.london/">discuss
|
||||
suggestions for improvements</a> and <a
|
||||
href="https://github.com/colouring-london/colouring-london/issues">
|
||||
href="https://github.com/colouring-cities/colouring-core/issues">
|
||||
report issues or problems</a>.
|
||||
</InfoBox>
|
||||
<p>
|
||||
|
||||
47
docs/configuring-colouring-cities.md
Normal file
47
docs/configuring-colouring-cities.md
Normal file
@ -0,0 +1,47 @@
|
||||
# Configuring the Colouring Cities Core Platform
|
||||
|
||||
## Introduction
|
||||
|
||||
We have added new configuration options to the Colouring Cities Core Platform, in order to make it easier to customise the platform for different cities/countries without unnecessary custom code and diverging codebases.
|
||||
|
||||
This is done using configuration files, which are described in detail later in this document.
|
||||
|
||||
Our hope is that every project in the Colouring Cities Research Programme (CCRP) will use this method to customise the interfaces of the Colouring Cities Platform for their own use as the programme moves forwards.
|
||||
|
||||
## The Config Files
|
||||
The configuration files are located here:
|
||||
|
||||
`app/src/cc-config.ts`
|
||||
`app/src/cc-config.json`
|
||||
|
||||
### > cc-config.json
|
||||
The JSON file contains the definition of the values of the variables.
|
||||
|
||||
Currently, these parameters are:
|
||||
|
||||
- **'cityName'** (string) - The name of the city/country.
|
||||
- **'projectBlurb'** (string) - A line of text describing the relationship of the project to the CCRP
|
||||
- **'githubURL'** (string) - The URL of the *project specific* GitHub repository
|
||||
- **'privacyStatement'** (string) - A description of where user data is stored and what safeguards are in place
|
||||
|
||||
These text strings are then used at various points throughout the Platform's interface.
|
||||
|
||||
There are also some other values to customise the behaviour of the application:
|
||||
|
||||
- **'initialMapPosition'** (string) - The default latitude and longitude of the map when the page loads.
|
||||
- **'initialZoomLevel'** (string) - The default zoom level when the map loads.
|
||||
|
||||
For example, the JSON file for Colouring London looks like this:
|
||||
|
||||
|
||||
|
||||
### > cc-config.ts
|
||||
This file contains the declaration of the variables that can be configured.
|
||||
|
||||
If you want to add additional parameters into the configuration framework, then they will need to be declared in this file and then defined in the JSON file (see below).
|
||||
|
||||
---
|
||||
|
||||
**NOTE: Any additional project specific text strings and parameters should be added to this file and the JSON file.**
|
||||
|
||||
*REQUEST: If you find any Colouring London-specific text or values, please report them or create a pull request to move them into the configuration framework.*
|
||||
BIN
docs/images/cc-config-json.jpg
Normal file
BIN
docs/images/cc-config-json.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 47 KiB |
@ -2,7 +2,10 @@
|
||||
|
||||
### WARNING: Setup document suitable for development environment, not production server
|
||||
|
||||
This document is intended to guide you through setting up a local development environment for the Colouring London application. This guide assumes you already have either already have access to an machine with Ubuntu 18.04 installed, or can use VirtualBox to set up an Ubuntu virtual machine as below.
|
||||
This document is intended to guide you through setting up a local development environment for the Colouring Cities application. This guide assumes you already have either already have access to an machine with Ubuntu 18.04 installed, or can use VirtualBox to set up an Ubuntu virtual machine as below.
|
||||
|
||||
#### Note
|
||||
This guide assumes you are working with the ['colouring-core'](https://github.com/colouring-cities/colouring-core) repository. If you are creating your own fork, or want to use a custom city name, then you may wish to change `'colouring-core'` to `'colouring-[your city name]'`.
|
||||
|
||||
<details>
|
||||
<summary>
|
||||
@ -46,7 +49,7 @@ ssh <linuxusername>@localhost -p 4022
|
||||
|
||||
- [:tulip: Installing the tools and components](#tulip-installing-the-tools-and-components)
|
||||
- [:red_circle: Installing PostgreSQL](#red_circle-installing-postgresql)
|
||||
- [:rainbow: Installing Colouring London](#rainbow-installing-colouring-london)
|
||||
- [:rainbow: Installing Colouring Cities Core Platform](#rainbow-installing-colouring-cities-core-platform)
|
||||
- [:arrow_down: Installing Node.js](#arrow_down-installing-nodejs)
|
||||
- [:large_blue_circle: Configuring PostgreSQL](#large_blue_circle-configuring-postgresql)
|
||||
- [:space_invader: Create an empty database](#space_invader-create-an-empty-database)
|
||||
@ -99,15 +102,15 @@ and additional geo-spatial tools
|
||||
sudo apt-get install -y gdal-bin libspatialindex-dev libgeos-dev libproj-dev
|
||||
```
|
||||
|
||||
### :rainbow: Installing Colouring London
|
||||
### :rainbow: Installing Colouring Cities Core Platform
|
||||
|
||||
Now clone the `colouring-london` codebase.
|
||||
Now clone the `colouring-core` codebase.
|
||||
|
||||
```bash
|
||||
cd ~ && git clone https://github.com/colouring-cities/colouring-london.git
|
||||
cd ~ && git clone https://github.com/colouring-cities/colouring-core.git
|
||||
```
|
||||
|
||||
**Note:** We assume here that you will clone the repo into the home directory of your Ubuntu installation. Watch out for later commands in this guide that assume the repo is located at `~/colouring-london` and modify the path if appropriate.
|
||||
**Note:** We assume here that you will clone the repo into the home directory of your Ubuntu installation. Watch out for later commands in this guide that assume the repo is located at `~/colouring-core` and modify the path if appropriate.
|
||||
|
||||
### :arrow_down: Installing Node.js
|
||||
|
||||
@ -185,7 +188,7 @@ sudo -u postgres psql -c "SELECT 1 FROM pg_user WHERE usename = '<username>';" |
|
||||
```
|
||||
|
||||
<details>
|
||||
<summary>Note for "Colouring London" devs</summary><p></p>
|
||||
<summary>Note for "Colouring Cities" devs</summary><p></p>
|
||||
|
||||
If you intend to load the full CL database from a dump file into your dev environment, run the above `psql` command with `<username>` as "cldbadmin" and use that username in subsequent steps, but also run the above a second time with `<username>` as "clwebapp" (see section [:house: Loading the building data](#house-loading-the-building-data) for more details).
|
||||
|
||||
@ -193,7 +196,7 @@ If you intend to load the full CL database from a dump file into your dev enviro
|
||||
|
||||
### :space_invader: Create an empty database
|
||||
|
||||
Now create an empty database configured with geo-spatial tools. The database name (`<colouringlondondb>`) is arbitrary.
|
||||
Now create an empty database configured with geo-spatial tools. The database name (`<colouringcitiesdb>`) is arbitrary.
|
||||
|
||||
Set environment variables, which will simplify running subsequent `psql` commands.
|
||||
|
||||
@ -201,13 +204,13 @@ Set environment variables, which will simplify running subsequent `psql` command
|
||||
export PGPASSWORD=<pgpassword>
|
||||
export PGUSER=<username>
|
||||
export PGHOST=localhost
|
||||
export PGDATABASE=<colouringlondondb>
|
||||
export PGDATABASE=<colouringcitiesdb>
|
||||
```
|
||||
|
||||
Create the database.
|
||||
|
||||
```bash
|
||||
sudo -u postgres psql -c "SELECT 1 FROM pg_database WHERE datname = '<colouringlondondb>';" | grep -q 1 || sudo -u postgres createdb -E UTF8 -T template0 --locale=en_US.utf8 -O <username> <colouringlondondb>
|
||||
sudo -u postgres psql -c "SELECT 1 FROM pg_database WHERE datname = '<colouringcitiesdb>';" | grep -q 1 || sudo -u postgres createdb -E UTF8 -T template0 --locale=en_US.utf8 -O <username> <colouringcitiesdb>
|
||||
```
|
||||
|
||||
```bash
|
||||
@ -230,7 +233,7 @@ Now install the required Node packages. This needs to done from the `app` direct
|
||||
local repository, so that it can read from the `package.json` file.
|
||||
|
||||
```bash
|
||||
cd ~/colouring-london/app
|
||||
cd ~/colouring-core/app
|
||||
npm install
|
||||
```
|
||||
|
||||
@ -244,7 +247,7 @@ sudo apt-get install -y python3 python3-pip python3-dev python3-venv
|
||||
|
||||
## :house: Loading the building data
|
||||
|
||||
There are several ways to create the Colouring London database in your environment. The simplest way if you are just trying out the application would be to use test data from OSM, but otherwise you should follow one of the instructions below to create the full database either from scratch, or from a previously made db (via a dump file).
|
||||
There are several ways to create the Colouring Cities database in your environment. The simplest way if you are just trying out the application would be to use test data from OSM, but otherwise you should follow one of the instructions below to create the full database either from scratch, or from a previously made db (via a dump file).
|
||||
|
||||
To create the full database from scratch, follow [these instructions](../etl/README.md), otherwise choose one of the following:
|
||||
|
||||
@ -256,7 +259,7 @@ If you are a developer on the Colouring London project (or another Colouring Cit
|
||||
Log into the environment where your production database is kept and create a dump file from the db.
|
||||
|
||||
```bash
|
||||
pg_dump <colouringlondondb> > <dumpfile>
|
||||
pg_dump <colouringcitiesdb> > <dumpfile>
|
||||
```
|
||||
|
||||
You should then download the file to the machine where you are setting up your development environment. If you are using Virtualbox, you could host share the dump file with the VM via a shared folder (e.g. [see these instructions for Mac](https://medium.com/macoclock/share-folder-between-macos-and-ubuntu-4ce84fb5c1ad)).
|
||||
@ -269,7 +272,7 @@ psql < <dumpfile>
|
||||
|
||||
Alternatively, if you get errors using the above command, use pg_restore:
|
||||
```bash
|
||||
pg_restore -d <colouringlondondb> <dumpfile>
|
||||
pg_restore -d <colouringcitiesdb> <dumpfile>
|
||||
```
|
||||
|
||||
#### Run migrations
|
||||
@ -278,13 +281,13 @@ Now run all 'up' migrations to create tables, data types, indexes etc. The `.sql
|
||||
do this are located in the `migrations` folder of your local repository.
|
||||
|
||||
```bash
|
||||
ls ~/colouring-london/migrations/*.up.sql 2>/dev/null | while read -r migration; do psql < $migration; done;
|
||||
ls ~/colouring-core/migrations/*.up.sql 2>/dev/null | while read -r migration; do psql < $migration; done;
|
||||
```
|
||||
|
||||
Again, if you get errors, you may need to manually specify the database name
|
||||
|
||||
```bash
|
||||
ls ~/colouring-london/migrations/*.up.sql 2>/dev/null | while read -r migration; do psql -d <colouringlondondb> < $migration; done;
|
||||
ls ~/colouring-core/migrations/*.up.sql 2>/dev/null | while read -r migration; do psql -d <colouringcitiesdb> < $migration; done;
|
||||
```
|
||||
</details>
|
||||
|
||||
@ -295,17 +298,17 @@ This section shows how to load test buildings into the application from OpenStre
|
||||
|
||||
#### Load OpenStreetMap test polygons
|
||||
|
||||
Create a virtual environment for python in the `etl` folder of your repository. In the following example we have name the virtual environment *colouringlondon* but it can have any name.
|
||||
Create a virtual environment for python in the `etl` folder of your repository. In the following example we have name the virtual environment *colouringcities* but it can have any name.
|
||||
|
||||
```bash
|
||||
cd ~/colouring-london/etl
|
||||
pyvenv colouringlondon
|
||||
cd ~/colouring-core/etl
|
||||
pyvenv colouringcities
|
||||
```
|
||||
|
||||
Activate the virtual environment so we can install python packages into it.
|
||||
|
||||
```bash
|
||||
source colouringlondon/bin/activate
|
||||
source colouringcities/bin/activate
|
||||
```
|
||||
|
||||
Install python pip package manager and related tools.
|
||||
@ -321,7 +324,7 @@ Install the required python packages.
|
||||
pip install -r requirements.txt
|
||||
```
|
||||
|
||||
To help test the Colouring London application, `get_test_polygons.py` will attempt to save a small (1.5km²) extract from OpenStreetMap to a format suitable for loading to the database.
|
||||
To help test the Colouring Cities application, `get_test_polygons.py` will attempt to save a small (1.5km²) extract from OpenStreetMap to a format suitable for loading to the database.
|
||||
|
||||
Download the test data.
|
||||
|
||||
@ -341,7 +344,7 @@ Now run all 'up' migrations to create tables, data types, indexes etc. The `.sql
|
||||
do this are located in the `migrations` folder of your local repository.
|
||||
|
||||
```bash
|
||||
ls ~/colouring-london/migrations/*.up.sql 2>/dev/null | while read -r migration; do psql < $migration; done;
|
||||
ls ~/colouring-core/migrations/*.up.sql 2>/dev/null | while read -r migration; do psql < $migration; done;
|
||||
```
|
||||
|
||||
#### Load buildings
|
||||
@ -366,7 +369,7 @@ Now we are ready to run the application.
|
||||
First enter the app directory.
|
||||
|
||||
```bash
|
||||
cd ~/colouring-london/app
|
||||
cd ~/colouring-core/app
|
||||
```
|
||||
|
||||
Then create a folder for the tilecache.
|
||||
@ -380,7 +383,7 @@ Create some additional variables for running the application (the `APP_COOKIE_SE
|
||||
```bash
|
||||
export PGPORT=5432
|
||||
export APP_COOKIE_SECRET=123456
|
||||
export TILECACHE_PATH=~/colouring-london/app/tilecache
|
||||
export TILECACHE_PATH=~/colouring-core/app/tilecache
|
||||
```
|
||||
|
||||
Finally, simply run the application with npm.
|
||||
@ -396,7 +399,7 @@ Specify variables
|
||||
</summary>
|
||||
|
||||
```bash
|
||||
PGPASSWORD=<pgpassword> PGDATABASE=<colouringlondondb> PGUSER=<username> PGHOST=localhost PGPORT=5432 APP_COOKIE_SECRET=123456 TILECACHE_PATH=~/colouring-london/app/tilecache npm start
|
||||
PGPASSWORD=<pgpassword> PGDATABASE=<colouringcitiesdb> PGUSER=<username> PGHOST=localhost PGPORT=5432 APP_COOKIE_SECRET=123456 TILECACHE_PATH=~/colouring-core/app/tilecache npm start
|
||||
```
|
||||
|
||||
</details><p></p>
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
# Setting Up A Production Environment
|
||||
|
||||
#### Note
|
||||
This guide assumes you are working with the ['colouring-core'](https://github.com/colouring-cities/colouring-core) repository. If you are creating your own fork, or want to use a custom city name, then you may wish to change `'colouring-core'` to `'colouring-[your city name]'`.
|
||||
|
||||
#### Preliminaries
|
||||
|
||||
@ -42,13 +44,13 @@ Install Nginx
|
||||
`sudo apt install nginx`
|
||||
|
||||
|
||||
Clone the remote Colouring London GitHub repository into `/var/www`
|
||||
Clone the remote Colouring Cities GitHub repository into `/var/www`
|
||||
|
||||
`cd /var/www`
|
||||
|
||||
`sudo git clone https://github.com/colouring-london/colouring-london.git`
|
||||
`sudo git clone https://github.com/colouring-cities/colouring-core.git`
|
||||
|
||||
Create a system user (`nodeapp`) to `chown` the `colouring-london` directory
|
||||
Create a system user (`nodeapp`) to `chown` the `colouring-core` directory
|
||||
|
||||
`useradd -r -s /bin/nologin nodeapp`
|
||||
|
||||
@ -56,13 +58,13 @@ Add the current user to the `nodeapp` group
|
||||
|
||||
`sudo usermod -a -G nodeapp <your_ubuntu_username>`
|
||||
|
||||
Make the `nodeapp` user/group `chown` the `colouring-london` directory and its subdirectories
|
||||
Make the `nodeapp` user/group `chown` the `colouring-core` directory and its subdirectories
|
||||
|
||||
`sudo chown -R nodeapp:nodeapp /var/www/colouring-london`
|
||||
`sudo chown -R nodeapp:nodeapp /var/www/colouring-core`
|
||||
|
||||
Now set appropriate permissions on the `colouring-london` directory
|
||||
Now set appropriate permissions on the `colouring-core` directory
|
||||
|
||||
`sudo chmod -R 775 /var/www/colouring-london`
|
||||
`sudo chmod -R 775 /var/www/colouring-core`
|
||||
|
||||
|
||||
***
|
||||
@ -121,7 +123,7 @@ Now upgrade the `npm` package manager to the most recent release with global pri
|
||||
|
||||
Now install the required Node packages as designated in `package.json`
|
||||
|
||||
`cd /var/www/colouring-london/app && npm install`
|
||||
`cd /var/www/colouring-core/app && npm install`
|
||||
|
||||
|
||||
***
|
||||
@ -152,20 +154,20 @@ Create a distinct Postgres user
|
||||
`sudo -u postgres psql -c "SELECT 1 FROM pg_user WHERE usename = '<postgres_username>';" | grep -q 1 || sudo -u postgres psql -c "CREATE ROLE <postgres_username> SUPERUSER LOGIN PASSWORD '<postgres_password>';"`
|
||||
|
||||
|
||||
Create default colouring london database
|
||||
Create default colouring cities database
|
||||
|
||||
`sudo -u postgres psql -c "SELECT 1 FROM pg_database WHERE datname = 'colouringlondondb';" | grep -q 1 || sudo -u postgres createdb -E UTF8 -T template0 --locale=en_US.utf8 -O <postgres_username> colouringlondondb`
|
||||
`sudo -u postgres psql -c "SELECT 1 FROM pg_database WHERE datname = 'colouringcitiesdb';" | grep -q 1 || sudo -u postgres createdb -E UTF8 -T template0 --locale=en_US.utf8 -O <postgres_username> colouringcitiesdb`
|
||||
|
||||
`psql -d colouringlondondb -U <postgres_username> -c "create extension postgis;"`
|
||||
`psql -d colouringcitiesdb -U <postgres_username> -c "create extension postgis;"`
|
||||
|
||||
`psql -d colouringlondondb -U <postgres_username> -c "create extension pgcrypto;"`
|
||||
`psql -d colouringcitiesdb -U <postgres_username> -c "create extension pgcrypto;"`
|
||||
|
||||
`psql -d colouringlondondb -U <postgres_username> -c "create extension pg_trgm;"`
|
||||
`psql -d colouringcitiesdb -U <postgres_username> -c "create extension pg_trgm;"`
|
||||
|
||||
|
||||
Import data from the most recent colouring london database dump
|
||||
Import data from the most recent colouring cities database dump
|
||||
|
||||
`pg_restore --no-privileges --no-owner --username "<postgres_username>" --dbname "colouringlondondb" --clean "<path/to/database/dump/file>"`
|
||||
`pg_restore --no-privileges --no-owner --username "<postgres_username>" --dbname "colouringcitiesdb" --clean "<path/to/database/dump/file>"`
|
||||
|
||||
|
||||
***
|
||||
@ -196,7 +198,7 @@ Now edit `sites-available/default` to create a minimal Nginx configuration to te
|
||||
server {
|
||||
listen 80 default_server;
|
||||
listen [::]:80 default_server;
|
||||
server_name colouring-london;
|
||||
server_name colouring-core;
|
||||
|
||||
location / {
|
||||
proxy_pass http://localhost:3000/;
|
||||
@ -220,19 +222,19 @@ If all is well, restart Nginx
|
||||
|
||||
Test out the configuration
|
||||
|
||||
`cd /var/www/colouring-london/app`
|
||||
`cd /var/www/colouring-core/app`
|
||||
|
||||
|
||||
`npm run build`
|
||||
|
||||
|
||||
`PGPASSWORD=<postgres_password> PGDATABASE=colouringlondondb PGUSER=<postgres_username> PGHOST=localhost PGPORT=5432 APP_COOKIE_SECRET=<secret> npm run start:prod`
|
||||
`PGPASSWORD=<postgres_password> PGDATABASE=colouringcitiesdb PGUSER=<postgres_username> PGHOST=localhost PGPORT=5432 APP_COOKIE_SECRET=<secret> npm run start:prod`
|
||||
|
||||
Now open a browser window on a client machine and navigate to the IP Address of your VM
|
||||
|
||||
`http://<ip_address_of_vm>`
|
||||
|
||||
You should see the Colouring London homepage.
|
||||
You should see the Colouring Cities homepage.
|
||||
|
||||
|
||||
***
|
||||
@ -255,7 +257,7 @@ Perform a global install of PM2
|
||||
|
||||
Create an `ecosystem.config.js` file from the template file
|
||||
|
||||
`cd /var/www/colouring-london`
|
||||
`cd /var/www/colouring-core`
|
||||
|
||||
`nano ecosystem.config.template.js`
|
||||
|
||||
@ -268,18 +270,18 @@ Create an `ecosystem.config.js` file from the template file
|
||||
module.exports = {
|
||||
apps: [
|
||||
{
|
||||
name: "colouringlondon",
|
||||
name: "colouringcities",
|
||||
script: "./app/build/server.js",
|
||||
instances: 6,
|
||||
env: {
|
||||
NODE_ENV: "production",
|
||||
PGHOST: "localhost",
|
||||
PGPORT: 5432,
|
||||
PGDATABASE: "colouringlondondb",
|
||||
PGDATABASE: "colouringcitiesdb",
|
||||
PGUSER: "<postgres_username>",
|
||||
PGPASSWORD: "<postgres_password>",
|
||||
APP_COOKIE_SECRET: "<longrandomsecret>",
|
||||
TILECACHE_PATH: "/var/www/colouring-london/app/tilecache"
|
||||
TILECACHE_PATH: "/var/www/colouring-core/app/tilecache"
|
||||
}
|
||||
}
|
||||
]
|
||||
@ -288,9 +290,9 @@ Create an `ecosystem.config.js` file from the template file
|
||||
Edit the above file as appropriate and save as `ecosystem.config.js`
|
||||
|
||||
|
||||
Start the colouring-london app
|
||||
Start the colouring-core app
|
||||
|
||||
`cd /var/www/colouring-london`
|
||||
`cd /var/www/colouring-core`
|
||||
|
||||
`pm2 start ecosystem.config.js`
|
||||
|
||||
@ -298,9 +300,9 @@ Open a browser window on a client machine and navigate to the IP Address of your
|
||||
|
||||
`http://<ip_address_of_vm>`
|
||||
|
||||
You should see the Colouring London homepage.
|
||||
You should see the Colouring Cities homepage.
|
||||
|
||||
To stop the colouring-london app type:
|
||||
To stop the colouring-core app type:
|
||||
|
||||
`pm2 stop ecosystem.config.js`
|
||||
|
||||
@ -311,14 +313,14 @@ To stop the colouring-london app type:
|
||||
|
||||
Install requirements for the maintenance Python scripts
|
||||
|
||||
`cd /var/www/colouring-london/maintenance`
|
||||
`cd /var/www/colouring-core/maintenance`
|
||||
|
||||
`sudo pip3 install -r requirements.txt`
|
||||
|
||||
The maintenance scripts might need environment variables present at the time of execution, notably the database connection details.
|
||||
If running the scripts manually, the variables can be provided just before execution, for example
|
||||
|
||||
`PGHOST=localhost PGPORT=5432 PGDATABASE=dbname PGUSER=username PGPASSWORD=secretpassword EXTRACTS_DIRECTORY=/var/www/colouring-london/downloads python3 maintenance/extract_data/extract_data.py`
|
||||
`PGHOST=localhost PGPORT=5432 PGDATABASE=dbname PGUSER=username PGPASSWORD=secretpassword EXTRACTS_DIRECTORY=/var/www/colouring-core/downloads python3 maintenance/extract_data/extract_data.py`
|
||||
|
||||
If the maintenance script is to be run on a schedule, the variables should be loaded before running the script, for example from a `.env` file.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user