hitsword
/
HYProxy-1.0
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

加强判断，减少报错 

Signed-off-by: HITSword <admin@huayizhiyun.com>
master
HITSword 2020-01-08 16:14:41 +08:00
parent 8913c6c55d
commit 2e8057646f
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
AMHScript
View File

@ -22,17 +22,22 @@ function amh_module_install()
else else
#Delete other version #Delete other version
for module_name in `ls /root/amh/modules/ | grep 'HYProxy' | grep -v 'HYProxy-1.0'`; do for module_name in `ls /root/amh/modules/ | grep 'HYProxy' | grep -v 'HYProxy-1.0'`; do
#amh module $module_name uninstall force; #amh module $module_name uninstall force;
#amh module $module_name delete y; #amh module $module_name delete y;
rm -rf /root/amh/modules/$module_name; rm -rf /root/amh/modules/$module_name;
done; done;
#install PDO_MYSQL module and set InnoDB_Engine On #install PDO_MYSQL module and set InnoDB_Engine On
amh module download PDO_MYSQL-1.0.2; if ! ls /root/amh/modules/ | grep -q 'PDO_MYSQL-1.0.2'; then
amh module PDO_MYSQL-1.0.2 install force; amh module download PDO_MYSQL-1.0.2;
fi;
if ! cat /etc/php.ini | grep -q 'pdo_mysql.so'; then
amh module PDO_MYSQL-1.0.2 install force;
fi;
amh SetParam mysql InnoDB_Engine On; amh SetParam mysql InnoDB_Engine On;
#install nginx module #install nginx module
Cpunum=`cat /proc/cpuinfo |grep 'processor'|wc -l`; Cpunum=`cat /proc/cpuinfo |grep 'processor'|wc -l`;
nginx_configure=`/usr/local/nginx/sbin/nginx -V 2> /tmp/nginx_configure && cat /tmp/nginx_configure | grep 'configure arguments' | cut -d: -f2 && rm -f /tmp/nginx_configure`; nginx_configure='--prefix=/usr/local/nginx --user=www --group=www --with-http_ssl_module --with-http_gzip_static_module --without-mail_pop3_module --without-mail_imap_module --without-mail_smtp_module --without-http_uwsgi_module --without-http_scgi_module --with-ipv6';
[ -f /usr/local/nginx/sbin/nginx ] && nginx_configure=`/usr/local/nginx/sbin/nginx -V 2> /tmp/nginx_configure && cat /tmp/nginx_configure | grep 'configure arguments' | cut -d: -f2 && rm -f /tmp/nginx_configure`;
new_nginx_configure=$nginx_configure; new_nginx_configure=$nginx_configure;
if ! echo "$new_nginx_configure" | grep 'with-http_stub_status_module' > /dev/null; then if ! echo "$new_nginx_configure" | grep 'with-http_stub_status_module' > /dev/null; then
new_nginx_configure="${new_nginx_configure} --with-http_stub_status_module"; new_nginx_configure="${new_nginx_configure} --with-http_stub_status_module";
@ -271,7 +276,8 @@ function amh_module_uninstall()
#uninstall nginx modules #uninstall nginx modules
Cpunum=`cat /proc/cpuinfo |grep 'processor'|wc -l`; Cpunum=`cat /proc/cpuinfo |grep 'processor'|wc -l`;
nginx_configure=`/usr/local/nginx/sbin/nginx -V 2> /tmp/nginx_configure && cat /tmp/nginx_configure | grep 'configure arguments' | cut -d: -f2 && rm -f /tmp/nginx_configure`; nginx_configure='--prefix=/usr/local/nginx --user=www --group=www --with-http_ssl_module --with-http_gzip_static_module --without-mail_pop3_module --without-mail_imap_module --without-mail_smtp_module --without-http_uwsgi_module --without-http_scgi_module --with-ipv6';
[ -f /usr/local/nginx/sbin/nginx ] && nginx_configure=`/usr/local/nginx/sbin/nginx -V 2> /tmp/nginx_configure && cat /tmp/nginx_configure | grep 'configure arguments' | cut -d: -f2 && rm -f /tmp/nginx_configure`;
new_nginx_configure=$nginx_configure; new_nginx_configure=$nginx_configure;
if echo "$new_nginx_configure" | grep 'add-module=/usr/local/ngx_cache_purge-2.3' > /dev/null; then if echo "$new_nginx_configure" | grep 'add-module=/usr/local/ngx_cache_purge-2.3' > /dev/null; then
new_nginx_configure=`echo $new_nginx_configure | sed "s|--add-module=/usr/local/ngx_cache_purge-2.3||"`; new_nginx_configure=`echo $new_nginx_configure | sed "s|--add-module=/usr/local/ngx_cache_purge-2.3||"`;