update

midoks · Jul 15, 2024 · 9851b54 · 9851b54
1 parent 19e1019
commit 9851b54
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/plugins/zabbix/conf/zabbix.conf.php b/plugins/zabbix/conf/zabbix.conf.php
@@ -3,10 +3,10 @@
 
 $DB['TYPE']				= 'MYSQL';
 $DB['SERVER']			= '127.0.0.1';
-$DB['PORT']				= '{$ZABBIX_PORT}';
+$DB['PORT']				= '{$ZABBIX_DB_PORT}';
 $DB['DATABASE']			= 'zabbix';
 $DB['USER']				= 'zabbix';
-$DB['PASSWORD']			= '{$ZABBIX_PASS}';
+$DB['PASSWORD']			= '{$ZABBIX_DB_PASS}';
 
 // Schema name. Used for PostgreSQL.
 $DB['SCHEMA']			= '';

diff --git a/plugins/zabbix/conf/zabbix_server.conf b/plugins/zabbix/conf/zabbix_server.conf
@@ -3,8 +3,8 @@ LogFileSize=1
 PidFile=/run/zabbix/zabbix_server.pid
 SocketDir=/run/zabbix
 DBHost=127.0.0.1
-DBPort={$ZABBIX_PORT}
+DBPort={$ZABBIX_DB_PORT}
 DBName=zabbix
 DBUser=zabbix
-DBPassword={$ZABBIX_PASS}
+DBPassword={$ZABBIX_DB_PASS}
 ListenPort=10051
diff --git a/plugins/zabbix/index.py b/plugins/zabbix/index.py
@@ -112,6 +112,11 @@ def contentReplace(content):
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$ZABBIX_ROOT}', '/usr/share/zabbix')
     content = content.replace('{$ZABBIX_PORT}', '18888')
+
+    psdb = pSqliteDb('databases')
+    db_pass = psdb.where('name = ?', ('zabbix',)).getField('password')
+    content = content.replace('{$ZABBIX_DB_PORT}', getMySQLPort())
+    content = content.replace('{$ZABBIX_DB_PASS}', db_pass)
     return content
 
 
@@ -189,8 +194,7 @@ def zabbixImportMySQLData():
     # php配置
     if not os.path.exists(php_dst_path):
         content = mw.readFile(php_src_tpl)
-        content = content.replace('{$ZABBIX_PORT}', getMySQLPort())
-        content = content.replace('{$ZABBIX_PASS}', db_pass)
+        content = contentReplace(content)
         mw.writeFile(php_dst_path, content)
 
     return True
@@ -209,12 +213,9 @@ def initZsConf():
     zs_src_tpl = getPluginDir()+'/conf/zabbix_server.conf'
     zs_dst_path = zabbixServerConf()
 
-    psdb = pSqliteDb('databases')
-    db_pass = psdb.where('name = ?', ('zabbix',)).getField('password')
-    # nginx配置
+    # zabbix_server配置
     content = mw.readFile(zs_src_tpl)
-    content = content.replace('{$ZABBIX_PORT}', getMySQLPort())
-    content = content.replace('{$ZABBIX_PASS}', db_pass)
+    content = contentReplace(content)
     mw.writeFile(zs_dst_path, content)
 
 def initDreplace():