Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
DM
dm-docs
Commits
ee924ba2
Commit
ee924ba2
authored
Jul 09, 2020
by
sveseli
Browse files
resolve conflict
parent
df20f00f
Changes
1
Hide whitespace changes
Inline
Side-by-side
etc/dm.deploy.conf
View file @
ee924ba2
...
...
@@ -14,11 +14,7 @@ DM_DAQ_WEB_SERVICE_URL=https://DM_HOSTNAME:33336
DM_CAT_WEB_SERVICE_URL
=
https
://
DM_HOSTNAME
:
44436
DM_PROC_WEB_SERVICE_URL
=
https
://
DM_HOSTNAME
:
55536
DM_APS_DB_WEB_SERVICE_URL
=
https
://
DM_HOSTNAME
:
11236
<<<<<<<
HEAD
DM_SOFTWARE_VERSION
=
3
.
3
.
2
=======
DM_SOFTWARE_VERSION
=
3
.
3
.
2
>>>>>>>
master
LDAP_SERVER_URL
=
'ldaps://dmid-vm.xray.aps.anl.gov:636'
LDAP_DN_FORMAT
=
'uid=%%s,ou=people,o=aps.anl.gov,dc=aps,dc=anl,dc=gov'
LDAP_UTIL_ADMIN_DN
=
'uid=DM_SYSTEM_UNIX_ACCOUNT,ou=People,o=aps.anl.gov,dc=aps,dc=anl,dc=gov'
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment