Merge branch 'master' into develop

This commit is contained in:
Jan Tuomi
2017-01-12 09:35:35 -05:00
+96 -73
View File
@@ -1,73 +1,96 @@
# SIKWEB 2.0
##Installation
### Install Mariadb and create necessary tables
`sudo apt-get install mariadb-client`
`sudo apt-get install mariadb-server`
`sudo apt-get install mariadb-client`
### Create virtualenvironment for python
virtualenv -p python3 virtualenv.sikweb
### Install py3 dev
`sudo apt-get install python3-dev`
### clone This repo and enter it
git clone url_to_repo
cd url_to_repo
### Activate virtualenv (assuming we are on root of this repo and virtualenv is one step above)
`. ../virtualenv.sikweb/bin/activate`
### install required python modules
`pip install --upgrade pip`
`pip install -r requirements.txt`
### Ubuntu 16.04 users might need these to get rid of errors (mysql_config error for example)
`sudo ln -s /usr/bin/mariadb_config /usr/bin/mysql_config`
`sudo apt-get install libffi6 && sudo apt-get install libffi-dev`
`sudo apt-get install libssl-dev`
`pip install pycrypto`
```SQL
CREATE USER 'sik'@'localhost' IDENTIFIED BY 'jokutmpassu';
CREATE DATABASE sik DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;
GRANT ALL PRIVILEGES ON sik.* TO 'sik'@'localhost';
CREATE DATABASE sik_test DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;
GRANT ALL PRIVILEGES ON sik_test.* TO 'sik'@'localhost';
```
## Configure django's settings
cp sikweb/settings-sample.py sikweb/settings.py
edit database settings from sikweb/settings.py according to what you used above.
run `./manage.py migrate`
you should be now have succesfully setup a devel version of sikweb 2.0
## Running
### Activate virtualenv
assuming we are on root of this repo and virtualenv is one step above:
`. ../virtualenv.sikweb/bin/activate`
### use runserver command
`./manage.py runserver`
`or./manage.py runserver 0.0.0.0:8000` if you need to connect from anywhere else than localhost
# SIKWEB 2.0
## Installation
### Create a virtual environment for python
`virtualenv -p python3 virtualenv.sikweb`
### Clone this repository and enter it
Set up your SSH key authentication in GitLab Profile Settings. Then clone the repository:
```
git clone git@sika.sahkoinsinoorikilta.fi:vtmk/web2.0.git
cd web2.0
```
Change to the development branch:
```
git checkout develop
```
### Activate virtualenv (assuming we are at the root of this repository and virtualenv is one level above)
`. ../virtualenv.sikweb/bin/activate`
### Install Mariadb and create necessary tables
#### Run the following commands to install dependencies and to run the mariadb installation script
```
sudo apt-get install mariadb-server libmysqlclient-dev python3-dev libffi-dev python3-cffi
sudo mysql_secure_installation
# Setup root password and say yes to all other questions
sudo mysql -u root -p
# Log in with your new password
```
#### Create a user called 'sik' with password 'password123' and create the db
**PLEASE CHANGE THE PASSWORD TO SOMETHING MORE SECURE!**
Paste the following into the mysql client prompt:
```SQL
CREATE USER 'sik'@'localhost' IDENTIFIED BY 'password123';
CREATE DATABASE sik DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;
GRANT ALL PRIVILEGES ON sik.* TO 'sik'@'localhost';
CREATE DATABASE sik_test DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;
GRANT ALL PRIVILEGES ON sik_test.* TO 'sik'@'localhost';
```
### Install required python modules
```
pip install --upgrade pip
pip install -r requirements.txt
```
## Configure Django settings
`cp sikweb/settings-sample.py sikweb/settings.py`
Change the following fields in sikweb/settings.py:
```
NAME (default: sik)
USER (default: sik)
PASSWORD (default: password123)
```
under DATABASES -> 'default' around line 80.
## Run migrations
`./manage.py migrate`
You should be now have succesfully set up a development version of SikWeb 2.0
## Running
### Activate virtualenv
Assuming we are on root of this repo and virtualenv is one step above:
`. ../virtualenv.sikweb/bin/activate`
### Use runserver command
`./manage.py runserver`
or
`or./manage.py runserver 0.0.0.0:8000`
if you need to connect from anywhere else than localhost.