Skip to content

Commit

Permalink
Provide Web Applications corresponding to all Archive AETs in default…
Browse files Browse the repository at this point in the history 
… configuration dcm4che/dcm4chee-arc#1906 dcm4che/dcm4chee-arc-light#1907
  • Loading branch information
@gunterze
gunterze committed Apr 5, 2019
1 parent 6c35ec0 commit 230f102
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions bin/update-data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,27 @@ sed -e "s%dc=dcm4che,dc=org%${LDAP_BASE_DN}%" \
-e "s%^dicomAETitle: IOCM_EXPIRED%dicomAETitle: ${AE_TITLE_IOCM_EXPIRED}%" \
-e "s%dicomAETitle=AS_RECEIVED%dicomAETitle=${AE_TITLE_AS_RECEIVED}%" \
-e "s%^dicomAETitle: AS_RECEIVED%dicomAETitle: ${AE_TITLE_AS_RECEIVED}%" \
-e "s%^dcmWebAppName=dcm4chee-arc%dcmWebAppName=${ARCHIVE_DEVICE_NAME}%" \
-e "s%dcmWebAppName=dcm4chee-arc%dcmWebAppName=${ARCHIVE_DEVICE_NAME}%" \
-e "s%^dcmWebAppName: dcm4chee-arc%dcmWebAppName: ${ARCHIVE_DEVICE_NAME}%" \
-e "s%^dcmWebAppName=DCM4CHEE%dcmWebAppName=${AE_TITLE}%" \
-e "s%dcmWebAppName=DCM4CHEE%dcmWebAppName=${AE_TITLE}%" \
-e "s%^dcmWebAppName: DCM4CHEE%dcmWebAppName: ${AE_TITLE}%" \
-e "s%^dcmWebServicePath: /dcm4chee-arc/aets/DCM4CHEE%dcmWebServicePath: /dcm4chee-arc/aets/${AE_TITLE}%" \
-e "s%^dcmWebAppName=IOCM_REGULAR_USE%dcmWebAppName=${AE_TITLE_IOCM_REGULAR_USE}%" \
-e "s%dcmWebAppName=IOCM_REGULAR_USE%dcmWebAppName=${AE_TITLE_IOCM_REGULAR_USE}%" \
-e "s%^dcmWebAppName: IOCM_REGULAR_USE%dcmWebAppName: ${AE_TITLE_IOCM_REGULAR_USE}%" \
-e "s%^dcmWebServicePath: /dcm4chee-arc/aets/IOCM_REGULAR_USE%dcmWebServicePath: /dcm4chee-arc/aets/${AE_TITLE_IOCM_REGULAR_USE}%" \
-e "s%^dcmWebAppName=IOCM_QUALITY%dcmWebAppName=${AE_TITLE_IOCM_QUALITY}%" \
-e "s%dcmWebAppName=IOCM_QUALITY%dcmWebAppName=${AE_TITLE_IOCM_QUALITY}%" \
-e "s%^dcmWebAppName: IOCM_QUALITY%dcmWebAppName: ${AE_TITLE_IOCM_QUALITY}%" \
-e "s%^dcmWebServicePath: /dcm4chee-arc/aets/IOCM_QUALITY%dcmWebServicePath: /dcm4chee-arc/aets/${AE_TITLE_IOCM_QUALITY}%" \
-e "s%^dcmWebAppName=IOCM_PAT_SAFETY%dcmWebAppName=${AE_TITLE_IOCM_PAT_SAFETY}%" \
-e "s%dcmWebAppName=IOCM_PAT_SAFETY%dcmWebAppName=${AE_TITLE_IOCM_PAT_SAFETY}%" \
-e "s%^dcmWebAppName: IOCM_PAT_SAFETY%dcmWebAppName: ${AE_TITLE_IOCM_PAT_SAFETY}%" \
-e "s%^dcmWebServicePath: /dcm4chee-arc/aets/IOCM_PAT_SAFETY%dcmWebServicePath: /dcm4chee-arc/aets/${AE_TITLE_IOCM_PAT_SAFETY}%" \
-e "s%^dcmWebAppName=IOCM_WRONG_MWL%dcmWebAppName=${AE_TITLE_IOCM_WRONG_MWL}%" \
-e "s%dcmWebAppName=IOCM_WRONG_MWL%dcmWebAppName=${AE_TITLE_IOCM_WRONG_MWL}%" \
-e "s%^dcmWebAppName: IOCM_WRONG_MWL%dcmWebAppName: ${AE_TITLE_IOCM_WRONG_MWL}%" \
-e "s%^dcmWebServicePath: /dcm4chee-arc/aets/IOCM_WRONG_MWL%dcmWebServicePath: /dcm4chee-arc/aets/${AE_TITLE_IOCM_WRONG_MWL}%" \
-e "s%^dcmWebAppName=IOCM_EXPIRED%dcmWebAppName=${AE_TITLE_IOCM_EXPIRED}%" \
-e "s%dcmWebAppName=IOCM_EXPIRED%dcmWebAppName=${AE_TITLE_IOCM_EXPIRED}%" \
-e "s%^dcmWebAppName: IOCM_EXPIRED%dcmWebAppName: ${AE_TITLE_IOCM_EXPIRED}%" \
-e "s%^dcmWebServicePath: /dcm4chee-arc/aets/IOCM_EXPIRED%dcmWebServicePath: /dcm4chee-arc/aets/${AE_TITLE_IOCM_EXPIRED}%" \
-e "s%^dcmWebAppName=AS_RECEIVED%dcmWebAppName=${AE_TITLE_AS_RECEIVED}%" \
-e "s%dcmWebAppName=AS_RECEIVED%dcmWebAppName=${AE_TITLE_AS_RECEIVED}%" \
-e "s%^dcmWebAppName: AS_RECEIVED%dcmWebAppName: ${AE_TITLE_AS_RECEIVED}%" \
-e "s%^dcmWebServicePath: /dcm4chee-arc/aets/AS_RECEIVED%dcmWebServicePath: /dcm4chee-arc/aets/${AE_TITLE_AS_RECEIVED}%" \
-e "s%archive-host%${ARCHIVE_HOST}%" \
Expand Down
16 changes: 8 additions & 8 deletions ldap/configure.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,27 @@ if [ "$SKIP_INIT_CONFIG" != "true" ]; then
-e "s%^dicomAETitle: IOCM_EXPIRED%dicomAETitle: ${AE_TITLE_IOCM_EXPIRED}%" \
-e "s%dicomAETitle=AS_RECEIVED%dicomAETitle=${AE_TITLE_AS_RECEIVED}%" \
-e "s%^dicomAETitle: AS_RECEIVED%dicomAETitle: ${AE_TITLE_AS_RECEIVED}%" \
-e "s%^dcmWebAppName=dcm4chee-arc%dcmWebAppName=${ARCHIVE_DEVICE_NAME}%" \
-e "s%dcmWebAppName=dcm4chee-arc%dcmWebAppName=${ARCHIVE_DEVICE_NAME}%" \
-e "s%^dcmWebAppName: dcm4chee-arc%dcmWebAppName: ${ARCHIVE_DEVICE_NAME}%" \
-e "s%^dcmWebAppName=DCM4CHEE%dcmWebAppName=${AE_TITLE}%" \
-e "s%dcmWebAppName=DCM4CHEE%dcmWebAppName=${AE_TITLE}%" \
-e "s%^dcmWebAppName: DCM4CHEE%dcmWebAppName: ${AE_TITLE}%" \
-e "s%^dcmWebServicePath: /dcm4chee-arc/aets/DCM4CHEE%dcmWebServicePath: /dcm4chee-arc/aets/${AE_TITLE}%" \
-e "s%^dcmWebAppName=IOCM_REGULAR_USE%dcmWebAppName=${AE_TITLE_IOCM_REGULAR_USE}%" \
-e "s%dcmWebAppName=IOCM_REGULAR_USE%dcmWebAppName=${AE_TITLE_IOCM_REGULAR_USE}%" \
-e "s%^dcmWebAppName: IOCM_REGULAR_USE%dcmWebAppName: ${AE_TITLE_IOCM_REGULAR_USE}%" \
-e "s%^dcmWebServicePath: /dcm4chee-arc/aets/IOCM_REGULAR_USE%dcmWebServicePath: /dcm4chee-arc/aets/${AE_TITLE_IOCM_REGULAR_USE}%" \
-e "s%^dcmWebAppName=IOCM_QUALITY%dcmWebAppName=${AE_TITLE_IOCM_QUALITY}%" \
-e "s%dcmWebAppName=IOCM_QUALITY%dcmWebAppName=${AE_TITLE_IOCM_QUALITY}%" \
-e "s%^dcmWebAppName: IOCM_QUALITY%dcmWebAppName: ${AE_TITLE_IOCM_QUALITY}%" \
-e "s%^dcmWebServicePath: /dcm4chee-arc/aets/IOCM_QUALITY%dcmWebServicePath: /dcm4chee-arc/aets/${AE_TITLE_IOCM_QUALITY}%" \
-e "s%^dcmWebAppName=IOCM_PAT_SAFETY%dcmWebAppName=${AE_TITLE_IOCM_PAT_SAFETY}%" \
-e "s%dcmWebAppName=IOCM_PAT_SAFETY%dcmWebAppName=${AE_TITLE_IOCM_PAT_SAFETY}%" \
-e "s%^dcmWebAppName: IOCM_PAT_SAFETY%dcmWebAppName: ${AE_TITLE_IOCM_PAT_SAFETY}%" \
-e "s%^dcmWebServicePath: /dcm4chee-arc/aets/IOCM_PAT_SAFETY%dcmWebServicePath: /dcm4chee-arc/aets/${AE_TITLE_IOCM_PAT_SAFETY}%" \
-e "s%^dcmWebAppName=IOCM_WRONG_MWL%dcmWebAppName=${AE_TITLE_IOCM_WRONG_MWL}%" \
-e "s%dcmWebAppName=IOCM_WRONG_MWL%dcmWebAppName=${AE_TITLE_IOCM_WRONG_MWL}%" \
-e "s%^dcmWebAppName: IOCM_WRONG_MWL%dcmWebAppName: ${AE_TITLE_IOCM_WRONG_MWL}%" \
-e "s%^dcmWebServicePath: /dcm4chee-arc/aets/IOCM_WRONG_MWL%dcmWebServicePath: /dcm4chee-arc/aets/${AE_TITLE_IOCM_WRONG_MWL}%" \
-e "s%^dcmWebAppName=IOCM_EXPIRED%dcmWebAppName=${AE_TITLE_IOCM_EXPIRED}%" \
-e "s%dcmWebAppName=IOCM_EXPIRED%dcmWebAppName=${AE_TITLE_IOCM_EXPIRED}%" \
-e "s%^dcmWebAppName: IOCM_EXPIRED%dcmWebAppName: ${AE_TITLE_IOCM_EXPIRED}%" \
-e "s%^dcmWebServicePath: /dcm4chee-arc/aets/IOCM_EXPIRED%dcmWebServicePath: /dcm4chee-arc/aets/${AE_TITLE_IOCM_EXPIRED}%" \
-e "s%^dcmWebAppName=AS_RECEIVED%dcmWebAppName=${AE_TITLE_AS_RECEIVED}%" \
-e "s%dcmWebAppName=AS_RECEIVED%dcmWebAppName=${AE_TITLE_AS_RECEIVED}%" \
-e "s%^dcmWebAppName: AS_RECEIVED%dcmWebAppName: ${AE_TITLE_AS_RECEIVED}%" \
-e "s%^dcmWebServicePath: /dcm4chee-arc/aets/AS_RECEIVED%dcmWebServicePath: /dcm4chee-arc/aets/${AE_TITLE_AS_RECEIVED}%" \
-e "s%archive-host%${ARCHIVE_HOST}%" \
Expand Down

0 comments on commit 230f102

Please sign in to comment.