diff --git a/etc/conf/location.conf b/etc/conf/location.conf index 70a47853..0f2d925a 100644 --- a/etc/conf/location.conf +++ b/etc/conf/location.conf @@ -14,18 +14,18 @@ client_body_temp_path /tmp/nginx/client_body_temp; location / { proxy_pass http://127.0.0.1:9020; - proxy_set_header X-HOST $scheme://$http_host; - proxy_set_header X-Real-Port $remote_port; - proxy_set_header X-Real-IP $remote_addr; + include headers.conf; +} +location /x/ { + proxy_pass http://127.0.0.1:9030; + include headers.conf; } location /space/ { proxy_pass http://127.0.0.1:9020; - proxy_set_header X-HOST $scheme://$http_host; - proxy_set_header X-Real-Port $remote_port; - proxy_set_header X-Real-IP $remote_addr; proxy_set_header Connection "upgrade"; proxy_set_header Upgrade $http_upgrade; + include headers.conf; } diff --git a/etc/conf/nginx.conf b/etc/conf/nginx.conf index 1376c4b3..158982cb 100644 --- a/etc/conf/nginx.conf +++ b/etc/conf/nginx.conf @@ -35,8 +35,8 @@ http { listen 443 ssl; server_name contexts.com.cn; - ssl_certificate_key 7424713_contexts.com.cn.key; ssl_certificate 7424713_contexts.com.cn.pem; + ssl_certificate_key 7424713_contexts.com.cn.key; include location.conf; } @@ -46,9 +46,7 @@ http { server_name shylinux.com; location / { - proxy_set_header X-HOST $scheme://$http_host; - proxy_set_header X-Real-Port $remote_port; - proxy_set_header X-Real-IP $remote_addr; + include headers.conf; if ($http_user_agent ~* "^Wget") { proxy_pass http://127.0.0.1:9020; break; @@ -61,8 +59,8 @@ http { listen 443 ssl; server_name shylinux.com; - ssl_certificate_key 6157098_shylinux.com.key; ssl_certificate 6157098_shylinux.com.pem; + ssl_certificate_key 6157098_shylinux.com.key; include location.conf; } diff --git a/go.mod b/go.mod index 2cb85401..849ab12a 100644 --- a/go.mod +++ b/go.mod @@ -3,29 +3,15 @@ module shylinux.com/x/contexts go 1.11 require ( - shylinux.com/x/golang-story v0.4.6 - shylinux.com/x/linux-story v0.4.4 - shylinux.com/x/mysql-story v0.4.7 - shylinux.com/x/nginx-story v0.4.7 - shylinux.com/x/redis-story v0.4.8 + shylinux.com/x/golang-story v0.4.7 + shylinux.com/x/linux-story v0.4.5 + shylinux.com/x/mysql-story v0.4.8 + shylinux.com/x/nginx-story v0.4.8 + shylinux.com/x/redis-story v0.4.9 ) require ( - shylinux.com/x/ice v1.0.5 - shylinux.com/x/icebergs v1.3.0 - shylinux.com/x/toolkits v0.6.6 -) - -replace ( - shylinux.com/x/ice => ./usr/release - shylinux.com/x/icebergs => ./usr/icebergs - shylinux.com/x/toolkits => ./usr/toolkits -) - -replace ( - shylinux.com/x/golang-story => ./usr/golang-story - shylinux.com/x/linux-story => ./usr/linux-story - shylinux.com/x/mysql-story => ./usr/mysql-story - shylinux.com/x/nginx-story => ./usr/nginx-story - shylinux.com/x/redis-story => ./usr/redis-story + shylinux.com/x/ice v1.0.8 + shylinux.com/x/icebergs v1.3.3 + shylinux.com/x/toolkits v0.6.7 ) diff --git a/go.sum b/go.sum index 5ac7de50..c5db2463 100644 --- a/go.sum +++ b/go.sum @@ -4,5 +4,20 @@ shylinux.com/x/go-qrcode v0.0.1 h1:/eOGqMj1qtgs9Ymd12zTUa1gcJZs9S92kj2lb0QzKsE= shylinux.com/x/go-qrcode v0.0.1/go.mod h1:KAbtU+KwiiABMZ/CJ0zh9PI2AX82Uf9rRYcQ4ODm4po= shylinux.com/x/go-sql-mysql v0.0.1 h1:VX5SrwLBKzfkRouj39LgJ9reIXOWmMsScRpr+e0qdp0= shylinux.com/x/go-sql-mysql v0.0.1/go.mod h1:47OfAZK24HRJMy7dAu/jrksGCf9yzJaAUFwWYjhDFDA= +shylinux.com/x/golang-story v0.4.7 h1:nqN6JAAszO6Jbin6qEnwOTt7qSH0ljrLAvCbDrHHCRQ= +shylinux.com/x/golang-story v0.4.7/go.mod h1:Itpd4Auan1LYwAY40Rkb1cEUFReJ/711b3qbR30cJH0= +shylinux.com/x/ice v1.0.8 h1:PSbA4Vqs7ZL8OCOTjEVoHPYwwQYPOu1YBsX+HwPAz98= +shylinux.com/x/ice v1.0.8/go.mod h1:m1r5vrBF9WRileC+vCZqZxS1lAtO0ISlDC/coNcnDBg= +shylinux.com/x/icebergs v1.3.3 h1:P5LUAf1ivT0kIueIj8MsjV/uF0705u2ig/4bRrLS6XI= +shylinux.com/x/icebergs v1.3.3/go.mod h1:4RlyPPPE2Ao54peovChY8hYK5bXNpBRwIw1YZKOZWk8= +shylinux.com/x/linux-story v0.4.5/go.mod h1:G9JYEfxGDpsjX28rTgDfoBUzZQC+wPcdAkLtiPC7EsU= +shylinux.com/x/mysql-story v0.4.8 h1:hQDtDEWhEJloInGazgoQFckHuWawn8PxWQQLIs+RCnA= +shylinux.com/x/mysql-story v0.4.8/go.mod h1:qK3mvn+s6i81nYNG16QV3CqFZZ09+c5T0vQDjSkoC2E= +shylinux.com/x/nginx-story v0.4.8 h1:QSx928tUdHXJKC7I6CR5SreNayprDYv4BxA7ETz95G4= +shylinux.com/x/nginx-story v0.4.8/go.mod h1:WirYm33lKIs99At2nzSaiWWzuzjrhWdPx4sGi18r/vE= +shylinux.com/x/redis-story v0.4.9 h1:X2wVMDRoqiM9Gc8GYQr8sR11Wea+z45l8CQGQo3Nk3Q= +shylinux.com/x/redis-story v0.4.9/go.mod h1:MOzt0jhewLdaioZ+itJcWc0KSCmwvGVX+97Q63rC+Nw= +shylinux.com/x/toolkits v0.6.7 h1:d9xN4ClsVt0qTWGJT7tt1RWHcS5yiJqurUHGpY93cRI= +shylinux.com/x/toolkits v0.6.7/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= shylinux.com/x/websocket v0.0.1 h1:OBc21DxqsGlQ2+Pz76xqLyDNo1LV+PUUqfWi+1PZPDE= shylinux.com/x/websocket v0.0.1/go.mod h1:AaSpMToOxbMULKQytzczeHPuqb708vK1vrAzCxLo/XE= diff --git a/src/debug/go.mod b/src/debug/go.mod index 2cb85401..bd336715 100644 --- a/src/debug/go.mod +++ b/src/debug/go.mod @@ -3,17 +3,17 @@ module shylinux.com/x/contexts go 1.11 require ( - shylinux.com/x/golang-story v0.4.6 - shylinux.com/x/linux-story v0.4.4 - shylinux.com/x/mysql-story v0.4.7 - shylinux.com/x/nginx-story v0.4.7 - shylinux.com/x/redis-story v0.4.8 + shylinux.com/x/golang-story v0.4.7 + shylinux.com/x/linux-story v0.4.5 + shylinux.com/x/mysql-story v0.4.8 + shylinux.com/x/nginx-story v0.4.8 + shylinux.com/x/redis-story v0.4.9 ) require ( - shylinux.com/x/ice v1.0.5 - shylinux.com/x/icebergs v1.3.0 - shylinux.com/x/toolkits v0.6.6 + shylinux.com/x/ice v1.0.8 + shylinux.com/x/icebergs v1.3.3 + shylinux.com/x/toolkits v0.6.7 ) replace ( diff --git a/src/h1/h1.go b/src/h1/h1.go deleted file mode 100644 index 46f0db5e..00000000 --- a/src/h1/h1.go +++ /dev/null @@ -1,17 +0,0 @@ -package h1 - -import ( - "shylinux.com/x/ice" -) - -type h1 struct { - ice.Zone - - list string `name:"list zone id auto insert" help:"示例"` -} - -func (s h1) List(m *ice.Message, arg ...string) { - s.Zone.List(m, arg...) -} - -func init() { ice.Cmd("web.code.h1.h1", h1{}) } diff --git a/src/h1/h1.js b/src/h1/h1.js deleted file mode 100644 index 41954ccd..00000000 --- a/src/h1/h1.js +++ /dev/null @@ -1,4 +0,0 @@ -Volcanos("onimport", {help: "导入数据", _init: function(can, msg) { - msg.Echo("hello world") - msg.Dump(can) -}}) \ No newline at end of file diff --git a/src/h1/h1.shy b/src/h1/h1.shy deleted file mode 100644 index bca31396..00000000 --- a/src/h1/h1.shy +++ /dev/null @@ -1,3 +0,0 @@ -chapter "h1" - -field "示例" web.code.h1.h1 diff --git a/src/main.shy b/src/main.shy index ff0828f6..0b2a3180 100644 --- a/src/main.shy +++ b/src/main.shy @@ -37,7 +37,8 @@ field "架构图" web.code.git.spide args `intshell` spark md README.md -source "../usr/icebergs/misc/node/vue.shy" -source "../usr/icebergs/misc/java/spring.shy" -source "../usr/icebergs/core/chat/location.shy" -source "../usr/icebergs/core/code/xterm.shy" +source "usr/icebergs/misc/java/compile.shy" +source "usr/icebergs/misc/java/spring.shy" +source "usr/icebergs/misc/node/compile.shy" +source "usr/icebergs/misc/node/vue.shy" +source "usr/icebergs/misc/coder/coder.shy" diff --git a/src/release/go.mod b/src/release/go.mod index 072d9043..849ab12a 100644 --- a/src/release/go.mod +++ b/src/release/go.mod @@ -3,15 +3,15 @@ module shylinux.com/x/contexts go 1.11 require ( - shylinux.com/x/golang-story v0.4.6 - shylinux.com/x/linux-story v0.4.4 - shylinux.com/x/mysql-story v0.4.7 - shylinux.com/x/nginx-story v0.4.7 - shylinux.com/x/redis-story v0.4.8 + shylinux.com/x/golang-story v0.4.7 + shylinux.com/x/linux-story v0.4.5 + shylinux.com/x/mysql-story v0.4.8 + shylinux.com/x/nginx-story v0.4.8 + shylinux.com/x/redis-story v0.4.9 ) require ( - shylinux.com/x/ice v1.0.7 - shylinux.com/x/icebergs v1.3.1 - shylinux.com/x/toolkits v0.6.6 + shylinux.com/x/ice v1.0.8 + shylinux.com/x/icebergs v1.3.3 + shylinux.com/x/toolkits v0.6.7 ) diff --git a/src/release/go.sum b/src/release/go.sum index 94c1627d..c5db2463 100644 --- a/src/release/go.sum +++ b/src/release/go.sum @@ -4,23 +4,20 @@ shylinux.com/x/go-qrcode v0.0.1 h1:/eOGqMj1qtgs9Ymd12zTUa1gcJZs9S92kj2lb0QzKsE= shylinux.com/x/go-qrcode v0.0.1/go.mod h1:KAbtU+KwiiABMZ/CJ0zh9PI2AX82Uf9rRYcQ4ODm4po= shylinux.com/x/go-sql-mysql v0.0.1 h1:VX5SrwLBKzfkRouj39LgJ9reIXOWmMsScRpr+e0qdp0= shylinux.com/x/go-sql-mysql v0.0.1/go.mod h1:47OfAZK24HRJMy7dAu/jrksGCf9yzJaAUFwWYjhDFDA= -shylinux.com/x/golang-story v0.4.6 h1:mR7DYvGzA0o1EhhCOpa1UN+TMF7uhFvLkx12hyNwKxA= -shylinux.com/x/golang-story v0.4.6/go.mod h1:ZM2nsSwt6BcLk4aMZTP967L+2ccjco4Dvj2pagmTT64= -shylinux.com/x/ice v1.0.5/go.mod h1:9ErxoqjwAzbcOkJAD7+OPuRrQ12/kduO7arHipUCry0= -shylinux.com/x/ice v1.0.7 h1:prm2IiOJ7nevt9pSmTEXGHq/Vjeo1n+gDfo54G5OPtI= -shylinux.com/x/ice v1.0.7/go.mod h1:9ErxoqjwAzbcOkJAD7+OPuRrQ12/kduO7arHipUCry0= -shylinux.com/x/icebergs v1.3.0/go.mod h1:HhX/7lagVsvO80yYbfpf7FW4ddLOFv8kUwjBr8STRUQ= -shylinux.com/x/icebergs v1.3.1 h1:ytU+/Wyo2kUdQq0lzpOiZAfUp2nTYlMpyWz35OBDQiQ= -shylinux.com/x/icebergs v1.3.1/go.mod h1:5vw5c6j66yDF1sc6IRP/pU5xf5Op6L6n8KOjSGFa6XI= -shylinux.com/x/linux-story v0.4.4/go.mod h1:buo9K9U3oO1jebhTCLFBGSTfUKwYFRSjKYT6GfUh+Qs= -shylinux.com/x/mysql-story v0.4.7 h1:UMpczyfXj1jPUts5nd9YvlfZnLH8yLfJVrn6DvpvecI= -shylinux.com/x/mysql-story v0.4.7/go.mod h1:yYqOK4lyH2qBU2Ets9vEDXhw4YyNA01BsdfEqOxxszc= -shylinux.com/x/nginx-story v0.4.7 h1:GPGFGU4NtKiiiQr58Enw4nIlv5ClB7MR+XCjFphBTns= -shylinux.com/x/nginx-story v0.4.7/go.mod h1:ZIzkxtgLuNjmWgk3TprUz8W9HLjFQARf8MdXkhWr9ck= -shylinux.com/x/redis-story v0.4.8 h1:5Z3fVffMFat2N4ZTv2c0FAf9VFeUkfQma/rtf5xal78= -shylinux.com/x/redis-story v0.4.8/go.mod h1:OCqe0xfdJxHN7tVlxLjj66997Q7Tp2jW/YhSzsIT0AU= -shylinux.com/x/toolkits v0.6.5/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= -shylinux.com/x/toolkits v0.6.6 h1:OcuGs4PLj9qynf14o8UE1wndT3+tnum0wpOo0KFq/tM= -shylinux.com/x/toolkits v0.6.6/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= +shylinux.com/x/golang-story v0.4.7 h1:nqN6JAAszO6Jbin6qEnwOTt7qSH0ljrLAvCbDrHHCRQ= +shylinux.com/x/golang-story v0.4.7/go.mod h1:Itpd4Auan1LYwAY40Rkb1cEUFReJ/711b3qbR30cJH0= +shylinux.com/x/ice v1.0.8 h1:PSbA4Vqs7ZL8OCOTjEVoHPYwwQYPOu1YBsX+HwPAz98= +shylinux.com/x/ice v1.0.8/go.mod h1:m1r5vrBF9WRileC+vCZqZxS1lAtO0ISlDC/coNcnDBg= +shylinux.com/x/icebergs v1.3.3 h1:P5LUAf1ivT0kIueIj8MsjV/uF0705u2ig/4bRrLS6XI= +shylinux.com/x/icebergs v1.3.3/go.mod h1:4RlyPPPE2Ao54peovChY8hYK5bXNpBRwIw1YZKOZWk8= +shylinux.com/x/linux-story v0.4.5/go.mod h1:G9JYEfxGDpsjX28rTgDfoBUzZQC+wPcdAkLtiPC7EsU= +shylinux.com/x/mysql-story v0.4.8 h1:hQDtDEWhEJloInGazgoQFckHuWawn8PxWQQLIs+RCnA= +shylinux.com/x/mysql-story v0.4.8/go.mod h1:qK3mvn+s6i81nYNG16QV3CqFZZ09+c5T0vQDjSkoC2E= +shylinux.com/x/nginx-story v0.4.8 h1:QSx928tUdHXJKC7I6CR5SreNayprDYv4BxA7ETz95G4= +shylinux.com/x/nginx-story v0.4.8/go.mod h1:WirYm33lKIs99At2nzSaiWWzuzjrhWdPx4sGi18r/vE= +shylinux.com/x/redis-story v0.4.9 h1:X2wVMDRoqiM9Gc8GYQr8sR11Wea+z45l8CQGQo3Nk3Q= +shylinux.com/x/redis-story v0.4.9/go.mod h1:MOzt0jhewLdaioZ+itJcWc0KSCmwvGVX+97Q63rC+Nw= +shylinux.com/x/toolkits v0.6.7 h1:d9xN4ClsVt0qTWGJT7tt1RWHcS5yiJqurUHGpY93cRI= +shylinux.com/x/toolkits v0.6.7/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= shylinux.com/x/websocket v0.0.1 h1:OBc21DxqsGlQ2+Pz76xqLyDNo1LV+PUUqfWi+1PZPDE= shylinux.com/x/websocket v0.0.1/go.mod h1:AaSpMToOxbMULKQytzczeHPuqb708vK1vrAzCxLo/XE= diff --git a/src/website/index.iml b/src/website/index.iml index 4c5e6d5f..fee16642 100644 --- a/src/website/index.iml +++ b/src/website/index.iml @@ -33,14 +33,7 @@ project "研发群" web.wiki.word "上下文" linux "系统 linux" usr/linux-story/idc/idc.shy "平台" - usr/linux-story/iso/iso.shy "系统" - usr/linux-story/iot/iot.shy "设备" - usr/linux-story/cli/cli.shy "命令" usr/linux-story/src/main.shy "系统" - usr/icebergs/misc/bash/bash.shy "命令行" - usr/icebergs/misc/git/git.shy "代码库" - usr/icebergs/misc/vim/vim.shy "编辑器" - usr/icebergs/misc/tmux/tmux.shy "命令行" nginx "网页 nginx" usr/nginx-story/src/main.shy "代理" usr/icebergs/misc/chrome/chrome.shy "浏览器" name HTML5