Merge remote-tracking branch 'origin/main' into multi-tenant

This commit is contained in:
TsMask
2024-09-20 20:23:39 +08:00
142 changed files with 7687 additions and 2096 deletions

View File

@@ -54,19 +54,19 @@ case "${M_ARG}" in
${OMCBinDir}/importdb.sh ${M_ARG}
if [ "${C_ARG_LOWER}" != "" ]; then
CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d
if [ ! -d "${CustomizedDir}" ]; then
echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done"
exit 1
fi
CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d
if [ ! -d "${CustomizedDir}" ]; then
echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done"
exit 1
fi
echo -n "Setting ${C_ARG_UPPER} customized OMC ..."
for SQL in ${CustomizedDir}/db/*.sql; do
mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
done
cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
#perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCRootDir}/etc/default/restconf.yaml
#perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCBinDir}/nehosts
for SQL in ${CustomizedDir}/db/*.sql; do
mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
done
cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
#perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCRootDir}/etc/default/restconf.yaml
#perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCBinDir}/nehosts
if [ $? = 0 ]; then
echo "done"
fi
@@ -77,17 +77,17 @@ case "${M_ARG}" in
;;
skip)
if [ "${C_ARG_LOWER}" != "" ]; then
CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d
if [ ! -d "${CustomizedDir}" ]; then
echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done"
exit 1
fi
CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d
if [ ! -d "${CustomizedDir}" ]; then
echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done"
exit 1
fi
echo -n "Setting ${C_ARG_UPPER} customized OMC ..."
for SQL in ${CustomizedDir}/db/*.sql; do
mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
done
cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
for SQL in ${CustomizedDir}/db/*.sql; do
mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
done
cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
if [ $? = 0 ]; then
echo "done"
fi