Merge branch 'master' of http://git.quantgroup.cn/QA/qa-deploy-utils

qa_shell_script/ngrok/make_frp_ini_V2.sh

@@ -85,7 +85,7 @@ createK8sNginxConf(){
 	echo "    proxy_set_header  REMOTE_ADDR        \$remote_addr; " >> $file_name
 	echo "    proxy_set_header  REMOTE_PORT        \$remote_port; " >> $file_name
 	echo "		 " >> $file_name
-	echo "    set \$ip \"\"; " >> $file_name
+	echo "    set \$ip \"192.168.6.3\"; " >> $file_name
 	echo "    location / { " >> $file_name
 	echo "					${_str} " >> $file_name
 	echo "					proxy_pass http://\$ip; " >> $file_name
@@ -94,7 +94,7 @@ createK8sNginxConf(){
 	echo " " >> $file_name
 	echo "server { " >> $file_name
 	echo "    listen 443 ssl; " >> $file_name
-	echo "		server_name _; " >> $file_name
+	echo "		server_name *.q-gp.com; " >> $file_name
 	echo "    proxy_set_header QT_TOKEN  \$http_QT_TOKEN; " >> $file_name
 	echo "    ssl_certificate      /home/q-gp/ssl/certificate.crt; " >> $file_name
 	echo "    ssl_certificate_key  /home/q-gp/ssl/private.key; " >> $file_name
@@ -106,7 +106,7 @@ createK8sNginxConf(){
 	echo "    proxy_set_header  REMOTE_ADDR        \$remote_addr; " >> $file_name
 	echo "    proxy_set_header  REMOTE_PORT        \$remote_port; " >> $file_name
 	echo " " >> $file_name
-	echo "		set \$ip \"\"; " >> $file_name
+	echo "		set \$ip \"192.168.6.3\"; " >> $file_name
 	echo "    location / { " >> $file_name
 	echo "				${_str} " >> $file_name
 	echo "        proxy_pass http://\$ip; " >> $file_name
@@ -138,13 +138,12 @@ createNginxHttpAndSSLConf qg qg 172.30.220.22 10087 10087 $nginxname/base.conf
 createNginxHttpAndSSLConf bp bp 172.30.220.22 10084 10084 $nginxname/base.conf
 createNginxHttpAndSSLConf qahelp qahelp 172.30.220.22 8000 8000 $nginxname/base.conf
 createNginxHttpAndSSLConf store store 172.30.220.22 9000 9000 $nginxname/base.conf
-createNginxHttpAndSSLConf mock mock 172.30.220.22 8080 8080 $nginxname/base.conf
 createNginxHttpAndSSLConf atm atm 172.30.220.43 80 80 $nginxname/base.conf
-createNginxHttpAndSSLConf mockapi mockapi 172.30.220.22 80 80 $nginxname/base.conf
 createNginxHttpAndSSLConf acs acs 172.30.220.43 8585 8585 $nginxname/base.conf
 createNginxHttpAndSSLConf a a 172.30.220.22 80 80 $nginxname/base.conf
-
-
+createNginxHttpAndSSLConf mock mock 172.30.220.22 8080 8080 $nginxname/base.conf
+createNginxHttpAndSSLConf mockapi mockapi 172.30.220.22 80 80 $nginxname/base.conf
+createNginxHttpAndSSLConf mockm mockm 172.30.220.22 9010 9010 $nginxname/base.conf
 
 
 for ip_last in ${ips[@]}
@@ -177,3 +176,21 @@ done
 createK8sNginxConf $nginxname/k8s.conf
 
 nginx -s reload
+
+
+
+#   3     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+#   2                       '$status $body_bytes_sent "$http_referer" '
+#   1                       '"$http_user_agent" "$http_x_forwarded_for" "$http_QT_TOKEN"';
+# 23      server_names_hash_bucket_size 10240;
+#   1     sendfile        on;
+#   2     tcp_nopush     on;
+
+
+#  15         access_log  logs/k8s.log main;
+ # 16         error_log  logs/k8s_error.log;
+ # 17         default_type text/plain;
+ 
+ #       content_by_lua '
+ #                       ngx.say(ngx.var.ip);
+ #               ';
\ No newline at end of file