From 797bed563e46ac7231b65d2d91133287ee3292dc Mon Sep 17 00:00:00 2001 From: vongomben Date: Wed, 23 Nov 2016 14:33:16 +0100 Subject: [PATCH 1/2] updating documentation not using Vagrant --- docs/tutorial.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/tutorial.md b/docs/tutorial.md index 01ae030..6dbf108 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -10,9 +10,13 @@ You need a checkout of this repository on your machine. Requirements: - ansible 2.0+ +- git + +Optional whether using a virtual machine: + - vagrant - a vagrant provider, *virtualbox* is the more hassle free -- git + ## Rocket.Chat @@ -25,6 +29,12 @@ From the dir containing the checkout of this repository: ansible-galaxy install -r chatlab/ansible/requirements.yml -p chatlab/ansible/roles ``` +If not using Vagrant, run this: + +``` +absible-playbook "chatlab/ansible/rocket_chat.yml" +``` + Let's start with a simple vagrant file: ``` @@ -70,7 +80,7 @@ From inside the virtual machine we are going to install all requirements. Please note that *mysql-server* will require a password for the root user that you'll need later. ``` -sudo apt install build-essential python3.4 python3.4-dev python-virtualenv libjpeg-dev libpq-dev libmysqlclient-dev git python2.7 mysql-server +sudo apt install build-essential python3 python3-dev python-virtualenv libjpeg-dev libpq-dev libmysqlclient-dev git python2.7 mysql-server sudo apt-get clean ``` From edb0f780de649351a364640ebfbce2cebb89d784 Mon Sep 17 00:00:00 2001 From: vongomben Date: Wed, 23 Nov 2016 15:09:31 +0100 Subject: [PATCH 2/2] Update tutorial.md --- docs/tutorial.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/tutorial.md b/docs/tutorial.md index 6dbf108..8e63d7a 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -76,11 +76,15 @@ Connect to the virtual machine: vagrant ssh ``` + + From inside the virtual machine we are going to install all requirements. Please note that *mysql-server* will require a password for the root user that you'll need later. ``` -sudo apt install build-essential python3 python3-dev python-virtualenv libjpeg-dev libpq-dev libmysqlclient-dev git python2.7 mysql-server +sudo add-apt-repository ppa:fkrull/deadsnakes +sudo apt-get update +sudo apt install build-essential python3.4 python3.4-dev python-virtualenv libjpeg-dev libpq-dev libmysqlclient-dev git python2.7 mysql-server sudo apt-get clean ``` @@ -104,7 +108,7 @@ Then we need to create a user that will run the *LabAdmin* application: ``` sudo useradd -M labadmin -sudo mkdir /var/www/labadmin +sudo mkdir -p /var/www/labadmin sudo chown labadmin /var/www/labadmin cd /var/www/labadmin ``` @@ -175,7 +179,8 @@ STATIC_URL = '/labadmin/static/' LOGIN_URL = '/labadmin/accounts/login/' ``` -You also need to update these settings dependings on your environment: +You also need to +these settings dependings on your environment: ``` # See https://docs.djangoproject.com/en/1.10/ref/settings/#databases