summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-12-10 15:39:02 +0100
committerAzul <azul@leap.se>2012-12-10 15:39:02 +0100
commit1a26988cb7ff30061473f4a781166b184b3037ce (patch)
treecbd129cd9d93efa93cd2a40bcdec8c08169c14df
parent5cfabde4f04d9212af5efee805479bd1be3c5cf1 (diff)
use consistent naming scheme across CA, webapp and couchDB install
-rw-r--r--certs/app/models/cert.rb2
-rw-r--r--config/couchdb.yml9
-rw-r--r--users/app/models/user.rb2
3 files changed, 12 insertions, 1 deletions
diff --git a/certs/app/models/cert.rb b/certs/app/models/cert.rb
index 40efde9..9a6c98d 100644
--- a/certs/app/models/cert.rb
+++ b/certs/app/models/cert.rb
@@ -1,6 +1,6 @@
class Cert < CouchRest::Model::Base
- use_database 'certs'
+ use_database 'client_certificates'
timestamps!
diff --git a/config/couchdb.yml b/config/couchdb.yml
new file mode 100644
index 0000000..636f2f2
--- /dev/null
+++ b/config/couchdb.yml
@@ -0,0 +1,9 @@
+development:
+ prefix: ""
+
+production:
+ prefix: ""
+
+test:
+ prefix: ""
+ suffix: test
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index ae271ce..340ad9c 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -1,5 +1,7 @@
class User < CouchRest::Model::Base
+ use_database :users
+
property :login, String, :accessible => true
property :email, String, :accessible => true
property :email_forward, String, :accessible => true