瀏覽代碼

Merge branch '77/dev/beta_1.0/docker'

Bastien Sevajol 8 年之前
父節點
當前提交
576fbdef7c
共有 2 個文件被更改,包括 5 次插入3 次删除
  1. 2 0
      README.md
  2. 3 3
      tracim/test.ini

+ 2 - 0
README.md 查看文件

115
 
115
 
116
     apt-get install git realpath python3 python-virtualenv python3-dev python-pip build-essential libxml2-dev libxslt1-dev python-lxml
116
     apt-get install git realpath python3 python-virtualenv python3-dev python-pip build-essential libxml2-dev libxslt1-dev python-lxml
117
 
117
 
118
+You also need `redis-server` package if you want to send email in async mode.
119
+
118
 ## Database ##
120
 ## Database ##
119
 
121
 
120
 If you want use PostgreSQL as database engine:
122
 If you want use PostgreSQL as database engine:

+ 3 - 3
tracim/test.ini 查看文件

22
 port = 8080
22
 port = 8080
23
 
23
 
24
 [app:main]
24
 [app:main]
25
-sqlalchemy.url = sqlite:///tracim_test.sqlite
25
+sqlalchemy.url =  postgresql://postgres:dummy@127.0.0.1:5432/tracim_test?client_encoding=utf8
26
 use = config:development.ini
26
 use = config:development.ini
27
 
27
 
28
 [app:main_without_authn]
28
 [app:main_without_authn]
30
 skip_authentication = True
30
 skip_authentication = True
31
 
31
 
32
 [app:ldap]
32
 [app:ldap]
33
-sqlalchemy.url = sqlite:///tracim_test.sqlite
33
+sqlalchemy.url =  postgresql://postgres:dummy@127.0.0.1:5432/tracim_test?client_encoding=utf8
34
 auth_type = ldap
34
 auth_type = ldap
35
 ldap_url = ldap://localhost:3333
35
 ldap_url = ldap://localhost:3333
36
 ldap_base_dn = dc=directory,dc=fsf,dc=org
36
 ldap_base_dn = dc=directory,dc=fsf,dc=org
49
 use = config:development.ini
49
 use = config:development.ini
50
 
50
 
51
 [app:radicale]
51
 [app:radicale]
52
-sqlalchemy.url = sqlite:///tracim_test.sqlite
52
+sqlalchemy.url =  postgresql://postgres:dummy@127.0.0.1:5432/tracim_test?client_encoding=utf8
53
 
53
 
54
 use = config:development.ini
54
 use = config:development.ini
55
 
55