From cc5aec11baf7ad06a68914d514ab819abf25f1e5 Mon Sep 17 00:00:00 2001
From: aws <aws@aws2>
Date: Fri, 17 Dec 2021 10:51:37 +0800
Subject: [PATCH] update README
---
README.md | 18 ++++++++++--------
autodeploy/Dockerfile | 25 -------------------------
autodeploy/config.json | 41 -----------------------------------------
autodeploy/readme | 15 ---------------
4 files changed, 10 insertions(+), 89 deletions(-)
delete mode 100755 autodeploy/Dockerfile
delete mode 100644 autodeploy/config.json
delete mode 100755 autodeploy/readme
diff --git a/README.md b/README.md
index 7fb83b3..099cc64 100644
--- a/README.md
+++ b/README.md
@@ -14,21 +14,23 @@
# 目录介绍：
-* autodeploy 自动部署.
-* clients 客户端文件
-* server 服务端文件
-* web 网站文件
+* clients 客户端文件
+* server 服务端文件
+* web 网站文件
+
+* server/config.json 探针配置文件
+* web/json 探针月流量
# 自动部署：
【服务端】：
```bash
-`x86_64`: docker pull cppla/serverstatus:latest
-`arm64`: docker pull cppla/serverstatus:arm
-mkdir /serverstatus && cd /serverstatus && wget https://raw.githubusercontent.com/cppla/ServerStatus/master/autodeploy/config.json
+`onetouch`: wget --no-check-certificate -qO https://raw.githubusercontent.com/cppla/ServerStatus/master/server/config.json && mkdir json && docker run -d --restart=always --name=serverstatus -v config.json:/ServerStatus/server/config.json -v json:/usr/share/nginx/html/json -p 80:80 -p 35601:35601 cppla/serverstatus:latest
-docker run -d --restart=always --name=serverstatus -v /serverstatus/config.json:/ServerStatus/server/config.json -v /serverstatus/json:/usr/share/nginx/html/json -p 80:80 -p 35601:35601 cppla/serverstatus:latest
+`ServerStatus`: docker-compose up -d
+
+`ServerStatus with tgbot`: docker-compose -f docker-compose-telegram.yml up -d
```
diff --git a/autodeploy/Dockerfile b/autodeploy/Dockerfile
deleted file mode 100755
index 6db9d54..0000000
--- a/autodeploy/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-# the Dockerfile is for build git repo
-FROM debian:buster as builder
-
-MAINTAINER cppla https://cpp.la
-
-RUN apt-get update
-RUN apt-get -y install gcc g++ make git
-RUN git clone https://github.com/cppla/ServerStatus
-
-WORKDIR /ServerStatus/server
-
-RUN make
-RUN pwd && ls -a
-
-# glibc env run
-FROM nginx:latest
-
-RUN mkdir -p /ServerStatus/server/
-
-COPY --from=builder /ServerStatus/server /ServerStatus/server/
-COPY --from=builder /ServerStatus/web /usr/share/nginx/html/
-
-EXPOSE 80 35601
-
-CMD nohup sh -c '/etc/init.d/nginx start && /ServerStatus/server/sergate --config=/ServerStatus/server/config.json --web-dir=/usr/share/nginx/html'
diff --git a/autodeploy/config.json b/autodeploy/config.json
deleted file mode 100644
index 4c86ca8..0000000
--- a/autodeploy/config.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{"servers":
- [
- {
- "username": "s01",
- "name": "node1",
- "type": "xen",
- "host": "host1",
- "location": "🇨🇳",
- "password": "USER_DEFAULT_PASSWORD",
- "monthstart": 1
- },
- {
- "username": "s02",
- "name": "node2",
- "type": "vmware",
- "host": "host2",
- "location": "🇯🇵",
- "password": "USER_DEFAULT_PASSWORD",
- "monthstart": 1
- },
- {
- "disabled": true,
- "username": "s03",
- "name": "node3",
- "type": "Nothing",
- "host": "host3",
- "location": "🇫🇷",
- "password": "USER_DEFAULT_PASSWORD",
- "monthstart": 1
- },
- {
- "username": "s04",
- "name": "node4",
- "type": "kvm",
- "host": "host4",
- "location": "🇰🇷",
- "password": "USER_DEFAULT_PASSWORD",
- "monthstart": 1
- }
- ]
-}
diff --git a/autodeploy/readme b/autodeploy/readme
deleted file mode 100755
index dd33119..0000000
--- a/autodeploy/readme
+++ /dev/null
@@ -1,15 +0,0 @@
-服务端:
-
-docker build -f Dockerfile -t serverstatus .
-docker run -d --restart=always --name=sss -v {$path}/config.json:/ServerStatus/server/config.json -p {$port}:80 -p {$port}:35601 serverstatus
-
-客户端:
-
-wget --no-check-certificate -qO client-linux.py 'https://raw.githubusercontent.com/cppla/ServerStatus/master/clients/client-linux.py' && nohup python3 client-linux.py SERVER={$SERVER} USER={$USER} PASSWORD={$PASSWORD} >/dev/null 2>&1 &
-
-
-
-
-
-附: docker安装
-curl -sSL https://get.docker.com/ | sh