Skip to content

Commit 7cd0e9f

Browse files
authored
Make copies recursive (#2850)
* Make copies recursive * Adds an extra entry to webgate.conf
1 parent 44c5a35 commit 7cd0e9f

File tree

1 file changed

+17
-10
lines changed

1 file changed

+17
-10
lines changed

OracleHTTPServer/dockerfiles/12.2.1.4.0/container-scripts/provisionOHS.sh

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ function _kill() {
2929
# Set SIGTERM handler
3030
trap _term SIGTERM
3131

32-
# Set SIGKILL handler
33-
#trap _kill SIGKILL
34-
3532
echo "ORACLE_HOME=${ORACLE_HOME:?"Please set ORACLE_HOME"}"
3633
echo "DOMAIN_NAME=${DOMAIN_NAME:?"Please set DOMAIN_NAME"}"
3734
echo "OHS_COMPONENT_NAME=${OHS_COMPONENT_NAME:?"Please set OHS_COMPONENT_NAME"}"
@@ -106,29 +103,33 @@ conf=$(ls -l /u01/oracle/config/moduleconf/*.conf 2>/dev/null | wc -l)
106103
if [ $conf -gt 0 ]
107104
then
108105
echo " Copying moduleconf conf files to OHS Instance"
109-
cp -L /u01/oracle/config/moduleconf/*.conf ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME/moduleconf && find ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME/moduleconf -print0 -name '.*' | xargs rm -rf
106+
cp -L /u01/oracle/config/moduleconf/*.conf ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME/moduleconf
107+
find ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME/moduleconf -name '.*' -exec rm -rf {} \; > /dev/null 2>&1
110108
fi
111109

112110
conf=$(ls -l /u01/oracle/config/httpd/*.conf 2>/dev/null | wc -l)
113111
if [ $conf -gt 0 ]
114112
then
115113
echo " Copying root conf files OHS Instance"
116114
cp -L /u01/oracle/config/httpd/*.conf ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME
115+
find ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME -name '.*' -exec rm -rf {} \; > /dev/null 2>&1
117116
fi
118117

119118
conf=$(ls -l /u01/oracle/config/wallet/* 2>/dev/null | wc -l)
120119
if [ $conf -gt 0 ]
121120
then
122121
echo " Copying OHS Wallets to OHS Instance"
123122
mkdir -p ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME/keystores > /dev/null 2>&1
124-
cp -L /u01/oracle/config/wallet/* ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME/keystores/
123+
cp -Lr /u01/oracle/config/wallet/* ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME/keystores/
124+
find ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME/keystores -name '.*' -exec rm -rf {} \; > /dev/null 2>&1
125125
fi
126126

127-
htdocs=$(ls -l /u01/oracle/config/htdocs/*.html 2>/dev/null | wc -l)
127+
htdocs=$(ls -l /u01/oracle/config/htdocs/* 2>/dev/null | wc -l)
128128
if [ $htdocs -gt 0 ]
129129
then
130-
echo "Copying htdocs to OHS Instance"
131-
cp -L /u01/oracle/config/htdocs/*.html ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME/htdocs
130+
echo " Copying htdocs to OHS Instance"
131+
cp -Lr /u01/oracle/config/htdocs/* ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME/htdocs
132+
find ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME/htdocs -name '.*' -exec rm -rf {} \; > /dev/null 2>&1
132133
fi
133134

134135
if [ "$DEPLOY_WG" = "true" ]
@@ -144,11 +145,17 @@ then
144145
cd $ORACLE_HOME/webgate/ohs/tools/setup/InstallTools || exit
145146
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ORACLE_HOME/lib
146147
./EditHttpConf -w ${DOMAIN_HOME}/config/fmwconfig/components/OHS/${OHS_COMPONENT_NAME} -oh $ORACLE_HOME
147-
echo "Adding OAP API exclusion to webgate.conf"
148+
echo " Adding OAP API exclusion to webgate.conf"
148149
echo "<LocationMatch \"/iam/access/binding/api/v10/oap\">" >> ${DOMAIN_HOME}/config/fmwconfig/components/OHS/${OHS_COMPONENT_NAME}/webgate.conf
149150
echo " require all granted" >> ${DOMAIN_HOME}/config/fmwconfig/components/OHS/${OHS_COMPONENT_NAME}/webgate.conf
150151
echo "</LocationMatch>" >> ${DOMAIN_HOME}/config/fmwconfig/components/OHS/${OHS_COMPONENT_NAME}/webgate.conf
151-
cp -rL /u01/oracle/config/webgate ${DOMAIN_HOME}/config/fmwconfig/components/OHS/${OHS_COMPONENT_NAME} && find ${DOMAIN_HOME}/config/fmwconfig/components/OHS/${OHS_COMPONENT_NAME}/webgate -print0 -name '.*' | xargs rm -rf
152+
echo "" >> ${DOMAIN_HOME}/config/fmwconfig/components/OHS/${OHS_COMPONENT_NAME}/webgate.conf
153+
echo "<LocationMatch \"/helloWorld.html\">" >> ${DOMAIN_HOME}/config/fmwconfig/components/OHS/${OHS_COMPONENT_NAME}/webgate.conf
154+
echo " require all granted" >> ${DOMAIN_HOME}/config/fmwconfig/components/OHS/${OHS_COMPONENT_NAME}/webgate.conf
155+
echo "</LocationMatch>" >> ${DOMAIN_HOME}/config/fmwconfig/components/OHS/${OHS_COMPONENT_NAME}/webgate.conf
156+
echo " Copying WebGate Artifacts to Oracle Instance"
157+
cp -rL /u01/oracle/config/webgate ${DOMAIN_HOME}/config/fmwconfig/components/OHS/${OHS_COMPONENT_NAME}
158+
find ${DOMAIN_HOME}/config/fmwconfig/components/OHS/${OHS_COMPONENT_NAME}/webgate -name '.*' -exec rm -rf {} \; > /dev/null 2>&1
152159
else
153160
echo "WebGate not deployed"
154161
fi

0 commit comments

Comments
 (0)