diff --git a/codimd/docker-compose.yml b/codimd/docker-compose.yml index 3290f43..38bcdcb 100644 --- a/codimd/docker-compose.yml +++ b/codimd/docker-compose.yml @@ -6,9 +6,9 @@ services: # You need to migrate the Database to the new PostgreSQL version image: postgres:9.6-alpine environment: - - POSTGRES_USER=codimd - - POSTGRES_PASSWORD=codimdpass - - POSTGRES_DB=codimd + POSTGRES_USER: codimd + POSTGRES_PASSWORD: codimdpass + POSTGRES_DB: codimd volumes: - ./data_db:/var/lib/postgresql/data restart: always @@ -20,8 +20,23 @@ services: - "VERSION=1.4.0" - "CODIMD_REPOSITORY=https://github.com/codimd/server.git" environment: - # DB_URL is formatted like: ://:@/ - - CMD_DB_URL=postgres://codimd:codimdpass@database:5432/codimd + DEBUG: false + CMD_DB_URL: postgres://codimd:codimdpass@database:5432/codimd + CMD_URL_ADDPORT: false + CMD_EMAIL: false + CMD_DOMAIN: codimd.auro.re + CMD_PROTOCOL_USESSL: true + CMD_USECDN: false + CMD_ALLOW_FREEURL: true + CMD_LDAP_URL: ldap://10.128.0.11 + CMD_LDAP_BINDDN: cn=codimd,ou=service-users,dc=auro,dc=re + CMD_LDAP_BINDCREDENTIALS: CHANGE ME IN PRODUCTION, I WILL DIFFER ! + CMD_LDAP_SEARCHBASE: cn=Utilisateurs,dc=auro,dc=re + CMD_LDAP_SEARCHFILTER: (uid={{username}}) + CMD_LDAP_SEARCHATTRIBUTES: uid, givenName, mail + CMD_LDAP_USERIDFIELD: uid + CMD_LDAP_USERNAMEFIELD: uid + CMD_LDAP_PROVIDERNAME: Aurore ports: - "8081:3000" volumes: diff --git a/codimd/resources/config.json b/codimd/resources/config.json index 44827cf..97264ee 100644 --- a/codimd/resources/config.json +++ b/codimd/resources/config.json @@ -1,7 +1,7 @@ { "production": { - "urlAddPort": false, - "email": false, + "urlAddPort": true, + "email": true, "db": { "username": "codimd", "password": "codimdpass", @@ -11,22 +11,6 @@ "dialect": "postgres" }, "imageUploadType": "filesystem", - "domain": "codimd.auro.re", - "debug": false, - "useSSL": false, - "protocolUseSSL": true, - "useCDN": false, - "ldap": { - "url": "ldap://10.128.0.11", - "bindDn": "cn=codimd,ou=service-users,dc=auro,dc=re", - "bindCredentials": "CHANGE ME IN PRODUCTION, I WILL DIFFER !", - "searchBase": "cn=Utilisateurs,dc=auro,dc=re", - "searchFilter": "(uid={{username}})", - "searchAttributes": ["uid", "givenName", "mail"], - "usernameField": "uid", - "useridField": "uid", - "providerName": "Compte Aurore" - }, - "allowFreeURL": true + "useSSL": false } }