From ce2234963610e508ded12958fa0098baef680d99 Mon Sep 17 00:00:00 2001 From: wangbing Date: Sun, 15 Mar 2020 23:12:45 +0800 Subject: [PATCH] 11111 --- admin/pom.xml | 2 +- admin/src/main/resources/nginx-1.16.1.zip | Bin 1691227 -> 1694332 bytes .../main/resources/templates/nginx.conf.ftl | 19 ++++++++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/admin/pom.xml b/admin/pom.xml index 2a8eeab..bec010a 100644 --- a/admin/pom.xml +++ b/admin/pom.xml @@ -78,7 +78,7 @@ - ${artifactId} + nginx-admin src/main/java diff --git a/admin/src/main/resources/nginx-1.16.1.zip b/admin/src/main/resources/nginx-1.16.1.zip index 492c072ffcaef39caa0eec78b0f20f8c177122c5..381cea8a518aac3b5854a4221c0fe1a83e2f61db 100644 GIT binary patch delta 3218 zcmai$XHb*d7KRh)y@LS-5d@@!UKFK>krFAPgrd@uNRf^}C?CX+A|R+onl$Mk9Yhoe zh;%~p03recM|$YJ%H^DyGxyvd_ujo`&ziMn&piL0{f?#Kj^E)zK`3|*qyQ;FDv%na z0ck-xkRD_J89^qH8Ds%jK{k*b5QxCp*1_EkD=jatBBQLNV&muM2luo0cJjf%{R8lD2QQyTX2|~H5A5SY8v?6p zb@cJ9FWV$tW!$xTBtF44&V{jVLegeNSZw-;Ij~;MD$3Hws7L0$r+f2ZI?5BLVx27d zy`~yKR3j>}IlrhTD_bL{7@{axcsF|}nKbKH$xiWL^`L7et#^~+zD3Pm-A(enZcU90 zUZZIhq35DzI&a&-g(xe}ZB5w-3z{GhE4)ljA`5y+w`fmm*L+TzHVwO=-JxgaKI#3Uk$Q#w^%~$` zSD?jCQ~SjgGx$9HH||3LM}tRvv!kN9)xNatAqVS~s1HBXqg%(OG>-FjWz9Ohd+e>lz68vlsk zu=a`Bz)IlCcnODTZ3a%GxAgQ90}$+^!E*QF4k8PS5?eEcR5w(l6Ge-MnU4onv`l*9 zTZ&``a4whOmfNdj*1M^{KDJ8=2|OGt-|Qs27l{;%2Uc4O&u?h0{tPI<1zc4JxHQ-x zG=|U-u2ONAXVY`qo_V^u*C$18K=fli8omE9Emzhav$Pe{V_3rfwOpGZxYvu8sEU+% zzJnU?4mY3dF_%&rp&>12+a_3Spj|#uq1{~fX<j9nWY%jW8#Cq3m3Ytsx{f`=3(=cH(5DJIl?1k7%ei|j>x!{5zD~}0SS&$d zat?CUVzKDN52RmVBF^bigfwhn#c_#}KYe~lalm_*x%(E!ud=*%&b50RYTA#crLe!{ zx&%QFQ=oO8m-F6^kz#x^uq%*rA?|mF%*8^y2fD(8c>mf&wm_U%RF$p% z>^vSXXiNLJx}p;Q93QBr3stw#`oLJJkXkr$)MP>EO`1&tgk&Z3C(0tp?RBc|h`ZKR zTGJ9dOR*U7%T43XTwhbElU`g+GRx~Z2|1L6`^facCsVrXR=9NpjO0txl|W2R-nh6+ zgJ#WMb^Y*U4|J+`J{}UL>{w_Cee#?8aD0%Vx?OR~tef#j=8x5xJareZ8wTbfo_IzT zIQhuy{u?B~DfQalMs3gMropsT+)g^*(q=%-Wb8*UU3l1Et9Fp>8GFaaGsn z-@TH$iP}lkQYM6h1SM+o-uNfJ^G{Jp1odCGDQn;ElpUs`eu)|(|5m=kneu_S!rf5b zGw0`1|9|JZU;=#2YMG0p*_Wjb1PtQKI*Ww)WUdXq&{wz?e6pij-Z)nF?sfW`gL$BZ z{$2NE48r$(p(o9R#?3vtr=FXs0WEv zOgnOpA6_+1An6?(B3&l=wu5Lt4st0NA((c!_ID6jP8!SKp(5>+4!2V**x>R8*L-fUq~DTIV!J7+u17x_g9F-A`B?PT^I_o28a=LS?g;w$#lqlxXj3; zei7pZUxi?CM<*cvJ9#TBsLI}x!C9dS^=vg1`H?~g*RS=?6O;Jhz~|-IqxYHHMtQ` zd<6cKo=cmnVQK#7uOH-|YrVLdsJi0MHJ+1u&v?X(yg2|t6VKZ0F~P0awu+v;4wWRF z?IK;Y&NebLuAe5_>}EzhA8b{o{f+nL#lg#~`zs*F@~4UF*PCw2i^}WGhB5HL;GL&X z>nhKbxG6Mne(1WIo7e;)%#^l>mO|>BUT#4rk*TsY8zLG1w_{ZuyH zXGOIfHhw}eF~ znIO1zAZB@UPjj}_^wBor-s3m;gjy`bwIhZpbxqOc8(p{SurVaOtYS^$!Nm!w>s=gV zwIDS{Ru=gFZ1eoYo=S97Q5#t_{ph}j4%yi9)iz+3f3q2Nmv}gPKHY;I$*)Q!ruumO z_`$$V=sU`?Xv&C251$Im;#lwo_u{$and2|i)X5wgoan&vu$|~D)ZAqQ9I_na&er`M zjiw>3a=UgzeeFG1BQ`D8ru0EPo4A#ZAL163?clSVCSC5jnYVA9RJt%&s>{Dr)dfJY zj*9@uZPxtdJZQH*Ugeo*YDpkViAQ)94dcUt^dTq_S2T z@uLdiQ!P*3AQHT_#cdBI-F3O5hPM$vUiXUI5I+#7T}0mO&Wm|NaFUnM`j+Ymk;8z- z;q^Ku7n>A*LH$)b=Nn>e$oJIKcOq_Q_oJnCq8V*S8KGVMs0>B3w(a)^5140ZQ=VLE z5{f#^!gA(HRt>Emz%UKoa06=Y#2$-J$#o0@J5~#qLae4DFFvwkj~t-7%md#4gE)|M zt#g}d#sB=c>e`SHJ1++2nr49427M$dt44zYdi9Qsx!eHoac zYK3p#;zqZ0)Wz8pKK+&v1({+IvhA5|)t1`}dcM8C66TTy_8X16{AjsgF7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#7J(MQ7NHj57LgXw r7O@ub7KtsA$M#O&bWu`jyZlMXbO8}oHU=Qj2Es-G28JVhC4oEuofI2x diff --git a/admin/src/main/resources/templates/nginx.conf.ftl b/admin/src/main/resources/templates/nginx.conf.ftl index 6f874a7..f23cc98 100644 --- a/admin/src/main/resources/templates/nginx.conf.ftl +++ b/admin/src/main/resources/templates/nginx.conf.ftl @@ -34,12 +34,19 @@ http { <#list services?keys as key> server { - listen ${key}; - server_name localhost; - - #charset koi8-r; - - #access_log logs/host.access.log main; + listen ${key} <#if key == '443'>ssl; + server_name wbsite.xyz; + + <#if key == '443'> + ssl on; + ssl_certificate 3380768_www.wbsite.xyz.crt; + ssl_certificate_key 3380768_www.wbsite.xyz.key; + ssl_session_timeout 5m; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; + ssl_prefer_server_ciphers on; + + access_log logs/host.access.log main; <#list services[key] as mapping> <#if mapping.type="HTTP">