From f1c9cdb20d78788eef9af08212b66310e4506bf2 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Tue, 26 Mar 2024 09:42:13 +0800
Subject: [PATCH] fix: all-in-one package

---
 debbuild/22.04/DEBIAN/postinst | 23 +++++++++++++++++------
 debbuild/DEBIAN/postinst       |  1 +
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/debbuild/22.04/DEBIAN/postinst b/debbuild/22.04/DEBIAN/postinst
index 1ffc1d5..2efcffa 100644
--- a/debbuild/22.04/DEBIAN/postinst
+++ b/debbuild/22.04/DEBIAN/postinst
@@ -1,6 +1,9 @@
 # !/bin/bash
 
-RedisConfDir=/usr/local/db/bin/conf
+RedisRootDir=/usr/local/db
+RedisConfDir=${RedisRootDir}/bin/conf
+DependsRootDir=/usr/local/omc/depends
+SystemdRootDir=/lib/systemd/system
 OMCEtcDir=/usr/local/omc/etc
 FERootDir=/usr/local/omc/htdocs/front
 X86Lib64Dir=/lib/x86_64-linux-gnu
@@ -34,7 +37,7 @@ if [ ! -e libwiretap.so.12 ]; then  ln -s libwiretap.so.12.0.12 libwiretap.so.12
 if [ ! -e libwiretap.so ]; then  ln -s libwiretap.so.12.0.12 libwiretap.so; fi
 chmod +rx libwsutil.so.13.1.0
 if [ ! -e libwsutil.so.13 ]; then  ln -s libwsutil.so.13.1.0 libwsutil.so.13; fi
-if [! -e libwsutil.so ]; then  ln -s libwsutil.so.13.1.0 libwsutil.so; fi
+if [ ! -e libwsutil.so ]; then  ln -s libwsutil.so.13.1.0 libwsutil.so; fi
 cd ${UsrLocalBinDir}
 if [ ! -e ${OmcDaemon} ]; then  ln -s ${OmcBinDir}/omcsvc.sh ${OmcDaemon}; fi
 
@@ -49,11 +52,18 @@ for CFile in ${CFileList}; do
         cp ${OMCEtcDir}/default/${CFile} ${OMCEtcDir};
     fi                 
 done
-if [ ! -e "${RedisConfDir}/redis.conf" ]; then    
-    cp ${RedisConfDir}/default/redis.conf ${RedisConfDir}; 
-else
-    sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/redis.conf 
+
+# Install redis db if not exist /usr/local/db
+if [ ! -e "${RedisRootDir}/bin/redis-server" ]
+    cp -rf ${DependsRootDir}/redis /usr/local/adb
+    if [ ! -e "${RedisConfDir}/redis.conf" ]; then    
+        cp ${RedisConfDir}/default/redis.conf ${RedisConfDir}; 
+    else
+        sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/redis.conf 
+    fi
+    cp -f ${DependsRootDir}/systemd/adb.service ${SystemdRootDir}
 fi
+
 if [ ! -e "${FERootDir}/config.js" ]; then    
     cp ${FERootDir}/default/config.js ${FERootDir}; 
 fi        
@@ -77,6 +87,7 @@ if [ -e "${NginxSiteAvailable}/default" ]; then
     sed -i 's/listen 80 default_server;/listen 1080 default_server;/g' ${NginxSiteAvailable}/default
     sed -i 's/listen \[::\]:80 default_server;/listen \[::\]:1080 default_server;/g' ${NginxSiteAvailable}/default
 fi 
+
 systemctl enable restagent.service
 systemctl enable crontask.service
 systemctl enable sshsvc.service
diff --git a/debbuild/DEBIAN/postinst b/debbuild/DEBIAN/postinst
index bcaf54a..70495e7 100644
--- a/debbuild/DEBIAN/postinst
+++ b/debbuild/DEBIAN/postinst
@@ -52,6 +52,7 @@ for CFile in ${CFileList}; do
         cp ${OMCEtcDir}/default/${CFile} ${OMCEtcDir};
     fi                 
 done
+
 # Install redis db if not exist /usr/local/db
 if [ ! -e "${RedisRootDir}/bin/redis-server" ]
     cp -rf ${DependsRootDir}/redis /usr/local/adb