From 2a12da74f883b30532c886b4136adff1a4df256c Mon Sep 17 00:00:00 2001
From: Filipp Lepalaan <filipp@mac.com>
Date: Sun, 13 Sep 2015 22:47:49 +0300
Subject: Updated readme

---
 README.md   | 42 +++++++++++++++++++++++++++++++++++++++---
 settings.py |  1 +
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 073e987..545c435 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,19 @@
 Introduction
 ============
+
 Servo is a service management system for Authorised Apple Service Providers.
 
+System Requirements
+===================
+
+The application is written in Python on top of the Django web framework and depends on the latest stable versions of the following components for operation:
+
+- PostgreSQL
+- Memcache
+- RabbitMQ
+- uwsgi
+- Python 2.7
+
 
 Installation
 ============
@@ -10,6 +22,16 @@ Install PostgreSQL, nginx, memcached, rabbitMQ. Then install the necessary Pytho
 
     $ pip install -U -r requirements.pip
 
+Then clone the code:
+
+	$ git clone https://github.com/fpsw/Servo.git my_servo_folder
+	$ cd my_servo_folder
+	$ pip install -U -r requirements.pip
+
+
+Configuration
+=============
+
 Edit local_settings.py (these are settings specific to your installation):
 
 	import logging
@@ -45,7 +67,7 @@ Edit local_settings.py (these are settings specific to your installation):
 	INSTALL_LOCALE = 'sv_SE.UTF-8' # Default setting for locale
 	INSTALL_LANGUAGE = 'se' # Default setting for language
 
-	SERVO_URL = 'http://123.123.123.123' # External IP for SMS delivery reports
+	SERVO_URL = 'http://123.123.123.123' # External IP for SMS delivery reports (if your SMS provider supports them)
 
 	ENABLE_RULES = True # Whether or not you want to run rules
 
@@ -53,10 +75,24 @@ Edit local_settings.py (these are settings specific to your installation):
 
 For testing, you can run Servo without any extra setup:
 
-	cd my_servo_folder
-	python ./manage.py runserver
+	$ cd my_servo_folder
+	$ python ./manage.py runserver
+
+Then fire up your browser and got to http://localhost:8080/
+
+
+Updating
+========
+
+First, back up your database, then:
+
+	$ git pull origin master
+	$ ./manage.py migrate --no-initial-data
+
+After which you should restart your Servo instance.
 
 
 Documentation
 =============
+
 End-user documentation for the system is available [here](https://docs.servoapp.com).
diff --git a/settings.py b/settings.py
index ae1aa80..0529fdf 100644
--- a/settings.py
+++ b/settings.py
@@ -222,6 +222,7 @@ IGNORABLE_404_URLS = (
 
 TEST_RUNNER = 'servo.tests.NoDbTestRunner'
 
+SERVER_EMAIL = 'servo@localhost'
 EMAIL_HOST = 'mail.servoapp.com'
 EMAIL_HOST_PASSWORD = ''
 EMAIL_HOST_USER = ''
-- 
cgit v1.2.3