diff --git a/.gitmodules b/.gitmodules index 629a1cf..8e5a1fb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,69 @@ [submodule "vimrc"] path = vimrc url = git@github.com:IoTcat/vimrc.git +[submodule "html/iotcat"] + path = html/iotcat + url = git@github.com:IoTcat/iotcat.me-homepage.git +[submodule "html/blog"] + path = html/blog + url = git@github.com:IoTcat/EEE.DOG-public.git +[submodule "html/video"] + path = html/video + url = git@github.com:IoTcat/acg.watch.git +[submodule "html/birthday"] + path = html/birthday + url = git@github.com:IoTcat/birthday.git +[submodule "html/cv"] + path = html/cv + url = git@github.com:IoTcat/CV.git +[submodule "html/api"] + path = html/api + url = git@github.com:IoTcat/ushio-api.git +[submodule "html/img"] + path = html/img + url = git@github.com:IoTcat/ushio-img.git +[submodule "html/imgbed"] + path = html/imgbed + url = git@github.com:IoTcat/ushio-imgbed.git +[submodule "html/guide"] + path = html/guide + url = git@github.com:IoTcat/ushio-guide.git +[submodule "html/login"] + path = html/login + url = git@github.com:IoTcat/ushio-login.git +[submodule "html/log"] + path = html/log + url = git@github.com:IoTcat/ushio-log.git +[submodule "html/auth"] + path = html/auth + url = git@github.com:IoTcat/ushio-auth.git +[submodule "html/chat"] + path = html/chat + url = git@github.com:IoTcat/ushio-chat.git +[submodule "html/shorturl"] + path = html/shorturl + url = git@github.com:IoTcat/ushio-shorturl.git +[submodule "html/v2ray"] + path = html/v2ray + url = git@github.com:IoTcat/ushio-v2ray.git +[submodule "html/report"] + path = html/report + url = git@github.com:IoTcat/ushio-report.git +[submodule "html/github"] + path = html/github + url = git@github.com:IoTcat/ushio-github.git +[submodule "html/cp-acc"] + path = html/cp-acc + url = git@github.com:IoTcat/cp-acc.git +[submodule "html/filebed"] + path = html/filebed + url = git@github.com:IoTcat/ushio-filebed.git +[submodule "html/pay"] + path = html/pay + url = git@github.com:IoTcat/ushio-pay.git +[submodule "html/user"] + path = html/user + url = git@github.com:IoTcat/ushio-user.git +[submodule "html/wiot"] + path = html/wiot + url = git@github.com:IoTcat/wIoT-OTA.git diff --git a/html/api b/html/api new file mode 160000 index 0000000..65308fe --- /dev/null +++ b/html/api @@ -0,0 +1 @@ +Subproject commit 65308fedc82670ba7de55540174a923a54371f6f diff --git a/html/auth b/html/auth new file mode 160000 index 0000000..b9ca89b --- /dev/null +++ b/html/auth @@ -0,0 +1 @@ +Subproject commit b9ca89bb701f8efae500923298468cbd26e88bbb diff --git a/html/birthday b/html/birthday new file mode 160000 index 0000000..f597ee7 --- /dev/null +++ b/html/birthday @@ -0,0 +1 @@ +Subproject commit f597ee79f569dab585777ffbb1b704a22b81b06e diff --git a/html/blog b/html/blog new file mode 160000 index 0000000..2515a98 --- /dev/null +++ b/html/blog @@ -0,0 +1 @@ +Subproject commit 2515a985ca2590b521400c58859aadc59a6ea8cc diff --git a/html/chat b/html/chat new file mode 160000 index 0000000..1f4cd42 --- /dev/null +++ b/html/chat @@ -0,0 +1 @@ +Subproject commit 1f4cd42b24a6601b036d8ffd79f4e9f574d3f69a diff --git a/html/cp-acc b/html/cp-acc new file mode 160000 index 0000000..5d8db66 --- /dev/null +++ b/html/cp-acc @@ -0,0 +1 @@ +Subproject commit 5d8db665a415129de90c8ed85ae3fea55dfa7e02 diff --git a/html/cv b/html/cv new file mode 160000 index 0000000..ba21f6b --- /dev/null +++ b/html/cv @@ -0,0 +1 @@ +Subproject commit ba21f6bcece56e1f1d7781e98635e02c8e3bcd25 diff --git a/html/filebed b/html/filebed new file mode 160000 index 0000000..6cc6340 --- /dev/null +++ b/html/filebed @@ -0,0 +1 @@ +Subproject commit 6cc6340626960efccf73084032ffed35a32827cc diff --git a/html/github b/html/github new file mode 160000 index 0000000..02c3620 --- /dev/null +++ b/html/github @@ -0,0 +1 @@ +Subproject commit 02c3620e0b1333e590d26579f9a09b87704b800a diff --git a/html/guide b/html/guide new file mode 160000 index 0000000..074d559 --- /dev/null +++ b/html/guide @@ -0,0 +1 @@ +Subproject commit 074d559fd0ea9154d8a142688c8e5462ffe65059 diff --git a/html/img b/html/img new file mode 160000 index 0000000..b3f4df1 --- /dev/null +++ b/html/img @@ -0,0 +1 @@ +Subproject commit b3f4df126a22ec82847f25ecb8bc57106a6c1f25 diff --git a/html/imgbed b/html/imgbed new file mode 160000 index 0000000..4d1b81a --- /dev/null +++ b/html/imgbed @@ -0,0 +1 @@ +Subproject commit 4d1b81aaef846a49bd7d8d2a819b567b9a67625f diff --git a/html/iotcat b/html/iotcat new file mode 160000 index 0000000..ef17ba9 --- /dev/null +++ b/html/iotcat @@ -0,0 +1 @@ +Subproject commit ef17ba941e3a0595c9cb1f010c76a5af23ede765 diff --git a/html/log b/html/log new file mode 160000 index 0000000..ee1e697 --- /dev/null +++ b/html/log @@ -0,0 +1 @@ +Subproject commit ee1e6974f24b1ab2520e004dc1cc2add761935a9 diff --git a/html/login b/html/login new file mode 160000 index 0000000..3e0d4ce --- /dev/null +++ b/html/login @@ -0,0 +1 @@ +Subproject commit 3e0d4ce93398c0786414a9a2509f6beb2b106ef8 diff --git a/html/pay b/html/pay new file mode 160000 index 0000000..08f4610 --- /dev/null +++ b/html/pay @@ -0,0 +1 @@ +Subproject commit 08f46107119c41fb011a82fdac43795cae930b31 diff --git a/html/report b/html/report new file mode 160000 index 0000000..17bf912 --- /dev/null +++ b/html/report @@ -0,0 +1 @@ +Subproject commit 17bf9120a7874b506a0051816ac63f5012b4c9f0 diff --git a/html/shorturl b/html/shorturl new file mode 160000 index 0000000..9a11f69 --- /dev/null +++ b/html/shorturl @@ -0,0 +1 @@ +Subproject commit 9a11f695881b7ce2e3194720ddc6a31cb465e02c diff --git a/html/user b/html/user new file mode 160000 index 0000000..be30a83 --- /dev/null +++ b/html/user @@ -0,0 +1 @@ +Subproject commit be30a83b57ddc4c27c292569943aa8de85c31480 diff --git a/html/v2ray b/html/v2ray new file mode 160000 index 0000000..7b86713 --- /dev/null +++ b/html/v2ray @@ -0,0 +1 @@ +Subproject commit 7b8671372b54bc1bf3e29b0f780e323020fc29c9 diff --git a/html/video b/html/video new file mode 160000 index 0000000..ff996b6 --- /dev/null +++ b/html/video @@ -0,0 +1 @@ +Subproject commit ff996b6f25a23e08ea96a2eb8c047375452fcdb0 diff --git a/html/wiot b/html/wiot new file mode 160000 index 0000000..d447a5a --- /dev/null +++ b/html/wiot @@ -0,0 +1 @@ +Subproject commit d447a5a81d359204e7f61383f1428f20ceabe67e diff --git a/nginx/default.d/cache.conf b/nginx/default.d/cache.conf new file mode 100644 index 0000000..ba59f57 --- /dev/null +++ b/nginx/default.d/cache.conf @@ -0,0 +1,13 @@ +location ~* ^.+\.(ico|gif|jpg|jpeg|png)$ { + access_log off; + expires 30d; +} + +location ~* ^.+\.(css|js|txt|xml|swf|wav)$ { + access_log off; + expires 24h; +} + +location ~* ^.+\.(html|htm)$ { + expires 1h; +} diff --git a/nginx/default.d/favicon.conf b/nginx/default.d/favicon.conf new file mode 100644 index 0000000..de48afc --- /dev/null +++ b/nginx/default.d/favicon.conf @@ -0,0 +1,3 @@ +location = /favicon.ico { + #proxy_pass https://cdn.yimian.xyz/img/head/head3r.ico; +} diff --git a/nginx/default.d/hsts.conf b/nginx/default.d/hsts.conf new file mode 100644 index 0000000..c3b0734 --- /dev/null +++ b/nginx/default.d/hsts.conf @@ -0,0 +1 @@ +add_header Strict-Transport-Security "max-age=31536000"; diff --git a/nginx/default.d/php.conf b/nginx/default.d/php.conf new file mode 100644 index 0000000..8114d94 --- /dev/null +++ b/nginx/default.d/php.conf @@ -0,0 +1,13 @@ +location ~ \.php$ { + try_files $uri =404; + fastcgi_pass php-fpm:9000; + + fastcgi_pass_request_body off; + client_body_in_file_only clean; + fastcgi_param REQUEST_BODY_FILE $request_body_file; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /share/nginx/fastcgi_params; + fastcgi_keep_conn on; +} diff --git a/nginx/dhparam b/nginx/dhparam new file mode 100644 index 0000000..088f967 --- /dev/null +++ b/nginx/dhparam @@ -0,0 +1,8 @@ +-----BEGIN DH PARAMETERS----- +MIIBCAKCAQEA//////////+t+FRYortKmq/cViAnPTzx2LnFg84tNpWp4TZBFGQz ++8yTnc4kmz75fS/jY2MMddj2gbICrsRhetPfHtXV/WVhJDP1H18GbtCFY2VVPe0a +87VXE15/V8k1mE8McODmi3fipona8+/och3xWKE2rec1MKzKT0g6eXq8CrGCsyT7 +YdEIqUuyyOP7uWrat2DX9GgdT0Kj3jlN9K5W7edjcrsZCwenyO4KbXCeAvzhzffi +7MA0BM0oNC9hkXL+nOmFg/+OTxIy7vKBg8P+OxtMb61zO7X8vC7CIAXFjvGDfRaD +ssbzSibBsu/6iGtCOGEoXJf//////////wIBAg== +-----END DH PARAMETERS----- \ No newline at end of file diff --git a/nginx/fastcgi.conf b/nginx/fastcgi.conf new file mode 100644 index 0000000..091738c --- /dev/null +++ b/nginx/fastcgi.conf @@ -0,0 +1,26 @@ + +fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; +fastcgi_param QUERY_STRING $query_string; +fastcgi_param REQUEST_METHOD $request_method; +fastcgi_param CONTENT_TYPE $content_type; +fastcgi_param CONTENT_LENGTH $content_length; + +fastcgi_param SCRIPT_NAME $fastcgi_script_name; +fastcgi_param REQUEST_URI $request_uri; +fastcgi_param DOCUMENT_URI $document_uri; +fastcgi_param DOCUMENT_ROOT $document_root; +fastcgi_param SERVER_PROTOCOL $server_protocol; +fastcgi_param REQUEST_SCHEME $scheme; +fastcgi_param HTTPS $https if_not_empty; + +fastcgi_param GATEWAY_INTERFACE CGI/1.1; +fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; + +fastcgi_param REMOTE_ADDR $remote_addr; +fastcgi_param REMOTE_PORT $remote_port; +fastcgi_param SERVER_ADDR $server_addr; +fastcgi_param SERVER_PORT $server_port; +fastcgi_param SERVER_NAME $server_name; + +# PHP only, required if PHP was built with --enable-force-cgi-redirect +fastcgi_param REDIRECT_STATUS 200; diff --git a/nginx/fastcgi_params b/nginx/fastcgi_params new file mode 100644 index 0000000..28decb9 --- /dev/null +++ b/nginx/fastcgi_params @@ -0,0 +1,25 @@ + +fastcgi_param QUERY_STRING $query_string; +fastcgi_param REQUEST_METHOD $request_method; +fastcgi_param CONTENT_TYPE $content_type; +fastcgi_param CONTENT_LENGTH $content_length; + +fastcgi_param SCRIPT_NAME $fastcgi_script_name; +fastcgi_param REQUEST_URI $request_uri; +fastcgi_param DOCUMENT_URI $document_uri; +fastcgi_param DOCUMENT_ROOT $document_root; +fastcgi_param SERVER_PROTOCOL $server_protocol; +fastcgi_param REQUEST_SCHEME $scheme; +fastcgi_param HTTPS $https if_not_empty; + +fastcgi_param GATEWAY_INTERFACE CGI/1.1; +fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; + +fastcgi_param REMOTE_ADDR $remote_addr; +fastcgi_param REMOTE_PORT $remote_port; +fastcgi_param SERVER_ADDR $server_addr; +fastcgi_param SERVER_PORT $server_port; +fastcgi_param SERVER_NAME $server_name; + +# PHP only, required if PHP was built with --enable-force-cgi-redirect +fastcgi_param REDIRECT_STATUS 200; diff --git a/nginx/mime.types b/nginx/mime.types new file mode 100644 index 0000000..2961256 --- /dev/null +++ b/nginx/mime.types @@ -0,0 +1,97 @@ + +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +}