1
0

Merge branch 'main' into multi-tenant

This commit is contained in:
2024-11-01 10:43:40 +08:00
405 changed files with 118 additions and 792 deletions

View File

@@ -45,7 +45,7 @@ chmod -R 755 ${OMCRootDir}/htdocs/front
for CFile in ${CFileList}; do
if [ ! -e "${OMCEtcDir}/${CFile}" ]; then
cp -f ${OMCEtcDir}/default/${CFile} ${OMCEtcDir}
else
else
# mv -f ${OMCEtcDir}/${CFile} ${OMCEtcDir}/${CFile}.bak
# cp -f ${OMCEtcDir}/default/${CFile} ${OMCEtcDir}
if [ -e "${OMCBinDir}/upgconf.sh" ]; then
@@ -132,6 +132,8 @@ if [ ! -e "${NginxConfDir}/omc.conf" ]; then
cp -f ${OMCEtcDir}/nginx/omc.conf ${NginxConfDir};
fi
systemctl daemon-reload
# disable auto upgrade
systemctl disable --now unattended-upgrades