From f5a2d79346dc060495879f3c26ae3175d3cae9e9 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 10 Jul 2024 15:00:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=93=E5=8C=85=E4=B8=8D=E9=A2=84?= =?UTF-8?q?=E5=85=88=E9=85=8D=E7=BD=AEnginx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 2 +- build/debbuild/DEBIAN/postinst | 8 -------- .../local/omc/etc/default}/nginx/conf.d/default.conf | 0 3 files changed, 1 insertion(+), 9 deletions(-) rename build/debbuild/{etc => usr/local/omc/etc/default}/nginx/conf.d/default.conf (100%) diff --git a/build.sh b/build.sh index ee2c3ff..ce4ec56 100644 --- a/build.sh +++ b/build.sh @@ -32,7 +32,7 @@ cp -rf ${DebBuildDirOMCEtc}/db/common/* ${DebBuildDirOMCEtc}/db/upgrade # 打包deb cd ${EmsBEDir} -chmod 755 -R ${DebBuildDir} +chmod 755 ${DebBuildDir} chmod 755 ${DebBuildDir}/DEBIAN/preinst chmod 755 ${DebBuildDir}/DEBIAN/postinst chmod 755 ${DebBuildDir}/DEBIAN/postrm diff --git a/build/debbuild/DEBIAN/postinst b/build/debbuild/DEBIAN/postinst index f53b9ec..ed1cb1f 100644 --- a/build/debbuild/DEBIAN/postinst +++ b/build/debbuild/DEBIAN/postinst @@ -30,14 +30,6 @@ for LogoFile in ${LogoFileList}; do fi done -if [ ! -e "${NginxConfDir}/default.conf" ]; then - mkdir -p ${NginxConfDir} - cp -f ${OMCEtcDir}/nginx/default.conf ${NginxConfDir}; -fi - -# disable auto upgrade -systemctl disable --now unattended-upgrades - systemctl enable omc.service systemctl daemon-reload systemctl stop omc.service diff --git a/build/debbuild/etc/nginx/conf.d/default.conf b/build/debbuild/usr/local/omc/etc/default/nginx/conf.d/default.conf similarity index 100% rename from build/debbuild/etc/nginx/conf.d/default.conf rename to build/debbuild/usr/local/omc/etc/default/nginx/conf.d/default.conf