From 6b44c4436365079984ced153c1179ee40ccd1d9b Mon Sep 17 00:00:00 2001 From: Luk Lu Date: Sat, 19 Nov 2022 18:11:07 +0800 Subject: [PATCH] u --- acme-install.sh | 8 ++++++-- docker-install.sh | 24 ++++++++++++++---------- ipfs-nginx.conf | 42 ++++++++++++++++++++++++++++++++++++++++++ nixhome/.bashrc | 1 + 4 files changed, 63 insertions(+), 12 deletions(-) create mode 100644 ipfs-nginx.conf diff --git a/acme-install.sh b/acme-install.sh index efe37e4..c01efec 100755 --- a/acme-install.sh +++ b/acme-install.sh @@ -1,3 +1,7 @@ -curl https://get.acme.sh | sh -s email=acme.sh@faronear.org +curl https://get.acme.sh | sh -s email=ssl@faronear.org -# echo '. "/root/.acme.sh/acme.sh.env"' >> ~/.bashrc_custom ## already integrated in .bashrc \ No newline at end of file +pushd /faronear/fon/sysconfig +# 取消被默认添加到 .bashrc 的设置 +git reset . && git checkout . +# echo '. "$HOME/.acme.sh/acme.sh.env"' >> ~/.bashrc_custom ## already integrated in .bashrc +popd diff --git a/docker-install.sh b/docker-install.sh index f4aed3f..0eafa4e 100755 --- a/docker-install.sh +++ b/docker-install.sh @@ -4,6 +4,7 @@ # 安装自带版本 apt install docker.io && apt install docker-compose +# sudo apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin echo "=== Choose docker source (a: 阿里云, z: 中科大, leave blank for default):" read -p ">>> " DOCKER_SOURCE @@ -11,35 +12,38 @@ if [ "$DOCKER_SOURCE" = 'a' ] then GPG_URL=http://mirrors.aliyun.com/docker-ce/linux/debian/gpg DOCKER_URL=http://mirrors.aliyun.com/docker-ce/linux/debian - COMPOSE_URL=https://get.daocloud.io/docker/compose/releases/download/1.29.2/ + COMPOSE_URL=https://get.daocloud.io/docker/compose/releases/download/2.12.2/ elif [ "$DOCKER_SOURCE" = 'z' ] then GPG_URL=https://mirrors.ustc.edu.cn/docker-ce/linux/debian/gpg DOCKER_URL=https://mirrors.ustc.edu.cn/docker-ce/linux/debian - COMPOSE_URL=https://get.daocloud.io/docker/compose/releases/download/1.29.2/ + COMPOSE_URL=https://get.daocloud.io/docker/compose/releases/download/2.12.2/ else GPG_URL=https://download.docker.com/linux/debian/gpg DOCKER_URL=https://download.docker.com/linux/debian - COMPOSE_URL=https://github.com/docker/compose/releases/download/1.29.2/ + COMPOSE_URL=https://github.com/docker/compose/releases/download/2.12.2/ fi echo Prepare environment ... sudo apt-get update sudo apt-get install ca-certificates curl gnupg lsb-release -y +sudo apt-get remove docker docker-engine docker.io containerd runc -y echo Add Docker’s official GPG key ... -sudo curl -fsSL $GPG_URL | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg +sudo mkdir -p /etc/apt/keyrings +sudo curl -fsSL $GPG_URL | sudo gpg --dearmor -o /etc/apt/keyrings/docker-archive-keyring.gpg echo Setup stable repository for Docker ... -echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] $DOCKER_URL $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null +echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker-archive-keyring.gpg] $DOCKER_URL $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null echo Install Docker Engine ... sudo apt-get update -sudo apt-get install docker-ce docker-ce-cli containerd.io -y +sudo apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin -y -echo Install Docker-Compose ... -sudo curl -L $COMPOSE_URL/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose -sudo chmod +x /usr/local/bin/docker-compose +# 或者手动安装 compose https://docs.docker.com/compose/install/linux/ +# echo Install Docker-Compose ... +# sudo curl -L $COMPOSE_URL/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose +# sudo chmod +x /usr/local/bin/docker-compose echo "=== 配置中国加速镜像源 /etc/docker/daemon.json (d: Docker中国, t: 腾讯云, z: 中科大, leave blank for no mirror):" read -p ">>> " DOCKER_MIRROR @@ -66,7 +70,7 @@ then echo "}" | sudo tee -a /etc/docker/daemon.json > /dev/null fi -echo "=== 启动docker服务？y for yes, anything else for no" +echo "=== 启动docker服务？ for yes, for no" read -p ">>> " StartDockerDaemon if [ "$StartDockerDaemon" = 'y' ] then diff --git a/ipfs-nginx.conf b/ipfs-nginx.conf new file mode 100644 index 0000000..f54c539 --- /dev/null +++ b/ipfs-nginx.conf @@ -0,0 +1,42 @@ +server { + listen 80; + server_name ipfs.tic.cc; + rewrite ^ https://$http_host$request_uri? permanent; # force redirect http to https + server_tokens off; # Enables or disables emitting nginx version on error pages and in the "Server" response header field. +} + +server { + listen 443 ssl; + server_name ipfs.tic.cc; + ssl_certificate /faronear/ipfsweb/ssl-fullchain.cer; + ssl_certificate_key /faronear/ipfsweb/ssl-ipfs.tic.cc.key; + + server_tokens off; + + ssl_session_timeout 5m; + ssl_session_cache shared:SSL:5m; + # secure settings (A+ at SSL Labs ssltest at time of writing) + # see https://wiki.mozilla.org/Security/Server_Side_TLS#Nginx + ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; + ssl_ciphers ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-CAMELLIA256-SHA:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-SEED-SHA:DHE-RSA-CAMELLIA128-SHA:HIGH:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS; + ssl_prefer_server_ciphers on; + add_header Strict-Transport-Security "max-age=31536000; includeSubDomains"; + + location / { + proxy_pass http://127.0.0.1:8080; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $server_name; + proxy_set_header X-Forwarded-Proto https; + + proxy_read_timeout 1200s; + + # used for view/edit office file via Office Online Server + client_max_body_size 0; + + access_log /faronear/ipfsweb/nginx-access.log; + error_log /faronear/ipfsweb/nginx-error.log; + } + +} diff --git a/nixhome/.bashrc b/nixhome/.bashrc index 38580bb..b304a4d 100644 --- a/nixhome/.bashrc +++ b/nixhome/.bashrc @@ -99,6 +99,7 @@ fi if [ -f $HOME/.acme.sh/acme.sh.env ] then . "$HOME/.acme.sh/acme.sh.env" + alias acme=$HOME/.acme.sh/acme.sh fi # let MacOS uses the same variable so that vscode-sshfs can use "$USERPROFILE/.ssh/id_rsa" uniformly.