From b589a49072c4b8e5297e498412d79b12c2879ac3 Mon Sep 17 00:00:00 2001 From: Leven Date: Thu, 23 Sep 2021 09:02:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=9A=E8=BF=87=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E9=83=A8=E7=BD=B2=E8=84=9A=E6=9C=AC=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=EF=BC=8C=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E6=89=93=E5=BC=80=E7=9A=84=E9=97=AE=E9=A2=98=20uwsgi.ini?= =?UTF-8?q?=E5=92=8Cuwsgiserver=E4=B8=AD=E7=9A=84=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E9=80=9A=E8=BF=87=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=87=AA=E5=8A=A8=E6=9B=BF=E6=8D=A2=E3=80=82?= =?UTF-8?q?=20=E5=A6=82=E6=9E=9C=E6=98=AF=E6=89=8B=E5=8A=A8=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E7=9A=84=EF=BC=8C=E8=87=AA=E8=A1=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8D=B3=E5=8F=AF=EF=BC=8C=E7=9B=B8=E4=BF=A1?= =?UTF-8?q?=E8=83=BD=E6=89=8B=E5=8A=A8=E9=83=A8=E7=BD=B2=E7=9A=84=E4=B9=9F?= =?UTF-8?q?=E6=98=AF=E6=9C=89=E4=B8=80=E5=AE=9ALinux=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E7=9A=84=E5=90=8C=E5=AD=A6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- auto-install.sh | 38 ++++++++++++++++++++++---------------- uwsgi.ini | 12 ++++++------ uwsgiserver | 2 +- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/auto-install.sh b/auto-install.sh index dd839ed..4ae6872 100644 --- a/auto-install.sh +++ b/auto-install.sh @@ -68,7 +68,7 @@ done echo "=======================================================================" while :; do echo - read -p "请输入密码自助平台使用的端口: " PWD_SELF_SERVICE_PORT + read -p "请输入密码自助平台使用的端口(不要和Nginx一样): " PWD_SELF_SERVICE_PORT check_port ${PWD_SELF_SERVICE_PORT} if [[ $? -ne 0 ]]; then echo "---输入的端口有误，请重新输入。" @@ -79,7 +79,7 @@ done echo "=======================================================================" while :; do echo - read -p "请输入密码自助平台使用域名，例如：pwd.abc.com: " PWD_SELF_SERVICE_DOMAIN + read -p "请输入密码自助平台使用域名，例如：pwd.abc.com（不需要加http://或https://） " PWD_SELF_SERVICE_DOMAIN check_domain ${PWD_SELF_SERVICE_DOMAIN} if [[ $? -ne 0 ]]; then echo "---输入的域名格式有误，请重新输入。" @@ -91,6 +91,8 @@ done ##当前脚本的绝对路径 SHELL_FOLDER=$(dirname $(readlink -f "$0")) + + echo "关闭SELINUX" sudo setenforce 0 sudo sed -i 's@SELINUX=*@SELINUX=disabled@g' /etc/selinux/config @@ -138,31 +140,32 @@ fi ##install python3 ##如果之前用此脚本安装过python3，后续就不会再次安装。 -python_ver='3.8.9' -if [[ -f "/usr/share/python-${python_ver}/bin/python3" ]] +PYTHON_VER='3.8.9' +PYTHON_INSTALL_DIR=/usr/share/python-${PYTHON_VER} +if [[ -f "${PYTHON_INSTALL_DIR}/bin/python3" ]] then echo "己发现Python3，将不会安装。" else - if [[ -f "Python-${python_ver}.tar.xz" ]] + if [[ -f "Python-${PYTHON_VER}.tar.xz" ]] then - echo "将安装Python${python_ver}" - tar xf Python-${python_ver}.tar.xz - cd Python-${python_ver} - sudo ./configure --prefix=/usr/share/python-${python_ver} && make && make install + echo "将安装Python${PYTHON_VER}" + tar xf Python-${PYTHON_VER}.tar.xz + cd Python-${PYTHON_VER} + sudo ./configure --prefix=${PYTHON_INSTALL_DIR} && make && make install else - echo "脚本目录下没有发现Python${python_ver}.tar.xz，将会下载python ${python_ver}" - sudo wget https://www.python.org/ftp/python/${python_ver}/Python-${python_ver}.tar.xz - tar xf Python-${python_ver}.tar.xz - cd Python-${python_ver} - sudo ./configure --prefix=/usr/share/python-${python_ver} && make && make install + echo "脚本目录下没有发现Python${PYTHON_VER}.tar.xz，将会下载python ${PYTHON_VER}" + sudo wget https://www.python.org/ftp/python/${PYTHON_VER}/Python-${PYTHON_VER}.tar.xz + tar xf Python-${PYTHON_VER}.tar.xz + cd Python-${PYTHON_VER} + sudo ./configure --prefix=${PYTHON_INSTALL_DIR} && make && make install fi if [[ $? -eq 0 ]] then echo "创建python3和pip3的软件链接" cd ${SHELL_FOLDER} - sudo ln -svf /usr/share/python-${python_ver}/bin/python3 /usr/bin/python3 - sudo ln -svf /usr/share/python-${python_ver}/bin/pip3 /usr/bin/pip3 + sudo ln -svf ${PYTHON_INSTALL_DIR}/bin/python3 /usr/bin/python3 + sudo ln -svf ${PYTHON_INSTALL_DIR}/bin/pip3 /usr/bin/pip3 echo "=======================================================================" echo "Python3 安装成功！" echo "=======================================================================" @@ -204,6 +207,8 @@ fi ##处理配置文件 echo "=======================================================================" echo "处理uwsgi.ini配置文件" +CPU_NUM=$(cat /proc/cpuinfo | grep processor | wc -l) +sed -i "s@CPU_NUM@${CPU_NUM}@g" ${SHELL_FOLDER}/uwsgi.ini sed -i "s@PWD_SELF_SERVICE_HOME@${SHELL_FOLDER}@g" ${SHELL_FOLDER}/uwsgi.ini sed -i "s@PWD_SELF_SERVICE_IP@${PWD_SELF_SERVICE_IP}@g" ${SHELL_FOLDER}/uwsgi.ini sed -i "s@PWD_SELF_SERVICE_PORT@${PWD_SELF_SERVICE_PORT}@g" ${SHELL_FOLDER}/uwsgi.ini @@ -211,6 +216,7 @@ echo "处理uwsgi.ini配置文件完成" echo echo "处理uwsgiserver启动脚本" sed -i "s@PWD_SELF_SERVICE_HOME@${SHELL_FOLDER}@g" ${SHELL_FOLDER}/uwsgiserver +sed -i "s@PYTHON_INSTALL_DIR@${PYTHON_INSTALL_DIR}@g" ${SHELL_FOLDER}/uwsgiserver alias cp='cp' cp -f ${SHELL_FOLDER}/uwsgiserver /etc/init.d/uwsgiserver chmod +x /etc/init.d/uwsgiserver diff --git a/uwsgi.ini b/uwsgi.ini index 6aa822f..4ab7df8 100644 --- a/uwsgi.ini +++ b/uwsgi.ini @@ -1,15 +1,15 @@ [uwsgi] -http-socket = 0.0.0.0:8000 +http-socket = PWD_SELF_SERVICE_IP:PWD_SELF_SERVICE_PORT -chdir = /opt/password-self-service +chdir = PWD_SELF_SERVICE_HOME module = pwdselfservice.wsgi:application master = true -processes = 4 +processes = CPU_NUM -threads = 4 +threads = CPU_NUM max-requests = 2000 @@ -21,8 +21,8 @@ vacuum = true post-buffering = 4096 #设置静态文件 -static-map = /static=/opt/password-self-service/static +static-map = /static=PWD_SELF_SERVICE_HOME/static #设置日志目录 -daemonize = /opt/password-self-service/log/uwsgi.log +daemonize = PWD_SELF_SERVICE_HOME/log/uwsgi.log diff --git a/uwsgiserver b/uwsgiserver index ed6b0e2..d98a905 100644 --- a/uwsgiserver +++ b/uwsgiserver @@ -6,7 +6,7 @@ # processname: uwsgiserver INI="PWD_SELF_SERVICE_HOME/uwsgi.ini" -UWSGI="/usr/share/python-3.6.9/bin/uwsgi" +UWSGI="PYTHON_INSTALL_DIR/bin/uwsgi" PSID="ps aux | grep "uwsgi"| grep -v "grep" | wc -l" if [ ! -n "$1" ]