Fixing merge conflicts.

.gitignore

@@ -1,4 +1,5 @@
 *.pyc
+*.xml
 venv
 tours/settings/local.py
 tours/static
@@ -8,3 +9,6 @@ mydatabase
 *.DS_Store
 data.json
 tours.komodoproject
+.coverage
+otb-test
+apache/otb.conf

.travis.yml

@@ -0,0 +1 @@
+sudo: false

CHANGELOG.rst

@@ -1 +1,7 @@
-Release 1.0 - Initial Release
+Release 2.0
+-----------
+Split out front end to `OpenTourBuilder-Client <https://github.com/emory-libraries-ecds/OpenTourBuilder-Clientr>`_ and converted the Django App to provide a REST API.
+
+Release 1.0
+-----------
+Initial Release

DEPLOYNOTES.rst

@@ -1,32 +1,3 @@
 .. _DEPLOYNOTES:
 
-System Requirements
-===================
-
-General Requirements
---------------------
-The server will need a webserver and access to a database server.
-
-Ubuntu 10.04 LTS
-----------------
-
-    $ apt-get install git python-dev python-setuptools libtiff4-dev libjpeg62-dev \
-    zlib1g-dev libfreetype6-dev tcl8.5-dev tk8.5-dev python-tk
-
-    $ pip install virtualenv
-
-Ubuntu 12.04 LTS
-----------------
-
-    $ apt-get install git python-dev python-setuptools libtiff4-dev libjpeg8-dev zlib1g-dev \
-    libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk
-
-    $ pip install virtualenv
-
-Redhat
-------
-
-    $ yum install git python-devel python-setuptools libtiff-devel libjpeg-devel \
-    libzip-devel freetype-devel lcms2-devel libwebp-devel tcl-devel tk-devel
-
-    $ pip install virtualenv
+See `Installer <https://github.com/emory-libraries-ecds/OpenTourBuilder-Installer>`_

README.rst

@@ -2,11 +2,11 @@ OpenTourBuilder
 ===============
 Overview
 --------
-OpenTourBuilder is a content management platform for building geospatial tours to be presented as mobile optimized website.
+OpenTourBuilder-Server is a content management platform for building tours to be presented as mobile optimized websites.
 
 OpenTourBuilder was built by the software engineering team at Emory's Library & Information Technology Services (LITS) with Emory's Center for Digital Scholarship (ECDS).
 
-OpenTourBuilder was built using Python-Django and jQuery Mobile.
+OpenTourBuilder was built using Python-Django that provides a REST API to `OpenTourBuilder-Client <https://github.com/emory-libraries-ecds/OpenTourBuilder-Clientr>`_
 
 License
 -------

apache/otb.conf.dist

@@ -0,0 +1,60 @@
+# This is a template file for an apache deployment. If you run the installer (https://github.com/emory-libraries-ecds/OpenTourBuilder-Installer), the values will be filled in for you and saved as `apache/otb.conf`.
+
+######################
+# Config for backend #
+######################
+
+#######################
+# WE HIGHLY RECOMMEND #
+# YOU USE HTTPS FOR   #
+# THE BACKEND!!!!!!!  #
+#######################
+
+WSGIDaemonProcess opentourbuilder-$proc python-path=$pathvenv/lib/python2.7/site-packages:$path user=www-data threads=10 maximum-requests=1000 inactivity-timeout=300
+
+<VirtualHost *:80>
+    ServerName api.$domain
+
+    WSGIScriptAlias / $pathapache/tours.wsgi
+    <Location />
+        WSGIProcessGroup opentourbuilder-$proc
+        Allow from all
+        Require all granted
+    </Location>
+
+    Alias /static/ $pathtours/static/
+
+    <Directory $pathtours/static/>
+        Order allow,deny
+        Allow from all
+        Require all granted
+    </Directory>
+
+    Alias /media/ $pathtours/media/
+
+    <Directory $pathtours/media/>
+        Order allow,deny
+        Allow from all
+        Require all granted
+    </Directory>
+
+</VirtualHost>
+
+########################
+# Config for front end #
+########################
+
+<VirtualHost *:80>
+    ServerName $domain
+    DocumentRoot $client-path
+    <Directory $client-path>
+        Require all granted
+        Allow from all
+        Options -MultiViews
+        RewriteEngine On
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule (.*) index.html [L]
+    </Directory>
+</VirtualHost>

apache/tours.wsgi

@@ -5,7 +5,7 @@ DJANGO_SETTINGS_MODULE='tours.settings'
 
 os.environ['DJANGO_SETTINGS_MODULE'] = 'tours.settings'
 
-from django.core.handlers.wsgi import WSGIHandler
-application = WSGIHandler()
+from django.core.wsgi import get_wsgi_application
+application = get_wsgi_application()