From 89331091be5d1006cc272a2976154c6f4263c908 Mon Sep 17 00:00:00 2001 From: York Zhao Date: Tue, 23 Jul 2024 08:46:16 +0800 Subject: [PATCH] Use caddy to process reverse proxy. --- OneClickDesktop_zh-CN.sh | 94 +++++++++++++++++++++++++--------------- 1 file changed, 60 insertions(+), 34 deletions(-) diff --git a/OneClickDesktop_zh-CN.sh b/OneClickDesktop_zh-CN.sh index c0b3a45..23062eb 100644 --- a/OneClickDesktop_zh-CN.sh +++ b/OneClickDesktop_zh-CN.sh @@ -231,13 +231,13 @@ function get_user_options sleep 1 fi # 从这里开始,是配置反代的部分 - # 将在下一个版本使用caddy来反代 + # 相比原版本,将使用caddy来反代 echo - say @B"请问您是否想要设置Nginx反代?" yellow + say @B"请问您是否想要设置Caddy反代?" yellow say @B"请注意,如果您想在本地电脑和服务器之间复制粘贴文本,您必须启用反代并设置SSL. 不过,您也可以暂时先不设置反代,以后再手动设置。" yellow echo "请输入 [Y/n]:" - read install_nginx - if [ "x$install_nginx" != "xn" ] && [ "x$install_nginx" != "xN" ] ; then + read install_caddy + if [ "x$install_caddy" != "xn" ] && [ "x$install_caddy" != "xN" ] ; then echo say @B"请输入您的域名(比如desktop.qing.su):" yellow read guacamole_hostname @@ -253,7 +253,7 @@ function get_user_options read le_email fi else - say @B"好的,将跳过Nginx安装。" yellow + say @B"好的,将跳过Caddy安装。" yellow fi echo say @B"开始安装桌面环境,请稍后。" green @@ -800,55 +800,81 @@ function display_license function install_reverse_proxy { echo - say @B"安装Nginx反代..." yellow + say @B"安装Caddy反代..." yellow sleep 2 if [ "$OS" = "RHEL8" ] ; then - dnf -y install nginx certbot python3-certbot-nginx - systemctl enable nginx - systemctl start nginx + dnf install -y 'dnf-command(copr)' + dnf copr enable @caddy/caddy -y + dnf install caddy -y elif [ "$OS" = "CENTOS7" ] ; then - yum -y install nginx certbot python-certbot-nginx - systemctl enable nginx - systemctl start nginx + yum install -y yum-plugin-copr + yum copr enable @caddy/caddy -y + yum install caddy -y else - apt-get install nginx certbot python3-certbot-nginx -y + sudo apt install -y debian-keyring debian-archive-keyring apt-transport-https curl + curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | sudo gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg + curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | sudo tee /etc/apt/sources.list.d/caddy-stable.list fi - say @B"Nginx安装成功!" green - cat > /etc/nginx/conf.d/guacamole.conf <> /etc/caddy/Caddyfile <> /etc/caddy/Caddyfile <