diff --git a/clarin-dspace-docker/commul-customization/local.properties.dist b/clarin-dspace-docker/commul-customization/local.properties.dist
index da9e68642d45e5a2678cee616a8cbba16062666f..44402d342847c97597ad35794259679adb8dc600 100644
--- a/clarin-dspace-docker/commul-customization/local.properties.dist
+++ b/clarin-dspace-docker/commul-customization/local.properties.dist
@@ -32,15 +32,15 @@ lr.harvestable.assetstore =
# DSpace host name - should match base URL. Do not include protocol i.e. http or https and do not include port, this is only the name of server.
# Also do not use localhost because using this property some external links will be generated.
-dspace.hostname = clarin-dev.eurac.edu
+dspace.hostname = lindat-dev.eurac.edu
# DSpace base URL, the full url of the instance
# !!! URL must NOT contain trailing slash !!!
-dspace.baseUrl = https://clarin-dev.eurac.edu/repository
+dspace.baseUrl = https://lindat-dev.eurac.edu/repository
# OAI webapp url without context (eg. /request) use http
# in theory ${dspace.baseUrl}/oai except for the http requirement
-dspace.oai.url = http://clarin-dev.eurac.edu/repository/oai
+dspace.oai.url = http://lindat-dev.eurac.edu/repository/oai
# DSpace URL, usually ending with /xmlui
# DSpace base URL. Include port number etc., but NOT trailing slash
@@ -54,19 +54,19 @@ xmlui.google.analytics.key =
# The name of the database that you will use for your dspace instance.
# If the database is not created yet, this name will be used to create the new database.
# Be careful with the trailing spaces in the name!
-lr.database = XXX-LR-DATABASE
-lr.database.port = 5432
+lr.database = ${env.dspacedbname}
+lr.database.port = ${env.DSPACE_POSTGRESQL_SERVICE_PORT_POSTGRESQL}
# Connection URL of the database. Make sure you are using the correct port and if you are connecting to remote server,
# verify that the port is accessible. Do not change the ${lr.database}, the database name will be substituted from above property.
-db.url = jdbc:postgresql://postgres:${lr.database.port}/${lr.database}
+db.url = jdbc:postgresql://${env.DSPACE_POSTGRESQL_SERVICE_HOST}:${lr.database.port}/${lr.database}
# The database driver you are using. Make sure that the required jars are available.
db.driver = org.postgresql.Driver
# Credentials for the database user. The user should have read/write permissions on your database.
-db.username = secretdspaceuser
-db.password = secretdspacepassword
+db.username = ${env.dspaceuser}
+db.password = ${env.dspacepassword}
db.maxidle = -1
db.schema =
@@ -76,10 +76,10 @@ db.statementpool = true
db.poolname = dspacepool
# UFAL Utilities database name.
-lr.utilities.database = XXX-UTILS-DATABASE
+lr.utilities.database = ${dspaceutilsdbname}
# Connection URL for the Utilities database.
-lr.utilities.db.url = jdbc:postgresql://postgres:${lr.database.port}/${lr.utilities.database}
+lr.utilities.db.url = jdbc:postgresql://${env.DSPACE_POSTGRESQL_SERVICE_HOST}:${lr.database.port}/${lr.utilities.database}
# Functionality Manager facade for Utilities API
lr.utilities.functionalityManager.class = cz.cuni.mff.ufal.lindat.utilities.HibernateFunctionalityManager
@@ -141,7 +141,7 @@ mail.admin = ${mail.feedback.recipient}
lr.errors.email=
# solr server address that your instance is using.
-solr.server = http://clarin-dev.eurac.edu:8080/repository/solr
+solr.server = http://lindat-dev.eurac.edu:8080/repository/solr
# Google Analytics
# NOTE: Copy appropriate Google Analytics API key file to the location specified
@@ -270,13 +270,13 @@ lr.upload.file.alert.max.file.size = 2147483648
lr.shibboleth.log.path = /opt/shibboleth-sp-fastcgi/var/log/shibboleth
lr.shibboleth.log.defaultName = shibd.log
#the place where you run shibboleth's discoFeed handler ("https://"+hostname+"/Shibboleth.sso/DiscoFeed")
-lr.shibboleth.discofeed.url = https://clarin-dev.eurac.edu/Shibboleth.sso/DiscoFeed
+lr.shibboleth.discofeed.url = https://lindat-dev.eurac.edu/Shibboleth.sso/DiscoFeed
####
#
# discojuice/aai url, without trailing slash
# don't change this on ufal-point-dev!
-lr.aai.url = https://clarin-dev.eurac.edu/aai
+lr.aai.url = https://lindat-dev.eurac.edu/aai
# For reports
harvesterInfo.url = http://catalog.clarin.eu/oai-harvester/
@@ -291,22 +291,22 @@ lr.xmlui.user.showlanguage = false
###############################################
# oai
#mind the documentation for oai/cite and the respective apache rewrite
-lr.repository.identifier = clarin-dev.eurac.edu
-lr.repository.sampleIdentifier = oai:clarin-dev.eurac.edu:11858/00-097C-0000-0001-487A-4
+lr.repository.identifier = lindat-dev.eurac.edu
+lr.repository.sampleIdentifier = oai:lindat-dev.eurac.edu:11858/00-097C-0000-0001-487A-4
####
#
# description-olac.xml
####
-lr.description.archiveURL = http://clarin-dev.eurac.edu/
+lr.description.archiveURL = http://lindat-dev.eurac.edu/
lr.description.participant.name = Alexander König
lr.description.institution = Eurac Research, Institute for Applied Linguistics
lr.description.institutionURL = http://www.eurac.edu/linguistics
lr.description.shortLocation = Bolzano, Italy
lr.description.location = Viale Druso, 1 / Drususallee 1, 39100 Bolzano / Bozen - Italy
lr.description.synopsis = http://www.eurac.edu
-lr.desription.access = https://clarin-dev.eurac.edu/repository/xmlui/page/about
-lr.description.archivalSubmissionPolicy = https://clarin-dev.eurac.edu/repository/xmlui/page/about
+lr.desription.access = https://lindat-dev.eurac.edu/repository/xmlui/page/about
+lr.description.archivalSubmissionPolicy = https://lindat-dev.eurac.edu/repository/xmlui/page/about
############################################
@@ -376,7 +376,7 @@ lr.link.checker.connect.timeout = 2000
lr.link.checker.read.timeout = 3000
### Entity ID of your shibboleth sp
-lr.spEntityId = http://clarin-dev.eurac.edu/sp/shibboleth
+lr.spEntityId = http://lindat-dev.eurac.edu/sp/shibboleth
#####
#
@@ -394,4 +394,4 @@ lr.shortener.handle.prefix = 1234
lr.XSendFileHeader =
lr.XSendFilePathPrefix =
-lr.compile.time=
+lr.compile.time=Tue Oct 3 14:46:46 UTC 2017
\ No newline at end of file