diff --git a/bazhong.sh b/bazhong.sh index f97fd3d..c6c3e37 100644 --- a/bazhong.sh +++ b/bazhong.sh @@ -3,7 +3,7 @@ export VERSION=default export DOMAIN=bazhong #域名后缀 -export DOMAIN_END=jouavcloud.com +export DOMAIN_END=bazhongfeifu.com # 主机对外爆露的HTTP端口 export NGINX_HTTP_PORT=9999 # 主机对外爆露的HTTPS端口 @@ -31,4 +31,19 @@ export BUSINESS_WEB_DIST=/home/th/workspace/dockerbuilder/webs/bazhong/business_ #域名证书位置写在这边 #export PEM_PATH=/opt/tuoheng/jocloud/jouavcloud.com.pem -#export KEY_PATH=/opt/tuoheng/jocloud/jouavcloud.com.key \ No newline at end of file +#export KEY_PATH=/opt/tuoheng/jocloud/jouavcloud.com.key + + +export SKYWALKING_UI_DOMAIN=sky-${DOMAIN}.${DOMAIN_END} +export CONSUL_DOMAIN=consul-${DOMAIN}.${DOMAIN_END} +export XXLJOB_DOMAIN=xxljob-${DOMAIN}.${DOMAIN_END} +export OIDC_SERVER_DOMAIN=oidc-${DOMAIN}.${DOMAIN_END} +export OIDC_ADMIN_DOMAIN=oidcadmin-${DOMAIN}.${DOMAIN_END} +export MINIO_DOMAIN=minio.${DOMAIN_END} +export MINIO_CONSOLE_DOMAIN=minioconsole.${DOMAIN_END} +export AIRPORT_DOMAIN=airport.${DOMAIN_END} +export BUSINESS_DOMAIN=business.${DOMAIN_END} +export SRS_DOMAIN=srs.${DOMAIN_END} +export HHZ_DOMAIN=hhz.${DOMAIN_END} +export DSP_DOMAIN=dsp.${DOMAIN_END} +export KAFKA_DOMAIN=kafka.${DOMAIN_END} \ No newline at end of file diff --git a/environment.sh b/environment.sh index 0da5334..0879334 100644 --- a/environment.sh +++ b/environment.sh @@ -51,28 +51,70 @@ else echo "环境变量 NGINX_HTTPS_PORT 已设置,设置为 ${NGINX_HTTPS_PORT}" fi -export SKYWALKING_UI_DOMAIN=sky-${DOMAIN}.${DOMAIN_END} -export CONSUL_DOMAIN=consul-${DOMAIN}.${DOMAIN_END} -export XXLJOB_DOMAIN=xxljob-${DOMAIN}.${DOMAIN_END} -export OIDC_SERVER_DOMAIN=oidc-${DOMAIN}.${DOMAIN_END} +if [ -z "$SKYWALKING_UI_DOMAIN" ]; then + export SKYWALKING_UI_DOMAIN=sky-${DOMAIN}.${DOMAIN_END} +fi + +if [ -z "$CONSUL_DOMAIN" ]; then + export CONSUL_DOMAIN=consul-${DOMAIN}.${DOMAIN_END} +fi + +if [ -z "$XXLJOB_DOMAIN" ]; then + export XXLJOB_DOMAIN=xxljob-${DOMAIN}.${DOMAIN_END} +fi + +if [ -z "$OIDC_SERVER_DOMAIN" ]; then + export OIDC_SERVER_DOMAIN=oidc-${DOMAIN}.${DOMAIN_END} +fi export OIDC_DOMAIN_FULL=${OIDC_SERVER_DOMAIN}:${NGINX_HTTPS_PORT} -export OIDC_ADMIN_DOMAIN=oidcadmin-${DOMAIN}.${DOMAIN_END} + +if [ -z "$OIDC_ADMIN_DOMAIN" ]; then + export OIDC_ADMIN_DOMAIN=oidcadmin-${DOMAIN}.${DOMAIN_END} +fi export OIDC_ADMIN_DOMAIN_FULL=${OIDC_ADMIN_DOMAIN}:${NGINX_HTTPS_PORT} -export MINIO_DOMAIN=minio-${DOMAIN}.${DOMAIN_END} -export MINIO_CONSOLE_DOMAIN=minioconsole-${DOMAIN}.${DOMAIN_END} -export AIRPORT_DOMAIN=airport-${DOMAIN}.${DOMAIN_END} + +if [ -z "$MINIO_DOMAIN" ]; then + export MINIO_DOMAIN=minio-${DOMAIN}.${DOMAIN_END} +fi + +if [ -z "$MINIO_CONSOLE_DOMAIN" ]; then + export MINIO_CONSOLE_DOMAIN=minioconsole-${DOMAIN}.${DOMAIN_END} +fi + +if [ -z "$AIRPORT_DOMAIN" ]; then + export AIRPORT_DOMAIN=airport-${DOMAIN}.${DOMAIN_END} +fi export AIRPORT_DOMAIN_FULL=${AIRPORT_DOMAIN}:${NGINX_HTTPS_PORT} -export BUSINESS_DOMAIN=business-${DOMAIN}.${DOMAIN_END} + +if [ -z "$BUSINESS_DOMAIN" ]; then + export BUSINESS_DOMAIN=business-${DOMAIN}.${DOMAIN_END} +fi export BUSINESS_DOMAIN_FULL=${BUSINESS_DOMAIN}:${NGINX_HTTPS_PORT} -export SRS_DOMAIN=srs-${DOMAIN}.${DOMAIN_END} + +if [ -z "$SRS_DOMAIN" ]; then + export SRS_DOMAIN=srs-${DOMAIN}.${DOMAIN_END} +fi export SRS_DOMAIN_FULL=${SRS_DOMAIN}:${NGINX_HTTPS_PORT} -export HHZ_DOMAIN=hhz-${DOMAIN}.${DOMAIN_END} + +if [ -z "$HHZ_DOMAIN" ]; then + export HHZ_DOMAIN=hhz-${DOMAIN}.${DOMAIN_END} +fi export HHZ_DOMAIN_FULL=${HHZ_DOMAIN}:${NGINX_HTTPS_PORT} -export DSP_DOMAIN=dsp-${DOMAIN}.${DOMAIN_END} + +if [ -z "$DSP_DOMAIN" ]; then + export DSP_DOMAIN=dsp-${DOMAIN}.${DOMAIN_END} +fi export DSP_DOMAIN_FULL=${DSP_DOMAIN}:${NGINX_HTTPS_PORT} export REGISTRY_HOST=${REGISTRY}/tuoheng/ -export KAFKA_DOMAIN=kafka-${DOMAIN}.${DOMAIN_END} +if [ -z "$KAFKA_DOMAIN" ]; then + export KAFKA_DOMAIN=kafka-${DOMAIN}.${DOMAIN_END} +fi + + + + + #Nginx 配置 export NGINX_NAME=NGINX_${DOMAIN} @@ -209,8 +251,8 @@ export ES_DATA=${NETWORK}_es_data # SkyWalking 配置 export SKYWALKING_OAP_NAME=SKYWALKING_OAP_${DOMAIN} export SKYWALKING_UI_NAME=SKYWALKING_UI_${DOMAIN} -export SKYWALKING_OAP_IMAGE=apache/skywalking-oap-server:8.6.0-es7 -export SKYWALKING_UI_IMAGE=apache/skywalking-ui:8.6.0 +export SKYWALKING_OAP_IMAGE=${REGISTRY_HOST}apache/skywalking-oap-server:8.6.0-es7 +export SKYWALKING_UI_IMAGE=${REGISTRY_HOST}apache/skywalking-ui:8.6.0 export SKYWALKING_OAP_MEMORY=512m export SKYWALKING_UI_MEMORY=512m # SkyWalking UI对外爆露端口 diff --git a/nginxbazhong/vhosts/cert/t-aaron.com.key b/nginxbazhong/vhosts/cert/t-aaron.com.key index 0c8a325..084bdf2 100644 --- a/nginxbazhong/vhosts/cert/t-aaron.com.key +++ b/nginxbazhong/vhosts/cert/t-aaron.com.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEA25lx3A2pDVMDxs1ecKHxGJwKTValNrnJqCY4q1cirGT5ES9M -JagMOPCGpiGO1CzcIY04HGtF2DZ3qZO7duKXfW+H/yZAZeJp8NHKEH1UVcrW3azl -KPxflR/nF0Wjmxdyv7Rc+EBPO6UHRycFsejQw1QKXvj2oGVHiwbP7vdAq3iLDBwp -iT0d8WZcw5a+gQwx4mqex06YkpxXx0ggCb++Z6AD4Iys9fV3Fa95ez3JlqcgK17S -hiNDO2liI3iGTB5CrDnmsie+iq/iWjdbZjdD+8kkVs0caxvNHynUvhBY23Kiys0A -mjj6kOVOl36Q6cXvRDqz+JsN10ec7iCgjA0+XwIDAQABAoIBACdBF6RRYM278Cni -XiZeHF3czs6iVWgh79U599lQ+ya76fXTcZYtovmurTMXPpPY7QSmXMhfuJ18pwlO -Gi2XNaM7g6DtcoeD4JImvisSbDflyWDY3iHkcyWSDVoQnb1EhMOV9yR9QmyUBGgI -prD1wBOaezwc3uEvGYnVjufVlN7RmZy7Wi3K3uNbbkPcPv4bYZagwNMXusIqgWBO -ZGuC2vbYMo4aD/dg8L94IWLA/lXrehnoo6/A7B3fO6gOyWAfK+WOSg7V5kPm49E4 -nhs5jyyqnr/mvGT+590GzI4ERmr/OsYuk4sIk6XI0/xmUtGNIuVvpOjEqFVlh74Z -7Ly7U0ECgYEA9nkucVCtDTMMciFOXN8YsehxYIt4Nt5BAfoa8TbQ7FK+DIEnbY0l -uRNJTFUXGP70lChoQ49b8XbxMEbFWwv+oXIyKTDaR05jfjiDA2UfPOaYXZUJmbwD -KL9Ruj11AM4V/ia1ywjIBF8PyBBxVRGJXUqCgWqcJRs/njPqCRakEiECgYEA5BZZ -aOpq8f4LNnSDRs/mAHfKtaj6SczkJAanNlfgXaiwMydwpzLF0YlRa3lxpC6t5FSL -JCm/K9uw3j+uZUrRudEGlyxiqQqUun1X94ICDq61JhC6N374i0oWLFwYZTOLrKFD -mOrWJRqNC92O7CyACljwrZ4yoaA3WJIDIgggQH8CgYEArYNoH5vVB/rNIzexTA4+ -+1gRIQ9uhOn4R+UDvJaDhCtH4dO2pxf724vpSRSKGy25jufXZuBwsM+0QfFAlLUg -ABY9m+PpdtOHlV9BVE2HLT+FOjRmutSyQKhXZ85GJVfwAajMyG+ZKAKoQIba0jFz -S7rdnzAnVrQVGFGhy94liSECgYAqYujcsWuMawyEYySePTZd8eUO20cf/d6Lv1zF -oZEFdrq/1t19hNb0OJOT6G6w9yfDnd55qvRm3x3AP49WLZBJ+slBwLLY/SlkerSl -P1jIh7kMSOGCPKtNn0f9mGPEMs8LFrDsMv/2xzdc9CCCTUbCJYMckKCSHqcKY6AH -bAEqWwKBgAUfj7I+8VKY/Bbkdtq282VbESNMXry+xTl76MpUdWrGmzj6uqupD9ia -s9BTD+WVg3fBKLegZd04PAiShvg7AHcM0sz5s31PkPs9itTSI12WJb7uTXjCbrF/ -Kk3n3D/NarLljEH1FRk7vIpkzmVgVoP6y2qQ4XvBcCBECsuTrSi8 ------END RSA PRIVATE KEY----- \ No newline at end of file +MIIEpQIBAAKCAQEAzgFo1avCs7whcfARpcr/SfBxY2QY+tsiJIDdueMIU30g0wOa +oAKUR1pTQvXgUfQUpqc1CQTLI/NuxxOI9+VKIs3XreqC1GGE8tsKhiarYgKxg2hT +pONRGvgJY9k8v0ivZ8pnh82+5T62P3sMxnXl92MboZ2QNG93eOvm6hLjYYgia0J5 +xGJF3UH3fkDmEFkcBei8cLzcZ7E6F4+z9/6rGCsGVeXMvOBH8DDooCrGgY/Q4DXF +NgRUQcAZiY+xHyWE9AkqQsMN5S00GLmmVZzUYJT7Yab8pBMzS2JjSz8zEUSC79fj +9go8LRVh9kGj49xkqBDZ061D7Bf7AKKxeYf2pQIDAQABAoIBAENRyZj9urAym/lY +WuQDjN50QRGaTeF4R9WG+S48R2XFH7tlU5vTi/IvTcM1h1swuKjnPlkWpG24qOxM +cXeVCd+Kxd8TIjLWNXSJaQyCyYHLYIgRSTg6grAd+y+Sd5wI3C0+Qwvpi+btUfA3 +vWqDb6Wi0Q5E57GC9Zdh+8Flb8HYfS2oUCa+ybV7haugBxVJ6wfDJ6ap8U2tAs4r +FsfWntb01j57crr851pRFPZduB6UrQyOIdOiEzQatHfF9fUBIPMojAQkjZ7oXKUD +rkK+AiW8wjp8b1QtM98d2EZ6PY6CCIIA7pW1Km7mn/tcayCLOP+Wp9wuvXzfcFfr +ZBkwGhcCgYEA8AvcnZfU3GpG4Mj6Y2xVo4CnpEGtZXsCBNaTvEiHmB0S00cKJW8O +bGBJ427Okwh7SMlKwgbq3G3zwPLysLyUkUyzhUNg1jLOYoWgjVmneqEnfFBc50PD +4f9PLVI4BR+JhiE3yKf6KWGFGPBD8AuO0t8SE5eewbHuvsU0SANHxrcCgYEA27Jg +5Uy81mtJOevK4sESf5U0MRpVBAuDsqeipXb+Et9RldfVj4wgEI+UmScSdGmGedB8 +hcieQR7WN/xWa35vPmUTrv6NVJCPdl8jgXa9kkQ4G14FtM8wb3UvqUV7V5rYlwYD +IKiMClrzLuAhO/DZ4ksl4WmfMMydcZNt7wEd8YMCgYEAuZLh/i9HzxKWMucMs1oo +JpuqflCL5V0gJW9hjPihYtZvHEjaLjBZ/Sy/UoTyTDcNYCrFkZRZcwnJnIv1VO6l +CGM8kbSSI2Xpqb7WbRA3apU1emSCPgNkZs3Cfy4FwugroDcD8iryOZV7mNj+HJBC +3QC4786SW/nbsT2xek6W6acCgYEAvctvbAiMRsyumQw73QMg4Plb+mOeOH1eC/RI +TZvryRAGImYwh+9tMAFqRZj8l3cmhov3V3hGR0nFlN45Jmo23ndhttcP75NnbMKq +IMkc4oRu2C20zkwDsvZQ83IkKT2LiYTXJNqXCMcjuUZFT8w13wo+smqV7QmHprvP +yB9159MCgYEAl01MZAXTv78FqSmwHuHVLJIUbNOD634jnSTAevqmlmBNshiOnBB4 +nK9u6Y1EXHtGhvC7sKI9TxP8qa/c/Wy83RlNZITnqSYbr8rUd4QVaT7W9cvUXqDk +8uyXWb83uhT42a5F1HIidVM0gdkYCCsDOXwVGwluYIOO7yGScW9XaM0= +-----END RSA PRIVATE KEY----- diff --git a/nginxbazhong/vhosts/cert/t-aaron.com.pem b/nginxbazhong/vhosts/cert/t-aaron.com.pem index 3f87f0c..c0f536e 100644 --- a/nginxbazhong/vhosts/cert/t-aaron.com.pem +++ b/nginxbazhong/vhosts/cert/t-aaron.com.pem @@ -1,86 +1,62 @@ -----BEGIN CERTIFICATE----- -MIIGSTCCBTGgAwIBAgIQDBSKURsSVtHdjua9yd+AsjANBgkqhkiG9w0BAQsFADBj -MQswCQYDVQQGEwJDTjE2MDQGA1UECgwtQmVpamluZyBYaW5jaGFjaGEgQ3JlZGl0 -IE1hbmFnZW1lbnQgQ28uLCBMdGQuMRwwGgYDVQQDDBNYY2MgVHJ1c3QgRFYgU1NM -IENBMB4XDTI0MDkxODA3MDIyMloXDTI1MDkxODA3MDIyMVowGzEZMBcGA1UEAwwQ -Ki5qb3VhdmNsb3VkLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -ANuZcdwNqQ1TA8bNXnCh8RicCk1WpTa5yagmOKtXIqxk+REvTCWoDDjwhqYhjtQs -3CGNOBxrRdg2d6mTu3bil31vh/8mQGXiafDRyhB9VFXK1t2s5Sj8X5Uf5xdFo5sX -cr+0XPhATzulB0cnBbHo0MNUCl749qBlR4sGz+73QKt4iwwcKYk9HfFmXMOWvoEM -MeJqnsdOmJKcV8dIIAm/vmegA+CMrPX1dxWveXs9yZanICte0oYjQztpYiN4hkwe -Qqw55rInvoqv4lo3W2Y3Q/vJJFbNHGsbzR8p1L4QWNtyosrNAJo4+pDlTpd+kOnF -70Q6s/ibDddHnO4goIwNPl8CAwEAAaOCAz8wggM7MAwGA1UdEwEB/wQCMAAwQwYD -VR0fBDwwOjA4oDagNIYyaHR0cDovL3hpbmNoYWNoYTJkdi5jcmwuY2VydHVtLnBs -L3hpbmNoYWNoYTJkdi5jcmwweQYIKwYBBQUHAQEEbTBrMC8GCCsGAQUFBzABhiNo -dHRwOi8veGluY2hhY2hhMmR2Lm9jc3AtY2VydHVtLmNvbTA4BggrBgEFBQcwAoYs -aHR0cDovL3JlcG9zaXRvcnkuY2VydHVtLnBsL3hpbmNoYWNoYTJkdi5jZXIwHwYD -VR0jBBgwFoAUoUOOADQJ5Xs1M651iQTyMmEPqOcwHQYDVR0OBBYEFLCYgbavJMn2 -4gJWJSV6QnXuJnuLMEwGA1UdIARFMEMwCAYGZ4EMAQIBMDcGDCqEaAGG9ncCBQEV -AzAnMCUGCCsGAQUFBwIBFhlodHRwczovL3d3dy5jZXJ0dW0ucGwvQ1BTMB0GA1Ud -JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwKwYDVR0R -BCQwIoIQKi5qb3VhdmNsb3VkLmNvbYIOam91YXZjbG91ZC5jb20wggF/BgorBgEE -AdZ5AgQCBIIBbwSCAWsBaQB3AA3h8jAr0w3BQGISCepVLvxHdHyx1+kw7w5CHrR+ -Tqo0AAABkgPwc/AAAAQDAEgwRgIhAOLKjVwrM6v9Nze9eKon2+90PWAOcbVCSF+H -XD1w8xPwAiEA1Dd3b7f7Ae32oQVW6/QsbNMiXGbI3Q05+VL9Ae4KZ+YAdQB9WR4S -4XgqexxhZ3xe/fjQh1wUoE6VnrkDL9kOjC55uAAAAZID8HVNAAAEAwBGMEQCIFUR -2nBwjmQAFhcQVyM0Mzgn3cZlv6apdNjyfA3EUjz5AiAFtDETorhvmIZf7X3B5vr+ -KZ7Yg7outcoqNrWllqqe7wB3AN3cyjSV1+EWBeeVMvrHn/g9HFDf2wA6FBJ2Ciys -u8gqAAABkgPwc8MAAAQDAEgwRgIhAOuFfoYTn/3AuAs50keFes3K11WaRuGdUV0t -FJpmIbzYAiEA8JnWiC63EyXmrGggvpFi6HazdAogySC00YffwPnznycwDQYJKoZI -hvcNAQELBQADggEBAC+ROX5vA4wzwhAAbP0009mTGaZA5+6JGAXtoEUu1yaKzVMx -3qBvQFej6m6ISAkI7gjvD3PS+D8/LvrmAPH5MWHiVaGyjArui7Z9k+JmGTGXc2bi -S81i519kNs8M5yIvDavm7iILIL+3x3PgcSsf0+8PcKuL7hJvR+E4updYsOIIocmz -lG8N2WROXQ3yfUC47RRt3MEOY35RW2XwvIsxmYQ7s3oiQuzdWmRFiL0BbOVQiKNG -SQiO+hnhGBKMXqSBU9SXCUCgUUO+DBYg/aT6xpX3Joreoi33Vwkqu8BYBA4NSKCi -3Whlrq4TI0stFNeKen1O9j1MsBMkpAX2jwWBg1M= +MIIGDjCCBPagAwIBAgIQAtO0spBILr9/eGiyXYuDDTANBgkqhkiG9w0BAQsFADBu +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMS0wKwYDVQQDEyRFbmNyeXB0aW9uIEV2ZXJ5d2hlcmUg +RFYgVExTIENBIC0gRzIwHhcNMjUwNjA0MDAwMDAwWhcNMjUwOTAxMjM1OTU5WjAb +MRkwFwYDVQQDExBiYXpob25nZmVpZnUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEAzgFo1avCs7whcfARpcr/SfBxY2QY+tsiJIDdueMIU30g0wOa +oAKUR1pTQvXgUfQUpqc1CQTLI/NuxxOI9+VKIs3XreqC1GGE8tsKhiarYgKxg2hT +pONRGvgJY9k8v0ivZ8pnh82+5T62P3sMxnXl92MboZ2QNG93eOvm6hLjYYgia0J5 +xGJF3UH3fkDmEFkcBei8cLzcZ7E6F4+z9/6rGCsGVeXMvOBH8DDooCrGgY/Q4DXF +NgRUQcAZiY+xHyWE9AkqQsMN5S00GLmmVZzUYJT7Yab8pBMzS2JjSz8zEUSC79fj +9go8LRVh9kGj49xkqBDZ061D7Bf7AKKxeYf2pQIDAQABo4IC+TCCAvUwHwYDVR0j +BBgwFoAUeN+RkF/u3qz2xXXr1UxVU+8kSrYwHQYDVR0OBBYEFLIceIQ5LJOX4ptc +IrLcQtSWeK1iMDEGA1UdEQQqMCiCEGJhemhvbmdmZWlmdS5jb22CFHd3dy5iYXpo +b25nZmVpZnUuY29tMD4GA1UdIAQ3MDUwMwYGZ4EMAQIBMCkwJwYIKwYBBQUHAgEW +G2h0dHA6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAOBgNVHQ8BAf8EBAMCBaAwHQYD +VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIGABggrBgEFBQcBAQR0MHIwJAYI +KwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBKBggrBgEFBQcwAoY+ +aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0VuY3J5cHRpb25FdmVyeXdoZXJl +RFZUTFNDQS1HMi5jcnQwDAYDVR0TAQH/BAIwADCCAX4GCisGAQQB1nkCBAIEggFu +BIIBagFoAHYAEvFONL1TckyEBhnDjz96E/jntWKHiJxtMAWE6+WGJjoAAAGXOlrz +oQAABAMARzBFAiEA3DKltxu2NdGZVRizCnsMcQrjsdUfOfeK7Gi89/mi6XgCIDAC +e3cklysIbPpFN2CXHCUqGN8nnTEf1EfuInmbjYnfAHUA7TxL1ugGwqSiAFfbyyTi +OAHfUS/txIbFcA8g3bc+P+AAAAGXOlrz3QAABAMARjBEAiAeEtD8KpJChGqkTzjc +6GQMoMpV9Oo2EZq/Nk91/jAH6wIgd3U+dEc9iBMS70/XI0Az+2bWtV3NYQj8yId1 +YXJt8+kAdwCkQsUGSWBhVI8P1Oqc+3otJkVNh6l/L99FWfYnTzqEVAAAAZc6WvPx +AAAEAwBIMEYCIQCZ/7QxFonLcR9P+7zvo9vMafvuLBkYhSL8buUagf1shwIhAMLQ +KyeHtn8AN8Ul7pGU/2KeNBVfuz6ZoIsM7AfVTskiMA0GCSqGSIb3DQEBCwUAA4IB +AQDH+Xvw+aTHuefPxEj2j6QDB5j8Q0VJNs5o9KKRRuTFrlchR1dRl2SmZDvB0EbO +ocgq3eGy676vFR06oLTIS3XrsmNWelE6oHlLLs1fHVfHI5s40MfbOWycdCO8i1rz +Fl/FzFR/Rv2hjMrP0gme9jnt4k3y9WT38P9M6ncaP4ELZxbJyeSQ9AhEmzw+k8iI +R+bPU4DILDfy81FJJuGVnu1iF7IFZMJ8O2xZWdBXGW1HI4a7Ls0v97enOnmH/yZH +v1OpGI88+NjmU0ucV7pEYoSYCFCl/Hs/LsqR0FrYehp9rl1iEemJjq7DlCC/mhHF +McoTlrWas0Qj7jriMohfwYWg -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEzzCCA7egAwIBAgIRAMK3VduTvUcsGNNRC9juoN4wDQYJKoZIhvcNAQELBQAw -fjELMAkGA1UEBhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMu -QS4xJzAlBgNVBAsTHkNlcnR1bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEiMCAG -A1UEAxMZQ2VydHVtIFRydXN0ZWQgTmV0d29yayBDQTAeFw0yMjA3MDEwNzUxMDFa -Fw0yNzA2MzAwNzUxMDFaMGMxCzAJBgNVBAYTAkNOMTYwNAYDVQQKDC1CZWlqaW5n -IFhpbmNoYWNoYSBDcmVkaXQgTWFuYWdlbWVudCBDby4sIEx0ZC4xHDAaBgNVBAMM -E1hjYyBUcnVzdCBEViBTU0wgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQCpa5zapltXVizFjCctkL/jY/pycE4gR4m+Nd8B1aqUcolQrlD2pWL785f1 -2/AFVAxlZuAsMfqT4qQL+M0y9jfg7qRhH80CLg5picFn8ZONR5SthRvOdBuG/COb -1YS6IFa7M7mSWQcAdnLfJVlzdzJLWh4fCW+4I4ymV0AQvjpomOHv2UWyBwckKgbh -obgR9mx65zduNFWFNC60A+7NY++6BIY5qv/Vafo1exBas1X/e/pdDgqEM9GZYCHR -1+uDcssGA6qsis7tsDjdLOS4Y+0nQYtE/dxPpdyEdyXvJprnR7rgYCS8Xmi5Kgj4 -vUFOTeg+/bpH7Z/JRPH8aKPMD6TrAgMBAAGjggFhMIIBXTASBgNVHRMBAf8ECDAG -AQH/AgEAMB0GA1UdDgQWBBShQ44ANAnlezUzrnWJBPIyYQ+o5zAfBgNVHSMEGDAW -gBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0lBBYw -FAYIKwYBBQUHAwEGCCsGAQUFBwMCMC8GA1UdHwQoMCYwJKAioCCGHmh0dHA6Ly9j -cmwuY2VydHVtLnBsL2N0bmNhLmNybDBrBggrBgEFBQcBAQRfMF0wKAYIKwYBBQUH -MAGGHGh0dHA6Ly9zdWJjYS5vY3NwLWNlcnR1bS5jb20wMQYIKwYBBQUHMAKGJWh0 -dHA6Ly9yZXBvc2l0b3J5LmNlcnR1bS5wbC9jdG5jYS5jZXIwOgYDVR0gBDMwMTAv -BgRVHSAAMCcwJQYIKwYBBQUHAgEWGWh0dHBzOi8vd3d3LmNlcnR1bS5wbC9DUFMw -DQYJKoZIhvcNAQELBQADggEBAA9Nm/PoxLgAQhGx+C73ueZFFsIMtI/3j+OBgopN -jeDTcLwB97EZW75xgY1JeapByljUyF/ccjHmGg89pSqiOoznrd84H/cvfVXZlY+f -0k98JdzAdkeTg1Kca2ppqTBg1kX565gYOUwj0kXyP+AjVuyKwFht7RJpV5BE4Ejo -fQOaOtv5PFyIE+TlqOQjzBZWzWyt7EUUpKbhhhfoiX0CfneyNhP9805n2RMG79UR -MVtpz8D8yUKgQ6q+V4lZ2flN+p1lLcBOOf79+yRWtE9E/ntSc4DjExnIg5eLiIVD -+huf+lzpbZOq7IhL/XI3A3TTOhw5FCXfq0uPtC5z/MYXW1c= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBM -MSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5D -ZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBU -cnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIyMTIwNzM3WhcNMjkxMjMxMTIwNzM3 -WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMg -Uy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIw -IAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0B -AQEFAAOCAQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rH -UV+rpDKmYYe2bg+G0jACl/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LM -TXPb865Px1bVWqeWifrzq2jUI4ZZJ88JJ7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVU -BBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4fOQtf/WsX+sWn7Et0brM -kUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0cvW0QM8x -AcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNV -HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNV -HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15y -sHhE49wcrwn9I0j6vSrEuVUEtRCjjSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfL -I9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1mS1FhIrlQgnXdAIv94nYmem8 -J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5ajZt3hrvJBW8qY -VoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI -03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw= +MIIEqjCCA5KgAwIBAgIQDeD/te5iy2EQn2CMnO1e0zANBgkqhkiG9w0BAQsFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH +MjAeFw0xNzExMjcxMjQ2NDBaFw0yNzExMjcxMjQ2NDBaMG4xCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j +b20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBH +MjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO8Uf46i/nr7pkgTDqnE +eSIfCFqvPnUq3aF1tMJ5hh9MnO6Lmt5UdHfBGwC9Si+XjK12cjZgxObsL6Rg1njv +NhAMJ4JunN0JGGRJGSevbJsA3sc68nbPQzuKp5Jc8vpryp2mts38pSCXorPR+sch +QisKA7OSQ1MjcFN0d7tbrceWFNbzgL2csJVQeogOBGSe/KZEIZw6gXLKeFe7mupn +NYJROi2iC11+HuF79iAttMc32Cv6UOxixY/3ZV+LzpLnklFq98XORgwkIJL1HuvP +ha8yvb+W6JislZJL+HLFtidoxmI7Qm3ZyIV66W533DsGFimFJkz3y0GeHWuSVMbI +lfsCAwEAAaOCAU8wggFLMB0GA1UdDgQWBBR435GQX+7erPbFdevVTFVT7yRKtjAf +BgNVHSMEGDAWgBROIlQgGJXm427mD/r6uRLtBhePOTAOBgNVHQ8BAf8EBAMCAYYw +HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8C +AQAwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdp +Y2VydC5jb20wQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybDMuZGlnaWNlcnQu +Y29tL0RpZ2lDZXJ0R2xvYmFsUm9vdEcyLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG +/WwBAjAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT +MAgGBmeBDAECATANBgkqhkiG9w0BAQsFAAOCAQEAoBs1eCLKakLtVRPFRjBIJ9LJ +L0s8ZWum8U8/1TMVkQMBn+CPb5xnCD0GSA6L/V0ZFrMNqBirrr5B241OesECvxIi +98bZ90h9+q/X5eMyOD35f8YTaEMpdnQCnawIwiHx06/0BfiTj+b/XQih+mqt3ZXe +xNCJqKexdiB2IWGSKcgahPacWkk/BAQFisKIFYEqHzV974S3FAz/8LIfD58xnsEN +GfzyIDkH3JrwYZ8caPTf6ZX9M1GrISN8HnWTtdNCH2xEajRa/h9ZBXjUyFKQrGk2 +n2hcLrfZSbynEC/pSw/ET7H5nWwckjmAJ1l9fcnbqkU/pf6uMQmnfl0JQjJNSg== -----END CERTIFICATE----- diff --git a/start/airport.sh b/start/airport.sh index a73bafe..db1c313 100755 --- a/start/airport.sh +++ b/start/airport.sh @@ -12,6 +12,8 @@ if [ "$USEDAJIANG" = "true" ]; then docker run --pull always -d \ --name ${AIRPORT_NAME} \ --network ${NETWORK} \ + --env SW_APP_NAME=${AIRPORT_NAME} \ + --env SW_SKY_AOP=http://${SKYWALKING_OAP_NAME}:12800 \ --env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \ --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${AIRPORT_NAME} \ @@ -41,6 +43,8 @@ else docker run --pull always -d \ --name ${AIRPORT_NAME} \ --network ${NETWORK} \ + --env SW_APP_NAME=${AIRPORT_NAME} \ + --env SW_SKY_AOP=http://${SKYWALKING_OAP_NAME}:12800 \ --env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \ --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${AIRPORT_NAME} \ diff --git a/start/nginx.sh b/start/nginx.sh index 46a2b41..0948c81 100755 --- a/start/nginx.sh +++ b/start/nginx.sh @@ -38,6 +38,7 @@ DOCKER_RUN_CMD="${DOCKER_RUN_CMD} ${NGINX_IMAGE}" # 执行 docker run 命令 echo "启动 Nginx 容器..." +echo ${DOCKER_RUN_CMD} eval ${DOCKER_RUN_CMD} # 检查容器是否成功启动 diff --git a/巴中部署文档.md b/巴中部署文档.md index 6d9af9b..1f56ff9 100644 --- a/巴中部署文档.md +++ b/巴中部署文档.md @@ -1,10 +1,14 @@ 0: 申请域名,并将域名打到需要部署到服务器上 + +host 文件中添加以下内容 +#172.18.0.130(更改为实际部署机器的IP) srs.bazhongfeifu.com dsp.bazhongfeifu.com kafka.bazhongfeifu.com hhz.bazhongfeifu.com oidc.bazhongfeifu.com mino.bazhongfeifu.com + 1: 修改 bazhong.sh 中内容 2: 到init目录 2.1 source ../bazhong.sh -2.2 依次执行 1 2 3 4 5 6 7 8 8个脚本 +2.2 依次执行init文件夹下 1 2 3 4 5 6 7 8 12 13 10个脚本 2.3 联系拓恒提供mysql刷数脚本 -3: 将修改后的 bazhong.txt 文件提供给 拓恒 +3: 将修改后的 bazhong.sh 文件提供给 拓恒 4: 拓恒打镜像 5: 依次执行 start文件夹下的启动脚本; 5.1 nginx.sh 启动脚本最后执行