Skip to content

Commit

Permalink
updated uSurvey docs
Browse files Browse the repository at this point in the history
  • Loading branch information
antsmc2 committed Oct 5, 2016
1 parent 520fbee commit 1a8b99f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
14 changes: 6 additions & 8 deletions docs/deployment_guide.md
Expand Up @@ -21,22 +21,20 @@ The uSurvey solution is composed of the following software components:
5. Application framework itself is django
6. For web server, Nginx is the recommended choice. A sample configuration has been added in the project folder (nginx.snippet file).

Deployment
----------
Deployment Considerations
-------------------------

This section discusses deployment considerations for uSurvey. For information on how to install uSurvey on a machine, see the [installation instruction](./installation.md "Installation Instruction")

###Development Server

####Minimum Requirements

For development purpose, please see following considerations:

* uSurvey has been tested on Ubuntu and OS X. However it should run on most Linux machines (since there are no distribution specific dependency).

* Minimum of 1GB RAM, 1 CPU core, 20GB disk space is required for setup and testing.
* Minimum of 1GB RAM, 1.6GHz 1 CPU core, 20GB disk space is required for setup and testing.

* Postgres and redis-server needs to be installed and should be running (all can run on same machine)
* Postgres and redis-server needs to be installed and should be running (all can run on same machine, but you'll get better experience with higher RAM and CPU specs in that case)

* It helps to install python-dev, libxml2-dev, libxslt1-dev, zlib1g-dev and libffi-dev (for a debian based system, the command would be *sudo apt-get install python-dev libxml2-dev libxslt1-dev zlib1g-dev libffi-dev*)

Expand All @@ -58,13 +56,13 @@ Sizing considerations for infrastructure would largely depend on the expected tr
For a typical production setup for a self sufficient server instance capable of handling a million hits per day, uSurvey requires:

* A Linux machine (tested on Ubuntu 12+ and Mac Os X)
* 8GB RAM, Octa-core Xeon Processor
* 8GB RAM, 2.6GHz Octa-core Xeon Processor
* 1 or more Redis servers either running on same machine or on a separately managed cluster

For database:

* Linux machine (tested on Ubuntu 12+ and Mac Os X)
* 8GB RAM, Octa-core Xeon Processor
* 8GB RAM, 2.4GHz Octa-core Xeon Processor
* Postgres database


Expand Down
2 changes: 1 addition & 1 deletion docs/installation.md
Expand Up @@ -6,7 +6,7 @@ Prerequisites

* Has been tested on Ubuntu and OS X. However it should run on most Linux machines (since there are no distribution specific dependency).

* Minimum of 1GB RAM, 1 CPU core for setup and medium sized testing.
* For development server, minimum of 1GB RAM, 1.6GHz 1 CPU core is required for setup (for production sizing requirements see the relevant section in the [Deployment guide](./deployment_guide.md#deployment-considerations "Deployment Guide")).

* Postgres, redis-server should be running

Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
@@ -1,10 +1,10 @@
site_name: uSurvey
pages:
- Home: index.md
- Set up Guide: installation.md
- User Manual: user_manual.md
- Offline Data Collection: odk_guide.md
- USSD Integration: ussd-integration.md
- Set up Guide: installation.md
- Deployment Guide: deployment_guide.md
- Tests: tests.md
#theme: readthedocs
Expand Down
3 changes: 2 additions & 1 deletion survey/odk/utils/odk_helper.py
Expand Up @@ -506,7 +506,8 @@ class BaseOpenRosaResponse(HttpResponse):

def __init__(self, *args, **kwargs):
super(BaseOpenRosaResponse, self).__init__(*args, **kwargs)

if self.status_code > 201:
self.reason_phrase = self.content
self[OPEN_ROSA_VERSION_HEADER] = OPEN_ROSA_VERSION
tz = pytz.timezone(settings.TIME_ZONE)
dt = datetime.now(tz).strftime('%a, %d %b %Y %H:%M:%S %Z')
Expand Down

0 comments on commit 1a8b99f

Please sign in to comment.