From 1f0510b82f507da8d74e61bae3c8272c618993ff Mon Sep 17 00:00:00 2001 From: qfdk Date: Sun, 28 Apr 2019 11:03:26 +0200 Subject: [PATCH 1/8] =?UTF-8?q?[Dev]=20=E6=B7=BB=E5=8A=A0dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 21 +++++++++++++++++++++ README.md | 10 ++++++++++ allowed-sites.conf | 2 +- genConf.sh | 26 ++++++++++++++++++++++++++ nginx.conf | 8 ++++---- 5 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 Dockerfile create mode 100755 genConf.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000000..c24e1bd2e93 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,21 @@ +FROM centos:latest + +# 安装依赖 +RUN yum install -y \ + gcc gcc-c++ \ + pcre pcre-devel \ + openssl openssl-devel \ + zlib zlib-devel git corntabs + +# 添加用户 +RUN useradd jsproxy -g nobody && su jsproxy + +# 添加文件夹 +ADD . /home/jsproxy/server + +# 安装服务器 +RUN bash /home/jsproxy/server/setup-nginx.sh + +EXPOSE 8080 8443 + +CMD bash /home/jsproxy/server/run.sh \ No newline at end of file diff --git a/README.md b/README.md index 169004288aa..10742e572d8 100644 --- a/README.md +++ b/README.md @@ -132,6 +132,16 @@ https://zjcqoo.github.io/-----https://www.google.com 虽然依旧简陋，但比之前好。提供了线路切换、预加载的功能。 +### 懒人模式 + +懒人模式提供自动生成CF certificate 并且使用docker进行一键启动服务器 + +```bash +bash genConf.sh +docker build -t jsproxy . +docker run -p 8080:8080 -p 8443:8443 jsproxy +``` + # License MIT \ No newline at end of file diff --git a/allowed-sites.conf b/allowed-sites.conf index 2d6c9aff72f..00b3a427f33 100644 --- a/allowed-sites.conf +++ b/allowed-sites.conf @@ -7,4 +7,4 @@ # http://localhost 'lo'; https://etherdream.github.io 'gh-eth'; -https://zjcqoo.github.io 'gh-qoo'; \ No newline at end of file +https://zjcqoo.github.io 'gh-qoo'; diff --git a/genConf.sh b/genConf.sh new file mode 100755 index 00000000000..4bd81c33ffc --- /dev/null +++ b/genConf.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +# CF 证书配置 +echo "请输入CF域名"; +read domain; +echo "请输入CF信箱"; +read mail; +echo "请输入CF 密钥"; +read token; + +curl https://get.acme.sh | sh + +cat > ./gen-cert/dnsconf <> allowed-sites.conf + +echo "生成完毕 请使用Docker进行后续工作" \ No newline at end of file diff --git a/nginx.conf b/nginx.conf index 81b115a4ed2..941e1c68cac 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,9 +1,9 @@ http { server { - # server_name example.com; - # ssl_certificate cert/example.com/ecc.cer; - # ssl_certificate_key cert/example.com/ecc.key; - # listen 8443 ssl http2; + server_name example.com; + ssl_certificate cert/example.com/ecc.cer; + ssl_certificate_key cert/example.com/ecc.key; + listen 8443 ssl http2; listen 8080; include api.conf; } From 904a7089af80d4cc12a5deb80104a79321868b17 Mon Sep 17 00:00:00 2001 From: qfdk Date: Sun, 28 Apr 2019 11:08:18 +0200 Subject: [PATCH 2/8] =?UTF-8?q?[Dev]=20=E6=B7=BB=E5=8A=A0dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- genConf.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/genConf.sh b/genConf.sh index 4bd81c33ffc..1445b3ca8cd 100755 --- a/genConf.sh +++ b/genConf.sh @@ -22,5 +22,4 @@ bash gen.sh sed -i "s/example.com/$domain/g" nginx.conf # 添加服务器到白名单 echo "https://$domain '$domaine';" >> allowed-sites.conf - echo "生成完毕 请使用Docker进行后续工作" \ No newline at end of file From 6153107332f274a6ba2302445d02eb5ba831880c Mon Sep 17 00:00:00 2001 From: qfdk Date: Sun, 28 Apr 2019 11:09:30 +0200 Subject: [PATCH 3/8] =?UTF-8?q?[Dev]=20=E6=B7=BB=E5=8A=A0dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- genConf.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/genConf.sh b/genConf.sh index 1445b3ca8cd..0a907457bca 100755 --- a/genConf.sh +++ b/genConf.sh @@ -18,6 +18,7 @@ export CF_Email="$mail" EOF cd ./gen-cert bash gen.sh +cd .. # 替换域名 sed -i "s/example.com/$domain/g" nginx.conf # 添加服务器到白名单 From 8ad22c4c54c1311c92bbba6f09f57a19dc6dab04 Mon Sep 17 00:00:00 2001 From: qfdk Date: Sun, 28 Apr 2019 11:39:31 +0200 Subject: [PATCH 4/8] [Fix] nginx --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c24e1bd2e93..a65929d502b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,8 @@ ADD . /home/jsproxy/server # 安装服务器 RUN bash /home/jsproxy/server/setup-nginx.sh - +# 启动服务 +RUN bash /home/jsproxy/server/run.sh EXPOSE 8080 8443 -CMD bash /home/jsproxy/server/run.sh \ No newline at end of file +CMD ["tail -f", "/home/jsproxy/server/nginx/logs/proxy.log"] \ No newline at end of file From 67d118c9ec0d8c459b0ad1cde8166ce77d2f65e7 Mon Sep 17 00:00:00 2001 From: qfdk Date: Sun, 28 Apr 2019 12:05:30 +0200 Subject: [PATCH 5/8] =?UTF-8?q?[Dev]=20=E4=BF=AE=E6=94=B9=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- README.md | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a65929d502b..7822c9ab8d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,4 +19,4 @@ RUN bash /home/jsproxy/server/setup-nginx.sh RUN bash /home/jsproxy/server/run.sh EXPOSE 8080 8443 -CMD ["tail -f", "/home/jsproxy/server/nginx/logs/proxy.log"] \ No newline at end of file +CMD tail -f /home/jsproxy/server/nginx/logs/proxy.log \ No newline at end of file diff --git a/README.md b/README.md index 10742e572d8..b52f75c84c4 100644 --- a/README.md +++ b/README.md @@ -137,9 +137,12 @@ https://zjcqoo.github.io/-----https://www.google.com 懒人模式提供自动生成CF certificate 并且使用docker进行一键启动服务器 ```bash +# 执行命令生成需要的配置文件 bash genConf.sh +# 生成docker镜像 docker build -t jsproxy . -docker run -p 8080:8080 -p 8443:8443 jsproxy +运行镜像 +docker run -d -p 8080:8080 -p 8443:8443 jsproxy ``` # License From e5d4f8fc17a96347d910b72e426f15bbd27b9e6d Mon Sep 17 00:00:00 2001 From: qfdk Date: Sun, 28 Apr 2019 12:18:31 +0200 Subject: [PATCH 6/8] =?UTF-8?q?[Fix]=20=E4=BF=AE=E5=A4=8D=E7=BD=91?= =?UTF-8?q?=E7=AB=99=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- genConf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/genConf.sh b/genConf.sh index 0a907457bca..ee4f4a1b9e9 100755 --- a/genConf.sh +++ b/genConf.sh @@ -22,5 +22,5 @@ cd .. # 替换域名 sed -i "s/example.com/$domain/g" nginx.conf # 添加服务器到白名单 -echo "https://$domain '$domaine';" >> allowed-sites.conf +echo "https://$domain '$domain';" >> allowed-sites.conf echo "生成完毕 请使用Docker进行后续工作" \ No newline at end of file From 66887815ed83cca18d6335ff6caba63a86f10885 Mon Sep 17 00:00:00 2001 From: qfdk Date: Sun, 28 Apr 2019 11:08:18 +0200 Subject: [PATCH 7/8] =?UTF-8?q?[Dev]=20=E6=B7=BB=E5=8A=A0dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Dev] 添加dockerfile [Fix] nginx [Dev] 修改文档 [Fix] 修复网站添加 --- Dockerfile | 5 +++-- README.md | 5 ++++- genConf.sh | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index c24e1bd2e93..7822c9ab8d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,8 @@ ADD . /home/jsproxy/server # 安装服务器 RUN bash /home/jsproxy/server/setup-nginx.sh - +# 启动服务 +RUN bash /home/jsproxy/server/run.sh EXPOSE 8080 8443 -CMD bash /home/jsproxy/server/run.sh \ No newline at end of file +CMD tail -f /home/jsproxy/server/nginx/logs/proxy.log \ No newline at end of file diff --git a/README.md b/README.md index 10742e572d8..b52f75c84c4 100644 --- a/README.md +++ b/README.md @@ -137,9 +137,12 @@ https://zjcqoo.github.io/-----https://www.google.com 懒人模式提供自动生成CF certificate 并且使用docker进行一键启动服务器 ```bash +# 执行命令生成需要的配置文件 bash genConf.sh +# 生成docker镜像 docker build -t jsproxy . -docker run -p 8080:8080 -p 8443:8443 jsproxy +运行镜像 +docker run -d -p 8080:8080 -p 8443:8443 jsproxy ``` # License diff --git a/genConf.sh b/genConf.sh index 4bd81c33ffc..ee4f4a1b9e9 100755 --- a/genConf.sh +++ b/genConf.sh @@ -18,9 +18,9 @@ export CF_Email="$mail" EOF cd ./gen-cert bash gen.sh +cd .. # 替换域名 sed -i "s/example.com/$domain/g" nginx.conf # 添加服务器到白名单 -echo "https://$domain '$domaine';" >> allowed-sites.conf - +echo "https://$domain '$domain';" >> allowed-sites.conf echo "生成完毕 请使用Docker进行后续工作" \ No newline at end of file From 78b472fbbbbc86d7989cf456059653ec669e276b Mon Sep 17 00:00:00 2001 From: qfdk Date: Wed, 1 May 2019 18:06:02 +0200 Subject: [PATCH 8/8] =?UTF-8?q?[Dev]=20=E4=BC=98=E5=8C=96=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 6 +++--- genConf.sh | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7822c9ab8d2..3658054ae45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,8 +15,8 @@ ADD . /home/jsproxy/server # 安装服务器 RUN bash /home/jsproxy/server/setup-nginx.sh -# 启动服务 -RUN bash /home/jsproxy/server/run.sh + EXPOSE 8080 8443 -CMD tail -f /home/jsproxy/server/nginx/logs/proxy.log \ No newline at end of file +# 启动服务 +CMD ["/home/jsproxy/openresty/nginx/sbin/nginx","-c","/home/jsproxy/server/nginx.conf","-p","/home/jsproxy/server/nginx","-g","daemon off;"] \ No newline at end of file diff --git a/genConf.sh b/genConf.sh index ee4f4a1b9e9..332a6174f09 100755 --- a/genConf.sh +++ b/genConf.sh @@ -8,6 +8,9 @@ read mail; echo "请输入CF 密钥"; read token; +echo "请输加入入允许访问域名"; +read allowedDomain; + curl https://get.acme.sh | sh cat > ./gen-cert/dnsconf <> allowed-sites.conf +echo "https://$allowedDomain '$allowedDomain';" >> allowed-sites.conf echo "生成完毕 请使用Docker进行后续工作" \ No newline at end of file