Skip to content

Commit 798cb51

Browse files
committed
Fix copyright statements, new version of the provisioning script
1 parent 2cb8661 commit 798cb51

File tree

3 files changed

+38
-4
lines changed

3 files changed

+38
-4
lines changed

OracleHTTPServer/COPYRIGHT

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
Copyright (c) 2001, 2024, Oracle Corporation. All rights reserved.
1+
Copyright (c) 2020, 2024, Oracle and/or its affiliates.
2+
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
23

34
Permission is hereby granted, free of charge, to any person obtaining
45
a copy of this software and associated documentation files (the

OracleHTTPServer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ To download and run Oracle JDK regardless of inside or outside a Docker containe
7575
All scripts and files hosted in this project and GitHub [docker/OracleHTTPServer](./) repository required to build the Docker images are, unless otherwise noted, released under the Universal Permissive License v1.0.
7676

7777
## Copyright
78-
Copyright (c) 2019, 2024 Oracle and/or its affiliates. All rights reserved.
78+
Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.

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

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/bash
2-
32
# Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved.
43
#
54
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
@@ -105,7 +104,41 @@ wlst.sh -skipWLSModuleScanning -loadProperties $PROPERTIES_FILE /u01/oracle/crea
105104
# Set the NM username and password in the properties file
106105
echo "username=$NM_USER" >> ${DOMAIN_HOME}/config/nodemanager/nm_password.properties
107106
echo "password=$NM_PASSWORD" >> ${DOMAIN_HOME}/config/nodemanager/nm_password.properties
108-
mv /u01/oracle/helloWorld.html ${DOMAIN_HOME}/config/fmwconfig/components/OHS/ohs1/htdocs/helloWorld.html
107+
mv /u01/oracle/helloWorld.html ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME/htdocs/helloWorld.html
108+
109+
echo "Copying Configuration to OHS Instance"
110+
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 -name '.*' | xargs rm -rf
111+
112+
conf=$(ls -l /u01/oracle/config/httpd/*.conf 2>/dev/null | wc -l)
113+
if [ $conf -gt 0 ]
114+
then
115+
echo "Copying root .conf files $OHS_COMPONENT_NAME"
116+
cp -L /u01/oracle/config/httpd/*.conf ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME
117+
fi
118+
119+
htdocs=$(ls -l /u01/oracle/config/htdocs/*.html 2>/dev/null | wc -l)
120+
if [ $htdocs -gt 0 ]
121+
then
122+
echo "Copying htdocs to OHS Instance"
123+
cp -L /u01/oracle/config/htdocs/*.html ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME/htdocs
124+
fi
125+
126+
if [ "$DEPLOY_WG" = "true" ]
127+
then
128+
echo "Deploying Webgate"
129+
cd $ORACLE_HOME/webgate/ohs/tools/deployWebGate/
130+
./deployWebGateInstance.sh -w ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME -oh $ORACLE_HOME
131+
cd $ORACLE_HOME/webgate/ohs/tools/setup/InstallTools
132+
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ORACLE_HOME/lib
133+
./EditHttpConf -w ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME -oh $ORACLE_HOME
134+
echo "Adding OAP API exclusion to webgate.conf"
135+
echo "<LocationMatch \"/iam/access/binding/api/v10/oap\">" >> ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME/webgate.conf
136+
echo " require all granted" >> ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME/webgate.conf
137+
echo "</LocationMatch>" >> ${DOMAIN_HOME}/config/fmwconfig/components/OHS/$OHS_COMPONENT_NAME/webgate.conf
138+
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 -name '.*' | xargs rm -rf
139+
else
140+
echo "Dont Deploy WG"
141+
fi
109142

110143
fi
111144

0 commit comments

Comments
 (0)