Small fixes

README

@@ -33,6 +33,12 @@ Instructions:
     * Update the wsgi file:
         ./modifywsgi.py
 
+    * Start apache server:
+        ./startapache.sh
+
+    * Copy the settings to the WEBAPPDIR:
+        cp globals.py moreglobals.py $OSQA_WEBAPPDIR ; chmod go-rw $OSQA_WEBAPPDIR/globals.py $OSQA_WEBAPPDIR/moreglobals.py
+
 Webfaction setup:
     * Put the following in ~/.bashrc, then 'source ~/.bashrc':
 export UTILS="$HOME/utils/"
@@ -64,5 +70,9 @@ Webfaction API documentation here:
 
 For TODO items, grep TODO in install.py
 Also:
+    * Toggle DEBUG mode
     * Want PostgreSQL, not MySQL
     * Want SERVE_MEDIA=False, and an Nginx media server
+    * You should log in to the admin interface (http://DOMAIN.com/admin/),
+    and go to "Sites > Sites", and change the domain name that is used in
+    all emails.

globals.py.dist

@@ -33,5 +33,6 @@ else:
     FULLDOMAINNAME = "%s.%s" % (SUBDOMAINNAME, DOMAINNAME)
 
 import os, os.path
-PROJECTDIR = os.path.join(os.environ["HOME"], "webapps/%s/projects/osqa/" % APPNAME)
-ENVDIR = os.path.join(os.environ["HOME"], "webapps/%s/env/" % APPNAME)
+WEBAPPDIR = os.path.join(os.environ["HOME"], "webapps/%s/" % APPNAME)
+PROJECTDIR = os.path.join(WEBAPPDIR, "projects/osqa/")
+ENVDIR = os.path.join(WEBAPPDIR, "env/")

modifyhttpdconf.py

@@ -19,7 +19,7 @@
 
 KeepAlive Off
 Listen %s
-LogFormat "%%{X-Forwarded-For}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
+LogFormat "%%{X-Forwarded-For}i %%l %%u %%t \\"%%r\\" %%>s %%b \\"%%{Referer}i\\" \\"%%{User-Agent}i\\"" combined
 CustomLog %s combined
 ErrorLog %s
 ServerLimit 2
@@ -43,7 +43,7 @@
 #otherwise django will be crunching images through itself wasting time
 Alias /content/ %s
 Alias /forum/admin/media/ %s
-#AliasMatch /([^/]*\.css) /home/USERNAME/webapps/osqa_server/projects/MYOSQA/templates/content/style/$1
+#AliasMatch /([^/]*\\.css) /home/USERNAME/webapps/osqa_server/projects/MYOSQA/templates/content/style/$1
 <Directory "%s">
 #    Order deny,allow
 #    Allow from all