From 8c03fbbca9d25913ae602e5d398147c2d37a2582 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Fri, 15 Sep 2017 19:15:49 +0300 Subject: [PATCH] Commit missing files --- package.json | 11 +++++++++-- readme.md | 32 +++++++++++++++++++++----------- requirements.production.txt | 1 + requirements.txt | 1 - 4 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 requirements.production.txt diff --git a/package.json b/package.json index 330383e..1fe48ae 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,9 @@ "version": "1.0.0", "description": "A modern web app using a Django backend and an Angular frontend.", "scripts": { - "test": "eslint ." + "test": "eslint . && remark .", + "eslint": "eslint .", + "remark": "remark ." }, "repository": { "type": "git", @@ -12,6 +14,11 @@ "author": "SIK ry", "license": "ISC", "dependencies": { - "eslint": "3.19.0" + "eslint": "3.19.0", + "remark-cli": "^4.0.0", + "remark-preset-lint-recommended": "^3.0.1" + }, + "remarkConfig": { + "plugins": ["remark-preset-lint-recommended"] } } diff --git a/readme.md b/readme.md index 03427a4..72b4e75 100644 --- a/readme.md +++ b/readme.md @@ -32,11 +32,11 @@ git checkout develop ### Dependency list -* Python >3.5 -* PostgreSQL >9.5 -* pip3 -* virtualenv -* npm +* Python >3.5 +* PostgreSQL >9.5 +* pip3 +* virtualenv +* npm Install with apt: ``` @@ -48,14 +48,14 @@ sudo apt install npm ``` More info about PostgreSQL at: -https://www.postgresql.org/ +[https://www.postgresql.org/](https://www.postgresql.org) These packages might be needed on certain platforms: -* python3-dev -* libffi-dev -* python3-cffi -* libssl-dev +* python3-dev +* libffi-dev +* python3-cffi +* libssl-dev ## Create a virtual environment for python @@ -94,7 +94,17 @@ Using address 0.0.0.0 will bind to all IP addresses. ### Visit the page -Visit https://localhost:8000 in your browser! +Visit [https://localhost:8000](https://localhost:8000) in your browser! + +## Running in production + +A good way to run django in production is by using uWSGI. Install uWSGI with: + +``` +pip install -r requirements.production.txt +``` + +Create an uWSGI ini file and run the daemon according to online instructions. ## Development workflow diff --git a/requirements.production.txt b/requirements.production.txt new file mode 100644 index 0000000..496884e --- /dev/null +++ b/requirements.production.txt @@ -0,0 +1 @@ +uWSGI==2.0.14 diff --git a/requirements.txt b/requirements.txt index 434a845..ab2442a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,7 +17,6 @@ djangorestframework==3.5.3 coverage==4.3.4 django-nose==1.4.4 nose-exclude==0.5.0 -uWSGI==2.0.14 psycopg2==2.7.1 django-bootstrap3==8.2.3 django-tables2==1.6.1