diff --git a/AMHScript b/AMHScript index 29d605a..f60f151 100644 --- a/AMHScript +++ b/AMHScript @@ -22,17 +22,22 @@ function amh_module_install() else #Delete other version 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 delete y; - rm -rf /root/amh/modules/$module_name; + #amh module $module_name uninstall force; + #amh module $module_name delete y; + rm -rf /root/amh/modules/$module_name; done; #install PDO_MYSQL module and set InnoDB_Engine On - amh module download PDO_MYSQL-1.0.2; - amh module PDO_MYSQL-1.0.2 install force; + if ! ls /root/amh/modules/ | grep -q 'PDO_MYSQL-1.0.2'; then + 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; #install nginx module 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; 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"; @@ -271,7 +276,8 @@ function amh_module_uninstall() #uninstall nginx modules 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; 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||"`;