From ff5965f45db9e9e0c997f80c798417f3a71c848f Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 24 Mar 2012 15:17:54 -0500
Subject: Switch to recommending PostgreSQL by default

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 README                    | 7 ++++---
 local_settings.py.example | 5 ++---
 requirements_prod.txt     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README b/README
index 0d3ee082..707ab7ca 100644
--- a/README
+++ b/README
@@ -23,9 +23,9 @@ More detail in `requirements.txt` and `requirements_prod.txt`; it is best to
 use virtualenv and pip to handle these. But if you insist on (Arch Linux)
 packages, you will probably want the following:
 
-- mysql-python or python-pysqlite
 - django
-- python-markdown
+- python2-psycopg2
+- python2-markdown
 - python-south
 - python-memcached
 
@@ -44,7 +44,8 @@ packages, you will probably want the following:
         (archweb-env) $ pip install -r requirements.txt
 
 3. Copy `local_settings.py.example` to `local_settings.py` and modify.
-   Make sure to uncomment the appropriate db section (either sqlite or mysql).
+   Make sure to uncomment the appropriate database section (either sqlite or
+   PostgreSQL).
 
 4. Sync the database to create it.
 
diff --git a/local_settings.py.example b/local_settings.py.example
index 37ac29a6..b8407d3e 100644
--- a/local_settings.py.example
+++ b/local_settings.py.example
@@ -13,16 +13,15 @@ ADMINS = (
    # ('Joe Admin', 'joeadmin@example.com'),
 )
 
-## MySQL Database settings
+## PostgreSQL Database settings
 DATABASES = {
     'default': {
-        'ENGINE'  : 'django.db.backends.mysql',
+        'ENGINE'  : 'django.db.backends.postgresql_psycopg2',
         'NAME'    : 'archlinux',
         'USER'    : 'archlinux',
         'PASSWORD': 'archlinux',
         'HOST'    : '',
         'PORT'    : '',
-        'OPTIONS' : {'init_command': 'SET storage_engine=InnoDB'},
     },
 }
 
diff --git a/requirements_prod.txt b/requirements_prod.txt
index 7f7663a8..517000a9 100644
--- a/requirements_prod.txt
+++ b/requirements_prod.txt
@@ -1,8 +1,8 @@
 Django==1.4
 Markdown==2.1.1
-MySQL-python==1.2.3
 South==0.7.4
 pgpdump==1.1
+psycopg2=2.4.4
 pyinotify==0.9.3
 python-memcached==1.48
 pytz>=2012b
-- 
cgit v1.2.3-55-g3dc8