Merge branch 'main' into multi-tenant
This commit is contained in:
@@ -1,10 +1,6 @@
|
||||
# !/bin/bash
|
||||
|
||||
RedisRootDir=/usr/local
|
||||
OMCRootDir=/usr/local/omc
|
||||
RedisOldRootDir=/usr/local/db
|
||||
RedisConfDir=${RedisRootDir}/etc/kvdb
|
||||
DependsRootDir=${OMCRootDir}/depends
|
||||
SystemdRootDir=/lib/systemd/system
|
||||
OMCEtcDir=${OMCRootDir}/etc
|
||||
FERootDir=${OMCRootDir}/htdocs/front
|
||||
@@ -15,7 +11,6 @@ UsrLocalBinDir=/usr/local/bin
|
||||
OmcDaemon=omcd
|
||||
NginxEtcDir=/etc/nginx
|
||||
NginxConfDir=${NginxEtcDir}/conf.d
|
||||
NginxSiteAvailable=${NginxEtcDir}/sites-available
|
||||
CFileList="restconf.yaml crontask.yaml tasks.yaml sshsvc.yaml capconf.yaml omc.conf"
|
||||
LogoFileList="zh_brand.png zh_icon.png en_brand.png en_icon.png"
|
||||
|
||||
@@ -25,7 +20,6 @@ echo " sudo systemctl start/stop/restart/status restagent.service"
|
||||
echo " sudo systemctl start/stop/restart/status crontask.service"
|
||||
echo " sudo systemctl start/stop/restart/status sshsvc.service"
|
||||
echo " sudo systemctl start/stop/restart/status captrace.service"
|
||||
echo " sudo systemctl start/stop/restart/status kvdb.service"
|
||||
echo " or run: "
|
||||
echo " sudo /usr/local/omc/bin/omcsvc.sh start/stop/restart/status"
|
||||
echo ""
|
||||
@@ -115,27 +109,25 @@ done
|
||||
|
||||
if [ ! -e "${FERootDir}/config.js" ]; then
|
||||
cp ${FERootDir}/default/config.js ${FERootDir};
|
||||
fi
|
||||
fi
|
||||
|
||||
for LogoFile in ${LogoFileList}; do
|
||||
if [ ! -e "${OMCStaticDir}/logo/${LogoFile}" ]; then
|
||||
cp ${OMCStaticDir}/agt.d/logo/${LogoFile} ${OMCStaticDir}/logo;
|
||||
cp ${OMCStaticDir}/omc.d/logo/${LogoFile} ${OMCStaticDir}/logo;
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
if ! id -u omc >/dev/null 2>&1 ; then
|
||||
useradd -d /opt/omc -m -s /bin/bash -pomc123 omc;
|
||||
mkdir -p /opt/omc/ftp
|
||||
else
|
||||
echo "user omc exist";
|
||||
fi
|
||||
|
||||
if [ ! -e "${NginxConfDir}/omc.conf" ]; then
|
||||
mkdir -p ${NginxConfDir}
|
||||
cp -f ${OMCEtcDir}/nginx/omc.conf ${NginxConfDir};
|
||||
fi
|
||||
#cp -f ${OMCEtcDir}/nginx/default ${NginxSiteAvailable}
|
||||
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
|
||||
|
||||
# disable auto upgrade
|
||||
systemctl disable --now unattended-upgrades
|
||||
@@ -144,12 +136,11 @@ systemctl enable restagent.service
|
||||
systemctl enable crontask.service
|
||||
systemctl enable sshsvc.service
|
||||
systemctl enable captrace.service
|
||||
#systemctl enable kvdb.service
|
||||
|
||||
systemctl daemon-reload
|
||||
#systemctl stop nginx.service
|
||||
|
||||
# read environment parameter and to do
|
||||
if [ "$M_PARAM" == "install" -o "$M_PARAM" == "upgrade" ]; then
|
||||
if [ "$M_PARAM" = "install" -o "$M_PARAM" = "upgrade" ]; then
|
||||
echo "M parameter: $M_PARAM"
|
||||
if [ -n "$C_PARAM" ]; then
|
||||
echo "C parameter: $C_PARAM"
|
||||
@@ -164,15 +155,9 @@ if [ "$M_PARAM" == "install" -o "$M_PARAM" == "upgrade" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
systemctl stop restagent.service
|
||||
systemctl stop crontask.service
|
||||
systemctl stop sshsvc.service
|
||||
systemctl stop captrace.service
|
||||
#systemctl stop kvdb.service
|
||||
#systemctl start nginx.service
|
||||
#systemctl start kvdb.service
|
||||
echo -n "Starting OMC service ... "
|
||||
systemctl start crontask.service
|
||||
systemctl start sshsvc.service
|
||||
systemctl start captrace.service
|
||||
systemctl start restagent.service
|
||||
|
||||
echo "done"
|
||||
|
||||
@@ -1,27 +1,31 @@
|
||||
# !/bin/bash
|
||||
|
||||
X86Lib64Dir=/lib/x86_64-linux-gnu
|
||||
cd ${X86Lib64Dir}
|
||||
rm libwireshark.so.15
|
||||
rm libwireshark.so
|
||||
rm libwiretap.so.12
|
||||
rm libwiretap.so
|
||||
rm libwsutil.so.13
|
||||
rm libwsutil.so
|
||||
systemctl stop nginx.service
|
||||
systemctl stop restagent.service
|
||||
systemctl stop crontask.service
|
||||
systemctl stop sshsvc.service
|
||||
systemctl stop captrace.service
|
||||
#systemctl stop kvdb.service
|
||||
rm -rf ${X86Lib64Dir}/libwireshark.so.15
|
||||
rm -rf ${X86Lib64Dir}/libwireshark.so
|
||||
rm -rf ${X86Lib64Dir}/libwiretap.so.12
|
||||
rm -rf ${X86Lib64Dir}/libwiretap.so
|
||||
rm -rf ${X86Lib64Dir}/libwsutil.so.13
|
||||
rm -rf ${X86Lib64Dir}/libwsutil.so
|
||||
|
||||
#rm -rf /usr/local/omc
|
||||
rm -rf /etc/nginx/conf.d/omc.conf
|
||||
rm -f /usr/local/bin/omcd
|
||||
|
||||
systemctl daemon-reload
|
||||
|
||||
if systemctl list-units --type=service --all | grep -q 'restagent.service'; then
|
||||
echo -n "Stopping OMC service ... "
|
||||
systemctl stop restagent.service
|
||||
systemctl stop crontask.service
|
||||
systemctl stop sshsvc.service
|
||||
systemctl stop captrace.service
|
||||
echo "done"
|
||||
fi
|
||||
|
||||
systemctl disable restagent.service
|
||||
systemctl disable crontask.service
|
||||
systemctl disable sshsvc.service
|
||||
systemctl disable captrace.service
|
||||
#systemctl disable kvdb.service
|
||||
systemctl daemon-reload
|
||||
|
||||
systemctl daemon-reload
|
||||
|
||||
@@ -1,6 +1,17 @@
|
||||
# !/bin/bash
|
||||
|
||||
systemctl daemon-reload
|
||||
if systemctl list-units --type=service --all | grep -q 'restagent.service'; then
|
||||
echo -n "Stopping OMC service ... "
|
||||
systemctl stop restagent.service
|
||||
systemctl stop crontask.service
|
||||
systemctl stop sshsvc.service
|
||||
systemctl stop captrace.service
|
||||
echo "done"
|
||||
fi
|
||||
|
||||
FERootDir=/usr/local/omc/htdocs/front
|
||||
|
||||
# apt-get install zip
|
||||
# clear front-end old hash js files
|
||||
rm -rf ${FERootDir}/assets
|
||||
|
||||
@@ -1,51 +1,40 @@
|
||||
server {
|
||||
listen 4443 ssl;
|
||||
listen [::]:4443 ssl;
|
||||
server_name 0.0.0.0;
|
||||
root /usr/local/omc/htdocs/front/;
|
||||
index index.html index.htm;
|
||||
server_name localhost;
|
||||
# SSL
|
||||
ssl_certificate /usr/local/omc/etc/certs/ca_cert.pem;
|
||||
ssl_certificate_key /usr/local/omc/etc/certs/private_key.pem;
|
||||
#ssl_certificate /usr/local/omc/etc/certs/tsa-omc.pem;
|
||||
#ssl_certificate_key /usr/local/omc/etc/certs/tsa-omc_pri.pem;
|
||||
listen 44080;
|
||||
listen 44443;
|
||||
listen [::]:44080;
|
||||
listen [::]:44443;
|
||||
server_name localhost;
|
||||
|
||||
# location /api/rest/securityManagement {
|
||||
# proxy_pass http://127.0.0.1:5050;
|
||||
# }
|
||||
# location /api/rest/resourceManagement {
|
||||
# proxy_pass http://127.0.0.1:5050;
|
||||
# }
|
||||
# location /api/rest/performanceManagement {
|
||||
# proxy_pass http://127.0.0.1:5050;
|
||||
# }
|
||||
# location /api/rest/faultManagement {
|
||||
# proxy_pass http://127.0.0.1:5050;
|
||||
# }
|
||||
# location /api/rest/aaaa/ {
|
||||
# proxy_pass http://127.0.0.1:4040;
|
||||
# }
|
||||
location /api/rest/ {
|
||||
proxy_pass http://127.0.0.1:3030;
|
||||
}
|
||||
client_max_body_size 100M;
|
||||
keepalive_timeout 180s;
|
||||
|
||||
#access_log /var/log/nginx/host.access.log main;
|
||||
|
||||
# ssl_certificate /usr/local/omc/etc/certs/omc-server.crt;
|
||||
# ssl_certificate_key /usr/local/omc/etc/certs/omc-server.key;
|
||||
# ssl_client_certificate /usr/local/omc/etc/certs/omc-ca.crt;
|
||||
# ssl_verify_client on;
|
||||
# ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
|
||||
# ssl_session_timeout 5m;
|
||||
# ssl_ciphers EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;
|
||||
# ssl_prefer_server_ciphers on;
|
||||
|
||||
# OMC
|
||||
location / {
|
||||
try_files $uri $uri/ =404;
|
||||
root /usr/local/omc/htdocs/front;
|
||||
|
||||
try_files $uri $uri/ /index.html;
|
||||
index index.html index.htm;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
listen 8888 default_server;
|
||||
listen [::]:8888 default_server;
|
||||
root /usr/local/omc/htdocs/front/;
|
||||
index index.html index.htm;
|
||||
server_name localhost;
|
||||
|
||||
location /omc-api/ {
|
||||
proxy_pass http://127.0.0.1:3030/;
|
||||
|
||||
proxy_http_version 1.1;
|
||||
proxy_cache_bypass $http_upgrade;
|
||||
proxy_pass http://127.0.0.1:33030/;
|
||||
|
||||
proxy_connect_timeout 180s;
|
||||
proxy_send_timeout 180s;
|
||||
proxy_read_timeout 180s;
|
||||
|
||||
proxy_cache_bypass $http_upgrade;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_set_header Host $host;
|
||||
@@ -56,11 +45,27 @@ server {
|
||||
proxy_set_header X-Forwarded-Port $server_port;
|
||||
}
|
||||
|
||||
location / {
|
||||
root /usr/local/omc/htdocs/front;
|
||||
location /api/rest/ {
|
||||
proxy_pass http://127.0.0.1:33030/api/rest/;
|
||||
|
||||
try_files $uri $uri/ /index.html;
|
||||
index index.html index.htm;
|
||||
proxy_cache_bypass $http_upgrade;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header X-Forwarded-Host $host;
|
||||
proxy_set_header X-Forwarded-Port $server_port;
|
||||
}
|
||||
|
||||
#error_page 404 /404.html;
|
||||
|
||||
# redirect server error pages to the static page /50x.html
|
||||
#
|
||||
error_page 500 502 503 504 /50x.html;
|
||||
location = /50x.html {
|
||||
root /usr/share/nginx/html;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
[Service]
|
||||
Type=forking
|
||||
ExecStart=/usr/local/bin/kvdb-server /usr/local/etc/kvdb/kvdb.conf
|
||||
ExecStopPost=
|
||||
PIDFile=
|
||||
Restart=always
|
||||
RestartSec=3
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
||||
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -4,35 +4,39 @@
|
||||
# count: rotation count of log, default is 30 rotation
|
||||
logger:
|
||||
file: /usr/local/omc/log/restagent.log
|
||||
level: debug
|
||||
level: warn
|
||||
duration: 24
|
||||
count: 90
|
||||
|
||||
# rest agent listen ipv4/v6 and port, support multiple routines
|
||||
# ip: 0.0.0.0 or ::0, support IPv4/v6
|
||||
# clientAuthType: 0:NoClientCert (default), 1:RequestClientCert, 2:RequireAnyClientCert,
|
||||
# 3:VerifyClientCertIfGiven, 4:RequireAndVerifyClientCerts
|
||||
rest:
|
||||
- ipv4: 0.0.0.0
|
||||
ipv6:
|
||||
port: 3030
|
||||
port: 33030
|
||||
- ipv4: 0.0.0.0
|
||||
ipv6:
|
||||
port: 4443
|
||||
port: 33443
|
||||
schema: https
|
||||
caFile: /usr/local/omc/etc/certs/rootca.crt
|
||||
certFile: /usr/local/omc/etc/certs/tsa-omc.crt
|
||||
keyFile: /usr/local/omc/etc/certs/tsa-omc_pri.key
|
||||
clientAuthType: 0
|
||||
caFile: /usr/local/omc/etc/certs/omc-ca.crt
|
||||
certFile: /usr/local/omc/etc/certs/omc-server.crt
|
||||
keyFile: /usr/local/omc/etc/certs/omc-server.key
|
||||
|
||||
webServer:
|
||||
enabled: true
|
||||
rootDir: /usr/local/omc/htdocs/front
|
||||
listen:
|
||||
- addr: :8080
|
||||
- addr: :80
|
||||
schema: http
|
||||
- addr: :8443
|
||||
- addr: :443
|
||||
schema: https
|
||||
caFile: /usr/local/omc/etc/certs/rootca.crt
|
||||
certFile: /usr/local/omc/etc/certs/tsa-omc.crt
|
||||
keyFile: /usr/local/omc/etc/certs/tsa-omc_pri.key
|
||||
clientAuthType: 0
|
||||
caFile: /usr/local/omc/etc/certs/omc-ca.crt
|
||||
certFile: /usr/local/omc/etc/certs/omc-server.crt
|
||||
keyFile: /usr/local/omc/etc/certs/omc-server.key
|
||||
|
||||
database:
|
||||
type: mysql
|
||||
@@ -41,89 +45,116 @@ database:
|
||||
host: 127.0.0.1
|
||||
port: 33066
|
||||
name: tenants_db
|
||||
connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
|
||||
backup: /usr/local/omc/database
|
||||
|
||||
# Redis 缓存数据，数据源声明全小写
|
||||
# Redis data cache
|
||||
redis:
|
||||
dataSource:
|
||||
# OMC系统使用库
|
||||
# OMC system db
|
||||
default:
|
||||
port: 6379 # Redis port
|
||||
host: "127.0.0.1" # Redis host
|
||||
password: ""
|
||||
password: "helloearth"
|
||||
db: 10 # Redis db_num
|
||||
# UDM网元用户库
|
||||
# UDM sub/auth db
|
||||
udmuser:
|
||||
port: 6379 # Redis port
|
||||
host: "127.0.0.1"
|
||||
password: ""
|
||||
password: "helloearth"
|
||||
db: 0 # Redis db_num
|
||||
# 多个数据源时可以用这个指定默认的数据源
|
||||
# used to specify the default data source for multiple data resourece
|
||||
defaultDataSourceName: "default"
|
||||
|
||||
# sleep: time delay for after write buffer (millisecond)
|
||||
# deadLine: timeout for io read and write (second)
|
||||
mml:
|
||||
port: 4100
|
||||
port2: 5002
|
||||
sleep: 200
|
||||
deadLine: 10
|
||||
sizeRow: 600
|
||||
sizeCol: 128
|
||||
bufferSize: 65535
|
||||
user: admin
|
||||
password: admin
|
||||
mmlHome: ./mmlhome
|
||||
upload: /home/agtuser
|
||||
|
||||
# NE config
|
||||
ne:
|
||||
user: agtuser
|
||||
user: omcuser
|
||||
etcdir: /usr/local/etc
|
||||
bindir: /usr/local/bin
|
||||
omcdir: /usr/local/omc
|
||||
scpdir: /tmp
|
||||
licensedir: /usr/local/etc/{neType}/license
|
||||
# backup etc list of IMS, does not contain spaces
|
||||
etcListIMS: '{*.yaml,mmtel,vars.cfg}'
|
||||
etcListDefault: '{*.yaml,*.conf,*.cfg}'
|
||||
# true/false to overwrite config file when dpkg ne software
|
||||
dpkgOverwrite: false
|
||||
# dpkg timeout (second)
|
||||
dpkgTimeout: 180
|
||||
|
||||
# chk2ne: true/false, if put OmcNeConfig parameters to NE
|
||||
omc:
|
||||
uriPrefix: /api/rest/oam
|
||||
uriPrefix: "/omc/rest"
|
||||
neType: OMC
|
||||
neId: 001
|
||||
rmUID: 4400HX101
|
||||
neName: OMC
|
||||
province: GD
|
||||
province: ""
|
||||
vendor: ""
|
||||
dn: 4600
|
||||
dn: ""
|
||||
chk2ne: false
|
||||
sn: 13750650
|
||||
sn: "-"
|
||||
checksign: false
|
||||
rootDir: /usr/local/omc
|
||||
binDir: /usr/local/omc/bin
|
||||
backup: /usr/local/omc/backup
|
||||
upload: /usr/local/omc/upload
|
||||
frontUpload: /usr/local/omc/htdocs/front/upload
|
||||
frontTraceDir: /usr/local/omc/htdocs/front/trace
|
||||
software: /usr/local/omc/software
|
||||
license: /usr/local/omc/license
|
||||
gtpUri: gtp:192.168.2.119:2152
|
||||
gtpUri: gtp:192.168.2.119:32152
|
||||
checkContentType: false
|
||||
testMode: false
|
||||
rbacMode: true
|
||||
runDir: /usr/local/omc/run
|
||||
cmdTimeout: 120
|
||||
|
||||
# Alarm module setting
|
||||
# Forward interface:
|
||||
# email/sms
|
||||
# email/sms/smsc
|
||||
alarm:
|
||||
forwardAlarm: true
|
||||
email:
|
||||
smtp: smtp@xxx.com
|
||||
smtp: smtp.xxx.com
|
||||
port: 25
|
||||
user: smtpuser
|
||||
password: smtpuser@omc
|
||||
user: smtpuser@xxx.com
|
||||
password: xxxxxx
|
||||
# TLS skip verify: true/false
|
||||
tlsSkipVerify: true
|
||||
smProxy: smsc
|
||||
sms:
|
||||
apiURL: http://smsc.xxx.com
|
||||
accessKeyID: xxx
|
||||
accessKeySecret: xxx
|
||||
signName: XXX SMSC
|
||||
templateCode: 1000
|
||||
smsc:
|
||||
addr: "192.168.13.114:2775"
|
||||
systemID: "alarmsmsfw"
|
||||
password: "omc123"
|
||||
systemType: ""
|
||||
|
||||
#User authorized information
|
||||
# User authorized information
|
||||
# crypt: mysql/md5/bcrypt
|
||||
# token: true/false to check accessToken
|
||||
# expires for session, unit: second
|
||||
# Support single/multiple session of user
|
||||
#
|
||||
auth:
|
||||
crypt: bcrypt
|
||||
token: true
|
||||
@@ -148,5 +179,5 @@ params:
|
||||
rmuidregexp: "[0-9]{4}[A-Z]{2}[A-Z]{2}[0-9A-Z]{1}[0-9A-Z]{3}[0-9A-Z]{1,16}"
|
||||
|
||||
testConfig:
|
||||
enabled: true
|
||||
enabled: false
|
||||
file: /usr/local/omc/etc/testconfig.yaml
|
||||
@@ -1,10 +1,6 @@
|
||||
# !/bin/bash
|
||||
|
||||
RedisRootDir=/usr/local
|
||||
OMCRootDir=/usr/local/omc
|
||||
RedisOldRootDir=/usr/local/db
|
||||
RedisConfDir=${RedisRootDir}/etc/kvdb
|
||||
DependsRootDir=${OMCRootDir}/depends
|
||||
SystemdRootDir=/lib/systemd/system
|
||||
OMCEtcDir=${OMCRootDir}/etc
|
||||
FERootDir=${OMCRootDir}/htdocs/front
|
||||
@@ -15,7 +11,6 @@ UsrLocalBinDir=/usr/local/bin
|
||||
OmcDaemon=omcd
|
||||
NginxEtcDir=/etc/nginx
|
||||
NginxConfDir=${NginxEtcDir}/conf.d
|
||||
NginxSiteAvailable=${NginxEtcDir}/sites-available
|
||||
CFileList="restconf.yaml crontask.yaml tasks.yaml sshsvc.yaml capconf.yaml omc.conf"
|
||||
LogoFileList="zh_brand.png zh_icon.png en_brand.png en_icon.png"
|
||||
|
||||
@@ -25,7 +20,6 @@ echo " sudo systemctl start/stop/restart/status restagent.service"
|
||||
echo " sudo systemctl start/stop/restart/status crontask.service"
|
||||
echo " sudo systemctl start/stop/restart/status sshsvc.service"
|
||||
echo " sudo systemctl start/stop/restart/status captrace.service"
|
||||
echo " sudo systemctl start/stop/restart/status kvdb.service"
|
||||
echo " or run: "
|
||||
echo " sudo /usr/local/omc/bin/omcsvc.sh start/stop/restart/status"
|
||||
echo ""
|
||||
@@ -57,85 +51,27 @@ for CFile in ${CFileList}; do
|
||||
fi
|
||||
done
|
||||
|
||||
# # Install redis db if not exist /usr/local/db
|
||||
# if [ ! -e "${RedisRootDir}/bin/kvdb-server" ]; then
|
||||
# # if [ ! -e "${RedisRootDir}" ]; then
|
||||
# # mkdir -p ${RedisRootDir}
|
||||
# # fi
|
||||
# # stop old adb service
|
||||
# if [ -e "${RedisOldRootDir}/bin/redis-server" ] && [ -e "${SystemdRootDir}/adb.service" ]; then
|
||||
# systemctl stop adb.service
|
||||
# systemctl disable adb.service
|
||||
# fi
|
||||
# # stop adb service
|
||||
# if [ -e "${UsrLocalBinDir}/adb-server" ] && [ -e "${SystemdRootDir}/adb.service" ]; then
|
||||
# systemctl stop adb.service
|
||||
# systemctl disable adb.service
|
||||
# fi
|
||||
# cp -rf ${DependsRootDir}/kvdb/* /
|
||||
# chmod +rx ${RedisRootDir}/bin/kvdb*
|
||||
# if [ ! -e "${RedisConfDir}/kvdb.conf" ]; then
|
||||
# cp ${RedisConfDir}/default/kvdb.conf ${RedisConfDir};
|
||||
# fi
|
||||
# sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/kvdb.conf
|
||||
|
||||
# LINE="masterauth helloearth"
|
||||
# FILE="${RedisConfDir}/kvdb.conf"
|
||||
# # 检查文件中是否存在该行
|
||||
# if ! grep -qxF "$LINE" "$FILE"; then
|
||||
# # 如果不存在，将其添加到文件末尾
|
||||
# echo "$LINE" >> "$FILE"
|
||||
# fi
|
||||
|
||||
# # copy the old adb dump.rdb
|
||||
# if [ -e "${RedisOldRootDir}/bin/conf/dump.rdb" ] && [ ! -e "${RedisConfDir}/dump.rdb" ]; then
|
||||
# cp -f ${RedisOldRootDir}/bin/conf/dump.rdb ${RedisConfDir};
|
||||
# mv -f ${RedisRootDir}/db ${RedisRootDir}/adb.old
|
||||
# fi
|
||||
# # copy the adb dump.rdb
|
||||
# if [ -e "${RedisRootDir}/etc/adb/dump.rdb" ] && [ ! -e "${RedisRootDir}/etc/kvdb/dump.rdb" ]; then
|
||||
# cp -f ${RedisRootDir}/etc/adb/dump.rdb ${RedisRootDir}/etc/kvdb/;
|
||||
# mv -f ${RedisRootDir}/etc/adb ${RedisRootDir}/etc/adb.old
|
||||
# fi
|
||||
# # cp -f ${DependsRootDir}/systemd/kvdb.service ${SystemdRootDir}
|
||||
# else
|
||||
# if [ ! -e "${RedisConfDir}/kvdb.conf" ]; then
|
||||
# cp ${RedisConfDir}/default/kvdb.conf ${RedisConfDir}
|
||||
# fi
|
||||
# sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/kvdb.conf
|
||||
|
||||
# LINE="masterauth helloearth"
|
||||
# FILE="${RedisConfDir}/kvdb.conf"
|
||||
# # 检查文件中是否存在该行
|
||||
# if ! grep -qxF "$LINE" "$FILE"; then
|
||||
# # 如果不存在，将其添加到文件末尾
|
||||
# echo "$LINE" >> "$FILE"
|
||||
# fi
|
||||
# fi
|
||||
|
||||
if [ ! -e "${FERootDir}/config.js" ]; then
|
||||
cp ${FERootDir}/default/config.js ${FERootDir};
|
||||
fi
|
||||
|
||||
for LogoFile in ${LogoFileList}; do
|
||||
if [ ! -e "${OMCStaticDir}/logo/${LogoFile}" ]; then
|
||||
cp ${OMCStaticDir}/agt.d/logo/${LogoFile} ${OMCStaticDir}/logo;
|
||||
cp ${OMCStaticDir}/omc.d/logo/${LogoFile} ${OMCStaticDir}/logo;
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
if ! id -u omc >/dev/null 2>&1 ; then
|
||||
useradd -d /opt/omc -m -s /bin/bash -pomc123 omc;
|
||||
mkdir -p /opt/omc/ftp
|
||||
else
|
||||
echo "user omc exist";
|
||||
fi
|
||||
|
||||
if [ ! -e "${NginxConfDir}/omc.conf" ]; then
|
||||
mkdir -p ${NginxConfDir}
|
||||
cp -f ${OMCEtcDir}/nginx/omc.conf ${NginxConfDir};
|
||||
fi
|
||||
#cp -f ${OMCEtcDir}/nginx/default ${NginxSiteAvailable}
|
||||
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
|
||||
|
||||
# disable auto upgrade
|
||||
systemctl disable --now unattended-upgrades
|
||||
@@ -144,12 +80,11 @@ systemctl enable restagent.service
|
||||
systemctl enable crontask.service
|
||||
systemctl enable sshsvc.service
|
||||
systemctl enable captrace.service
|
||||
#systemctl enable kvdb.service
|
||||
|
||||
systemctl daemon-reload
|
||||
#systemctl stop nginx.service
|
||||
|
||||
# read environment parameter and to do
|
||||
if [ "$M_PARAM" == "install" -o "$M_PARAM" == "upgrade" ]; then
|
||||
if [ "$M_PARAM" = "install" -o "$M_PARAM" = "upgrade" ]; then
|
||||
echo "M parameter: $M_PARAM"
|
||||
if [ -n "$C_PARAM" ]; then
|
||||
echo "C parameter: $C_PARAM"
|
||||
@@ -164,15 +99,9 @@ if [ "$M_PARAM" == "install" -o "$M_PARAM" == "upgrade" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
systemctl stop restagent.service
|
||||
systemctl stop crontask.service
|
||||
systemctl stop sshsvc.service
|
||||
systemctl stop captrace.service
|
||||
#systemctl stop kvdb.service
|
||||
#systemctl start nginx.service
|
||||
#systemctl start kvdb.service
|
||||
echo -n "Starting OMC service ... "
|
||||
systemctl start crontask.service
|
||||
systemctl start sshsvc.service
|
||||
systemctl start captrace.service
|
||||
systemctl start restagent.service
|
||||
|
||||
echo "done"
|
||||
|
||||
@@ -1,27 +1,31 @@
|
||||
# !/bin/bash
|
||||
|
||||
X86Lib64Dir=/lib/x86_64-linux-gnu
|
||||
cd ${X86Lib64Dir}
|
||||
rm libwireshark.so.15
|
||||
rm libwireshark.so
|
||||
rm libwiretap.so.12
|
||||
rm libwiretap.so
|
||||
rm libwsutil.so.13
|
||||
rm libwsutil.so
|
||||
systemctl stop nginx.service
|
||||
systemctl stop restagent.service
|
||||
systemctl stop crontask.service
|
||||
systemctl stop sshsvc.service
|
||||
systemctl stop captrace.service
|
||||
#systemctl stop kvdb.service
|
||||
rm -rf ${X86Lib64Dir}/libwireshark.so.15
|
||||
rm -rf ${X86Lib64Dir}/libwireshark.so
|
||||
rm -rf ${X86Lib64Dir}/libwiretap.so.12
|
||||
rm -rf ${X86Lib64Dir}/libwiretap.so
|
||||
rm -rf ${X86Lib64Dir}/libwsutil.so.13
|
||||
rm -rf ${X86Lib64Dir}/libwsutil.so
|
||||
|
||||
#rm -rf /usr/local/omc
|
||||
rm -rf /etc/nginx/conf.d/omc.conf
|
||||
rm -f /usr/local/bin/omcd
|
||||
|
||||
systemctl daemon-reload
|
||||
|
||||
if systemctl list-units --type=service --all | grep -q 'restagent.service'; then
|
||||
echo -n "Stopping OMC service ... "
|
||||
systemctl stop restagent.service
|
||||
systemctl stop crontask.service
|
||||
systemctl stop sshsvc.service
|
||||
systemctl stop captrace.service
|
||||
echo "done"
|
||||
fi
|
||||
|
||||
systemctl disable restagent.service
|
||||
systemctl disable crontask.service
|
||||
systemctl disable sshsvc.service
|
||||
systemctl disable captrace.service
|
||||
#systemctl disable kvdb.service
|
||||
systemctl daemon-reload
|
||||
|
||||
systemctl daemon-reload
|
||||
|
||||
@@ -1,6 +1,17 @@
|
||||
# !/bin/bash
|
||||
|
||||
systemctl daemon-reload
|
||||
if systemctl list-units --type=service --all | grep -q 'restagent.service'; then
|
||||
echo -n "Stopping OMC service ... "
|
||||
systemctl stop restagent.service
|
||||
systemctl stop crontask.service
|
||||
systemctl stop sshsvc.service
|
||||
systemctl stop captrace.service
|
||||
echo "done"
|
||||
fi
|
||||
|
||||
FERootDir=/usr/local/omc/htdocs/front
|
||||
|
||||
# apt-get install zip
|
||||
# clear front-end old hash js files
|
||||
rm -rf ${FERootDir}/assets
|
||||
|
||||
@@ -1,51 +1,40 @@
|
||||
server {
|
||||
listen 4443 ssl;
|
||||
listen [::]:4443 ssl;
|
||||
server_name 0.0.0.0;
|
||||
root /usr/local/omc/htdocs/front/;
|
||||
index index.html index.htm;
|
||||
server_name localhost;
|
||||
# SSL
|
||||
ssl_certificate /usr/local/omc/etc/certs/ca_cert.pem;
|
||||
ssl_certificate_key /usr/local/omc/etc/certs/private_key.pem;
|
||||
#ssl_certificate /usr/local/omc/etc/certs/tsa-omc.pem;
|
||||
#ssl_certificate_key /usr/local/omc/etc/certs/tsa-omc_pri.pem;
|
||||
listen 44080;
|
||||
listen 44443;
|
||||
listen [::]:44080;
|
||||
listen [::]:44443;
|
||||
server_name localhost;
|
||||
|
||||
# location /api/rest/securityManagement {
|
||||
# proxy_pass http://127.0.0.1:5050;
|
||||
# }
|
||||
# location /api/rest/resourceManagement {
|
||||
# proxy_pass http://127.0.0.1:5050;
|
||||
# }
|
||||
# location /api/rest/performanceManagement {
|
||||
# proxy_pass http://127.0.0.1:5050;
|
||||
# }
|
||||
# location /api/rest/faultManagement {
|
||||
# proxy_pass http://127.0.0.1:5050;
|
||||
# }
|
||||
# location /api/rest/aaaa/ {
|
||||
# proxy_pass http://127.0.0.1:4040;
|
||||
# }
|
||||
location /api/rest/ {
|
||||
proxy_pass http://127.0.0.1:3030;
|
||||
}
|
||||
client_max_body_size 100M;
|
||||
keepalive_timeout 180s;
|
||||
|
||||
#access_log /var/log/nginx/host.access.log main;
|
||||
|
||||
# ssl_certificate /usr/local/omc/etc/certs/omc-server.crt;
|
||||
# ssl_certificate_key /usr/local/omc/etc/certs/omc-server.key;
|
||||
# ssl_client_certificate /usr/local/omc/etc/certs/omc-ca.crt;
|
||||
# ssl_verify_client on;
|
||||
# ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
|
||||
# ssl_session_timeout 5m;
|
||||
# ssl_ciphers EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;
|
||||
# ssl_prefer_server_ciphers on;
|
||||
|
||||
# OMC
|
||||
location / {
|
||||
try_files $uri $uri/ =404;
|
||||
root /usr/local/omc/htdocs/front;
|
||||
|
||||
try_files $uri $uri/ /index.html;
|
||||
index index.html index.htm;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
listen 8888 default_server;
|
||||
listen [::]:8888 default_server;
|
||||
root /usr/local/omc/htdocs/front/;
|
||||
index index.html index.htm;
|
||||
server_name localhost;
|
||||
|
||||
location /omc-api/ {
|
||||
proxy_pass http://127.0.0.1:3030/;
|
||||
|
||||
proxy_http_version 1.1;
|
||||
proxy_cache_bypass $http_upgrade;
|
||||
proxy_pass http://127.0.0.1:33030/;
|
||||
|
||||
proxy_connect_timeout 180s;
|
||||
proxy_send_timeout 180s;
|
||||
proxy_read_timeout 180s;
|
||||
|
||||
proxy_cache_bypass $http_upgrade;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_set_header Host $host;
|
||||
@@ -56,11 +45,27 @@ server {
|
||||
proxy_set_header X-Forwarded-Port $server_port;
|
||||
}
|
||||
|
||||
location / {
|
||||
root /usr/local/omc/htdocs/front;
|
||||
location /api/rest/ {
|
||||
proxy_pass http://127.0.0.1:33030/api/rest/;
|
||||
|
||||
try_files $uri $uri/ /index.html;
|
||||
index index.html index.htm;
|
||||
proxy_cache_bypass $http_upgrade;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header X-Forwarded-Host $host;
|
||||
proxy_set_header X-Forwarded-Port $server_port;
|
||||
}
|
||||
|
||||
#error_page 404 /404.html;
|
||||
|
||||
# redirect server error pages to the static page /50x.html
|
||||
#
|
||||
error_page 500 502 503 504 /50x.html;
|
||||
location = /50x.html {
|
||||
root /usr/share/nginx/html;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
[Service]
|
||||
Type=forking
|
||||
ExecStart=/usr/local/bin/kvdb-server /usr/local/etc/kvdb/kvdb.conf
|
||||
ExecStopPost=
|
||||
PIDFile=
|
||||
Restart=always
|
||||
RestartSec=3
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
||||
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -4,35 +4,39 @@
|
||||
# count: rotation count of log, default is 30 rotation
|
||||
logger:
|
||||
file: /usr/local/omc/log/restagent.log
|
||||
level: debug
|
||||
level: warn
|
||||
duration: 24
|
||||
count: 90
|
||||
|
||||
# rest agent listen ipv4/v6 and port, support multiple routines
|
||||
# ip: 0.0.0.0 or ::0, support IPv4/v6
|
||||
# clientAuthType: 0:NoClientCert (default), 1:RequestClientCert, 2:RequireAnyClientCert,
|
||||
# 3:VerifyClientCertIfGiven, 4:RequireAndVerifyClientCerts
|
||||
rest:
|
||||
- ipv4: 0.0.0.0
|
||||
ipv6:
|
||||
port: 3030
|
||||
port: 33030
|
||||
- ipv4: 0.0.0.0
|
||||
ipv6:
|
||||
port: 4443
|
||||
port: 33443
|
||||
schema: https
|
||||
caFile: /usr/local/omc/etc/certs/rootca.crt
|
||||
certFile: /usr/local/omc/etc/certs/tsa-omc.crt
|
||||
keyFile: /usr/local/omc/etc/certs/tsa-omc_pri.key
|
||||
clientAuthType: 0
|
||||
caFile: /usr/local/omc/etc/certs/omc-ca.crt
|
||||
certFile: /usr/local/omc/etc/certs/omc-server.crt
|
||||
keyFile: /usr/local/omc/etc/certs/omc-server.key
|
||||
|
||||
webServer:
|
||||
enabled: true
|
||||
rootDir: /usr/local/omc/htdocs/front
|
||||
listen:
|
||||
- addr: :8080
|
||||
- addr: :80
|
||||
schema: http
|
||||
- addr: :8443
|
||||
- addr: :443
|
||||
schema: https
|
||||
caFile: /usr/local/omc/etc/certs/rootca.crt
|
||||
certFile: /usr/local/omc/etc/certs/tsa-omc.crt
|
||||
keyFile: /usr/local/omc/etc/certs/tsa-omc_pri.key
|
||||
clientAuthType: 0
|
||||
caFile: /usr/local/omc/etc/certs/omc-ca.crt
|
||||
certFile: /usr/local/omc/etc/certs/omc-server.crt
|
||||
keyFile: /usr/local/omc/etc/certs/omc-server.key
|
||||
|
||||
database:
|
||||
type: mysql
|
||||
@@ -43,87 +47,113 @@ database:
|
||||
name: tenants_db
|
||||
backup: /usr/local/omc/database
|
||||
|
||||
# Redis 缓存数据，数据源声明全小写
|
||||
# Redis data cache
|
||||
redis:
|
||||
dataSource:
|
||||
# OMC系统使用库
|
||||
# OMC system db
|
||||
default:
|
||||
port: 6379 # Redis port
|
||||
host: "127.0.0.1" # Redis host
|
||||
password: ""
|
||||
password: "helloearth"
|
||||
db: 10 # Redis db_num
|
||||
# UDM网元用户库
|
||||
# UDM sub/auth db
|
||||
udmuser:
|
||||
port: 6379 # Redis port
|
||||
host: "127.0.0.1"
|
||||
password: ""
|
||||
password: "helloearth"
|
||||
db: 0 # Redis db_num
|
||||
# 多个数据源时可以用这个指定默认的数据源
|
||||
# used to specify the default data source for multiple data resourece
|
||||
defaultDataSourceName: "default"
|
||||
|
||||
# sleep: time delay for after write buffer (millisecond)
|
||||
# deadLine: timeout for io read and write (second)
|
||||
mml:
|
||||
port: 4100
|
||||
port2: 5002
|
||||
sleep: 200
|
||||
deadLine: 10
|
||||
sizeRow: 600
|
||||
sizeCol: 128
|
||||
bufferSize: 65535
|
||||
user: admin
|
||||
password: admin
|
||||
mmlHome: ./mmlhome
|
||||
upload: /home/agtuser
|
||||
|
||||
# NE config
|
||||
ne:
|
||||
user: agtuser
|
||||
user: omcuser
|
||||
etcdir: /usr/local/etc
|
||||
bindir: /usr/local/bin
|
||||
omcdir: /usr/local/omc
|
||||
scpdir: /tmp
|
||||
licensedir: /usr/local/etc/{neType}/license
|
||||
# backup etc list of IMS, does not contain spaces
|
||||
etcListIMS: '{*.yaml,mmtel,vars.cfg}'
|
||||
etcListDefault: '{*.yaml,*.conf,*.cfg}'
|
||||
# true/false to overwrite config file when dpkg ne software
|
||||
dpkgOverwrite: false
|
||||
# dpkg timeout (second)
|
||||
dpkgTimeout: 180
|
||||
|
||||
# chk2ne: true/false, if put OmcNeConfig parameters to NE
|
||||
omc:
|
||||
uriPrefix: /api/rest/oam
|
||||
uriPrefix: "/omc/rest"
|
||||
neType: OMC
|
||||
neId: 001
|
||||
rmUID: 4400HX101
|
||||
neName: OMC
|
||||
province: GD
|
||||
province: ""
|
||||
vendor: ""
|
||||
dn: 4600
|
||||
dn: ""
|
||||
chk2ne: false
|
||||
sn: 13750650
|
||||
sn: "-"
|
||||
checksign: false
|
||||
rootDir: /usr/local/omc
|
||||
binDir: /usr/local/omc/bin
|
||||
backup: /usr/local/omc/backup
|
||||
upload: /usr/local/omc/upload
|
||||
frontUpload: /usr/local/omc/htdocs/front/upload
|
||||
frontTraceDir: /usr/local/omc/htdocs/front/trace
|
||||
software: /usr/local/omc/software
|
||||
license: /usr/local/omc/license
|
||||
gtpUri: gtp:192.168.2.119:2152
|
||||
gtpUri: gtp:192.168.2.119:32152
|
||||
checkContentType: false
|
||||
testMode: false
|
||||
rbacMode: true
|
||||
runDir: /usr/local/omc/run
|
||||
cmdTimeout: 120
|
||||
|
||||
# Alarm module setting
|
||||
# Forward interface:
|
||||
# email/sms
|
||||
# email/sms/smsc
|
||||
alarm:
|
||||
forwardAlarm: true
|
||||
email:
|
||||
smtp: smtp@xxx.com
|
||||
smtp: smtp.xxx.com
|
||||
port: 25
|
||||
user: smtpuser
|
||||
password: smtpuser@omc
|
||||
user: smtpuser@xxx.com
|
||||
password: xxxxxx
|
||||
# TLS skip verify: true/false
|
||||
tlsSkipVerify: true
|
||||
smProxy: smsc
|
||||
sms:
|
||||
apiURL: http://smsc.xxx.com
|
||||
accessKeyID: xxx
|
||||
accessKeySecret: xxx
|
||||
signName: XXX SMSC
|
||||
templateCode: 1000
|
||||
smsc:
|
||||
addr: "192.168.13.114:2775"
|
||||
systemID: "alarmsmsfw"
|
||||
password: "omc123"
|
||||
systemType: ""
|
||||
|
||||
#User authorized information
|
||||
# User authorized information
|
||||
# crypt: mysql/md5/bcrypt
|
||||
# token: true/false to check accessToken
|
||||
# expires for session, unit: second
|
||||
# Support single/multiple session of user
|
||||
#
|
||||
auth:
|
||||
crypt: bcrypt
|
||||
token: true
|
||||
@@ -148,5 +178,5 @@ params:
|
||||
rmuidregexp: "[0-9]{4}[A-Z]{2}[A-Z]{2}[0-9A-Z]{1}[0-9A-Z]{3}[0-9A-Z]{1,16}"
|
||||
|
||||
testConfig:
|
||||
enabled: true
|
||||
enabled: false
|
||||
file: /usr/local/omc/etc/testconfig.yaml
|
||||
Reference in New Issue
Block a user