From e1feb02f5fbaa7dbb3c83ac26fd3eb00f9b72b36 Mon Sep 17 00:00:00 2001
From: Matthias Andreas Benkard <code@mail.matthias.benkard.de>
Date: Sat, 3 Dec 2011 23:38:48 +0100
Subject: Move database configuration to config.sexp.

---
 .gitignore                | 2 +-
 config.sexp.sample        | 7 +++++++
 src/mulk/benki/config.clj | 5 +++++
 src/mulk/benki/db.clj     | 8 ++------
 4 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 config.sexp.sample
 create mode 100644 src/mulk/benki/config.clj

diff --git a/.gitignore b/.gitignore
index dda55c5..3b7170c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,6 @@ lib
 static/3rdparty
 
 *~
-dbpassword.txt
+config.sexp
 pom.xml
 
diff --git a/config.sexp.sample b/config.sexp.sample
new file mode 100644
index 0000000..a7ab1c0
--- /dev/null
+++ b/config.sexp.sample
@@ -0,0 +1,7 @@
+;;;; -*- mode: clojure; coding: utf-8 -*-
+
+{:database {:classname "org.postgresql.Driver"
+            :subprotocol "postgresql"
+            :subname "//localhost:5432/benki"
+            :user "benki"
+            :password ""}}
diff --git a/src/mulk/benki/config.clj b/src/mulk/benki/config.clj
new file mode 100644
index 0000000..4b9493b
--- /dev/null
+++ b/src/mulk/benki/config.clj
@@ -0,0 +1,5 @@
+(ns mulk.benki.config
+  (:refer-clojure))
+
+(def benki-config
+  (read-string (slurp "config.sexp")))
diff --git a/src/mulk/benki/db.clj b/src/mulk/benki/db.clj
index c1f5cc6..61de478 100644
--- a/src/mulk/benki/db.clj
+++ b/src/mulk/benki/db.clj
@@ -1,15 +1,11 @@
 (ns mulk.benki.db
   (:refer-clojure)
-  (:use mulk.benki.util)
+  (:use [mulk.benki util config])
   (:require [clojure.java.jdbc :as sql]))
 
 
 (def ^:private db
-  {:classname "org.postgresql.Driver"
-   :subprotocol "postgresql"
-   :subname "//localhost:5432/benki"
-   :user "benki"
-   :password (clojure.string/trim (slurp "dbpassword.txt"))})
+  (:database benki-config))
 
 (defn call-with-db [thunk]
   (sql/with-connection db
-- 
cgit v1.2.3