Browse Source

Merge branch 'main' into v2.1.1

晏壮壮 yanzhuangzhuang () 2 years ago
parent
commit
5b9dca1c16
2 changed files with 20 additions and 0 deletions
  1. 10 0
      archive/install_script_v2.1.0.sh
  2. 10 0
      install_script.sh

+ 10 - 0
archive/install_script_v2.1.0.sh

@@ -70,6 +70,8 @@ init_var() {
   TROJAN_PANEL_DATA="/tpdata/trojan-panel/"
   TROJAN_PANEL_WEBFILE="${TROJAN_PANEL_DATA}webfile/"
   TROJAN_PANEL_LOGS="${TROJAN_PANEL_DATA}logs/"
+  TROJAN_PANEL_EXPORT="${TROJAN_PANEL_DATA}config/export/"
+  TROJAN_PANEL_TEMPLATE="${TROJAN_PANEL_DATA}config/template/"
 
   # Trojan Panel UI
   TROJAN_PANEL_UI_DATA="/tpdata/trojan-panel-ui/"
@@ -950,7 +952,10 @@ install_trojan_panel() {
         --network=host \
         -v ${WEB_PATH}:${TROJAN_PANEL_WEBFILE} \
         -v ${TROJAN_PANEL_LOGS}:${TROJAN_PANEL_LOGS} \
+        -v ${TROJAN_PANEL_EXPORT}:${TROJAN_PANEL_EXPORT} \
+        -v ${TROJAN_PANEL_TEMPLATE}:${TROJAN_PANEL_TEMPLATE} \
         -v /etc/localtime:/etc/localtime \
+        -e GIN_MODE=release \
         -e "mariadb_ip=${mariadb_ip}" \
         -e "mariadb_port=${mariadb_port}" \
         -e "mariadb_user=${mariadb_user}" \
@@ -1132,6 +1137,7 @@ install_trojan_panel_core() {
         -v ${CERT_PATH}:${CERT_PATH} \
         -v ${WEB_PATH}:${WEB_PATH} \
         -v /etc/localtime:/etc/localtime \
+        -e GIN_MODE=release \
         -e "mariadb_ip=${mariadb_ip}" \
         -e "mariadb_port=${mariadb_port}" \
         -e "mariadb_user=${mariadb_user}" \
@@ -1272,7 +1278,10 @@ update_trojan_panel() {
         --network=host \
         -v ${WEB_PATH}:${TROJAN_PANEL_WEBFILE} \
         -v ${TROJAN_PANEL_LOGS}:${TROJAN_PANEL_LOGS} \
+        -v ${TROJAN_PANEL_EXPORT}:${TROJAN_PANEL_EXPORT} \
+        -v ${TROJAN_PANEL_TEMPLATE}:${TROJAN_PANEL_TEMPLATE} \
         -v /etc/localtime:/etc/localtime \
+        -e GIN_MODE=release \
         -e "mariadb_ip=${mariadb_ip}" \
         -e "mariadb_port=${mariadb_port}" \
         -e "mariadb_user=${mariadb_user}" \
@@ -1380,6 +1389,7 @@ update_trojan_panel_core() {
         -v ${CERT_PATH}:${CERT_PATH} \
         -v ${WEB_PATH}:${WEB_PATH} \
         -v /etc/localtime:/etc/localtime \
+        -e GIN_MODE=release \
         -e "mariadb_ip=${mariadb_ip}" \
         -e "mariadb_port=${mariadb_port}" \
         -e "mariadb_user=${mariadb_user}" \

+ 10 - 0
install_script.sh

@@ -70,6 +70,8 @@ init_var() {
   TROJAN_PANEL_DATA="/tpdata/trojan-panel/"
   TROJAN_PANEL_WEBFILE="${TROJAN_PANEL_DATA}webfile/"
   TROJAN_PANEL_LOGS="${TROJAN_PANEL_DATA}logs/"
+  TROJAN_PANEL_EXPORT="${TROJAN_PANEL_DATA}config/export/"
+  TROJAN_PANEL_TEMPLATE="${TROJAN_PANEL_DATA}config/template/"
 
   # Trojan Panel UI
   TROJAN_PANEL_UI_DATA="/tpdata/trojan-panel-ui/"
@@ -951,7 +953,10 @@ install_trojan_panel() {
         --network=host \
         -v ${WEB_PATH}:${TROJAN_PANEL_WEBFILE} \
         -v ${TROJAN_PANEL_LOGS}:${TROJAN_PANEL_LOGS} \
+        -v ${TROJAN_PANEL_EXPORT}:${TROJAN_PANEL_EXPORT} \
+        -v ${TROJAN_PANEL_TEMPLATE}:${TROJAN_PANEL_TEMPLATE} \
         -v /etc/localtime:/etc/localtime \
+        -e GIN_MODE=release \
         -e "mariadb_ip=${mariadb_ip}" \
         -e "mariadb_port=${mariadb_port}" \
         -e "mariadb_user=${mariadb_user}" \
@@ -1133,6 +1138,7 @@ install_trojan_panel_core() {
         -v ${CERT_PATH}:${CERT_PATH} \
         -v ${WEB_PATH}:${WEB_PATH} \
         -v /etc/localtime:/etc/localtime \
+        -e GIN_MODE=release \
         -e "mariadb_ip=${mariadb_ip}" \
         -e "mariadb_port=${mariadb_port}" \
         -e "mariadb_user=${mariadb_user}" \
@@ -1278,7 +1284,10 @@ update_trojan_panel() {
         --network=host \
         -v ${WEB_PATH}:${TROJAN_PANEL_WEBFILE} \
         -v ${TROJAN_PANEL_LOGS}:${TROJAN_PANEL_LOGS} \
+        -v ${TROJAN_PANEL_EXPORT}:${TROJAN_PANEL_EXPORT} \
+        -v ${TROJAN_PANEL_TEMPLATE}:${TROJAN_PANEL_TEMPLATE} \
         -v /etc/localtime:/etc/localtime \
+        -e GIN_MODE=release \
         -e "mariadb_ip=${mariadb_ip}" \
         -e "mariadb_port=${mariadb_port}" \
         -e "mariadb_user=${mariadb_user}" \
@@ -1386,6 +1395,7 @@ update_trojan_panel_core() {
         -v ${CERT_PATH}:${CERT_PATH} \
         -v ${WEB_PATH}:${WEB_PATH} \
         -v /etc/localtime:/etc/localtime \
+        -e GIN_MODE=release \
         -e "mariadb_ip=${mariadb_ip}" \
         -e "mariadb_port=${mariadb_port}" \
         -e "mariadb_user=${mariadb_user}" \