Update lnmpa bugs and Tomcat version

apps.conf

@@ -3,8 +3,8 @@
 nginx_version=1.9.4
 tengine_version=2.1.1
 
-tomcat_7_version=7.0.63
-tomcat_8_version=8.0.24
+tomcat_7_version=7.0.64
+tomcat_8_version=8.0.26
 
 apache_2_version=2.2.31
 apache_4_version=2.4.16

config/nginx_apache.conf

@@ -65,11 +65,12 @@ http {
         try_files $uri @apache;
         }
     location @apache {
-        internal;
-        proxy_pass http://127.0.0.1:9090;
+        proxy_pass http://127.0.0.1:88;
+        include proxy.conf;
         }
     location ~ .*\.(php|php5)?$  {
-        proxy_pass http://127.0.0.1:9090;
+        proxy_pass http://127.0.0.1:88;
+        include proxy.conf;
         }
     location ~ .*\.(gif|jpg|jpeg|png|bmp|swf|flv|ico)$ {
         expires 30d;

include/apache-2.2.sh

@@ -11,7 +11,7 @@
 Install_Apache-2-2()
 {
 cd $oneinstack_dir/src
-src_url=http://www.apache.org/dist/httpd/httpd-$apache_2_version.tar.gz && Download_src 
+src_url=http://mirrors.linuxeye.com/apache/httpd/httpd-$apache_2_version.tar.gz && Download_src 
 
 id -u $run_user >/dev/null 2>&1
 [ $? -ne 0 ] && useradd -M -s /sbin/nologin $run_user 
@@ -46,14 +46,14 @@ OS_command
 
 sed -i "s@^User daemon@User $run_user@" $apache_install_dir/conf/httpd.conf
 sed -i "s@^Group daemon@Group $run_user@" $apache_install_dir/conf/httpd.conf
-if [ "$Nginx_version" == '3' ];then
+if [ "$Nginx_version" == '3' -a ! -e "$web_install_dir/sbin/nginx" ];then
     sed -i 's/^#ServerName www.example.com:80/ServerName 0.0.0.0:80/' $apache_install_dir/conf/httpd.conf
     TMP_PORT=80
     TMP_IP=$IPADDR
 elif [ "$Nginx_version" == '1' -o "$Nginx_version" == '2' -o -e "$web_install_dir/sbin/nginx" ];then
-    sed -i 's/^#ServerName www.example.com:80/ServerName 127.0.0.1:9090/' $apache_install_dir/conf/httpd.conf
-    sed -i 's@^Listen.*@Listen 127.0.0.1:9090@' $apache_install_dir/conf/httpd.conf
-    TMP_PORT=9090
+    sed -i 's/^#ServerName www.example.com:80/ServerName 127.0.0.1:88/' $apache_install_dir/conf/httpd.conf
+    sed -i 's@^Listen.*@Listen 127.0.0.1:88@' $apache_install_dir/conf/httpd.conf
+    TMP_PORT=88
     TMP_IP=127.0.0.1
 fi
 sed -i "s@AddType\(.*\)Z@AddType\1Z\n    AddType application/x-httpd-php .php .phtml\n    AddType application/x-httpd-php-source .phps@" $apache_install_dir/conf/httpd.conf
@@ -109,8 +109,8 @@ SetOutputFilter DEFLATE
 Include conf/vhost/*.conf
 EOF
 
-if [ "$Nginx_version" != '3' ];then
-    src_url=https://raw.githubusercontent.com/ttkzw/mod_remoteip-httpd22/master/mod_remoteip.c && Download_src
+if [ "$Nginx_version" != '3' -o -e "$web_install_dir/sbin/nginx" ];then
+    src_url=http://mirrors.linuxeye.com/oneinstack/src/mod_remoteip.c && Download_src
     $apache_install_dir/bin/apxs -i -c -n mod_remoteip.so mod_remoteip.c
     cat > $apache_install_dir/conf/extra/httpd-remoteip.conf << EOF
 LoadModule remoteip_module modules/mod_remoteip.so

include/apache-2.4.sh

@@ -14,7 +14,7 @@ cd $oneinstack_dir/src
 src_url=http://downloads.sourceforge.net/project/pcre/pcre/$pcre_version/pcre-$pcre_version.tar.gz && Download_src
 src_url=http://archive.apache.org/dist/apr/apr-$apr_version.tar.gz && Download_src 
 src_url=http://archive.apache.org/dist/apr/apr-util-$apr_util_version.tar.gz && Download_src 
-src_url=http://www.apache.org/dist/httpd/httpd-$apache_4_version.tar.gz && Download_src 
+src_url=http://mirrors.linuxeye.com/apache/httpd/httpd-$apache_4_version.tar.gz && Download_src 
 
 tar xzf pcre-$pcre_version.tar.gz
 cd pcre-$pcre_version
@@ -59,14 +59,14 @@ OS_command
 
 sed -i "s@^User daemon@User $run_user@" $apache_install_dir/conf/httpd.conf
 sed -i "s@^Group daemon@Group $run_user@" $apache_install_dir/conf/httpd.conf
-if [ "$Nginx_version" == '3' ];then
+if [ "$Nginx_version" == '3' -a ! -e "$web_install_dir/sbin/nginx" ];then
     sed -i 's/^#ServerName www.example.com:80/ServerName 0.0.0.0:80/' $apache_install_dir/conf/httpd.conf
     TMP_PORT=80
     TMP_IP=$IPADDR
 elif [ "$Nginx_version" == '1' -o "$Nginx_version" == '2' -o -e "$web_install_dir/sbin/nginx" ];then
-    sed -i 's/^#ServerName www.example.com:80/ServerName 127.0.0.1:9090/' $apache_install_dir/conf/httpd.conf
-    sed -i 's@^Listen.*@Listen 127.0.0.1:9090@' $apache_install_dir/conf/httpd.conf
-    TMP_PORT=9090
+    sed -i 's/^#ServerName www.example.com:80/ServerName 127.0.0.1:88/' $apache_install_dir/conf/httpd.conf
+    sed -i 's@^Listen.*@Listen 127.0.0.1:88@' $apache_install_dir/conf/httpd.conf
+    TMP_PORT=88
     TMP_IP=127.0.0.1
 fi
 sed -i "s@AddType\(.*\)Z@AddType\1Z\n    AddType application/x-httpd-php .php .phtml\n    AddType application/x-httpd-php-source .phps@" $apache_install_dir/conf/httpd.conf
@@ -122,7 +122,7 @@ SetOutputFilter DEFLATE
 Include conf/vhost/*.conf
 EOF
 
-if [ "$Nginx_version" != '3' ];then
+if [ "$Nginx_version" != '3' -o -e "$web_install_dir/sbin/nginx" ];then
     cat > $apache_install_dir/conf/extra/httpd-remoteip.conf << EOF
 LoadModule remoteip_module modules/mod_remoteip.so
 RemoteIPHeader X-Forwarded-For

include/demo.sh

@@ -25,7 +25,7 @@ fi
 
 echo '<?php phpinfo() ?>' > $wwwroot_dir/default/phpinfo.php
 
-src_url=https://gist.githubusercontent.com/ck-on/4959032/raw/0b871b345fd6cfcd6d2be030c1f33d1ad6a475cb/ocp.php && Download_src
+src_url=http://mirrors.linuxeye.com/oneinstack/src/ocp.php && Download_src
 [ "$PHP_cache" == '1' ] && /bin/cp ocp.php $wwwroot_dir/default && sed -i 's@<a href="/xcache" target="_blank" class="links">xcache</a>@<a href="/ocp.php" target="_blank" class="links">Opcache</a>@' $wwwroot_dir/default/index.html
 [ "$PHP_cache" == '3' ] && sed -i 's@<a href="/xcache" target="_blank" class="links">xcache</a>@<a href="/apc.php" target="_blank" class="links">APC</a>@' $wwwroot_dir/default/index.html
 [ "$PHP_cache" == '4' ] && /bin/cp eaccelerator-*/control.php $wwwroot_dir/default && sed -i 's@<a href="/xcache" target="_blank" class="links">xcache</a>@<a href="/control.php" target="_blank" class="links">eAccelerator</a>@' $wwwroot_dir/default/index.html

include/nginx.sh

@@ -74,6 +74,21 @@ if [ "$Apache_version" == '1' -o "$Apache_version" == '2' ];then
 else
     /bin/cp config/nginx.conf $nginx_install_dir/conf/nginx.conf
 fi
+cat > $nginx_install_dir/conf/proxy.conf << EOF
+proxy_connect_timeout 300s;
+proxy_send_timeout 900;
+proxy_read_timeout 900;
+proxy_buffer_size 32k;
+proxy_buffers 4 32k;
+proxy_busy_buffers_size 64k;
+proxy_redirect off;
+proxy_hide_header Vary;
+proxy_set_header Accept-Encoding '';
+proxy_set_header Host \$host;
+proxy_set_header Referer \$http_referer;
+proxy_set_header Cookie \$http_cookie;
+proxy_set_header X-Real-IP \$remote_addr;
+EOF
 sed -i "s@/home/wwwroot/default@$wwwroot_dir/default@" $nginx_install_dir/conf/nginx.conf
 sed -i "s@/home/wwwlogs@$wwwlogs_dir@g" $nginx_install_dir/conf/nginx.conf
 sed -i "s@^user www www@user $run_user $run_user@" $nginx_install_dir/conf/nginx.conf

include/tengine.sh

@@ -72,6 +72,21 @@ if [ "$Apache_version" == '1' -o "$Apache_version" == '2' ];then
 else
     /bin/cp config/nginx.conf $tengine_install_dir/conf/nginx.conf
 fi
+cat > $tengine_install_dir/conf/proxy.conf << EOF
+proxy_connect_timeout 300s;
+proxy_send_timeout 900;
+proxy_read_timeout 900;
+proxy_buffer_size 32k;
+proxy_buffers 4 32k;
+proxy_busy_buffers_size 64k;
+proxy_redirect off;
+proxy_hide_header Vary;
+proxy_set_header Accept-Encoding '';
+proxy_set_header Host \$host;
+proxy_set_header Referer \$http_referer;
+proxy_set_header Cookie \$http_cookie;
+proxy_set_header X-Real-IP \$remote_addr;
+EOF
 sed -i "s@/home/wwwroot/default@$wwwroot_dir/default@" $tengine_install_dir/conf/nginx.conf
 sed -i "s@/home/wwwlogs@$wwwlogs_dir@g" $tengine_install_dir/conf/nginx.conf
 sed -i "s@^user www www@user $run_user $run_user@" $tengine_install_dir/conf/nginx.conf

include/tomcat-7.sh

@@ -13,9 +13,8 @@ Install_tomcat-7()
 cd $oneinstack_dir/src
 . /etc/profile
 
-[ "$IPADDR_STATE"x == "CN"x ] && DOWN_ADDR=http://mirrors.aliyun.com/apache || DOWN_ADDR=http://www.apache.org/dist
-src_url=$DOWN_ADDR/tomcat/tomcat-7/v$tomcat_7_version/bin/apache-tomcat-$tomcat_7_version.tar.gz && Download_src
-src_url=$DOWN_ADDR/tomcat/tomcat-7/v$tomcat_7_version/bin/extras/catalina-jmx-remote.jar && Download_src
+src_url=http://mirrors.linuxeye.com/apache/tomcat/v$tomcat_7_version/apache-tomcat-$tomcat_7_version.tar.gz && Download_src
+src_url=http://mirrors.linuxeye.com/apache/tomcat/v$tomcat_7_version/catalina-jmx-remote.jar && Download_src
 
 id -u $run_user >/dev/null 2>&1
 [ $? -ne 0 ] && useradd -M -s /bin/bash $run_user || { [ -z "`grep ^$run_user /etc/passwd | grep '/bin/bash'`" ] && usermod -s /bin/bash $run_user; }

include/tomcat-8.sh

@@ -13,9 +13,8 @@ Install_tomcat-8()
 cd $oneinstack_dir/src
 . /etc/profile
 
-[ "$IPADDR_STATE"x == "CN"x ] && DOWN_ADDR=http://mirrors.aliyun.com/apache || DOWN_ADDR=http://www.apache.org/dist
-src_url=$DOWN_ADDR/tomcat/tomcat-8/v$tomcat_8_version/bin/apache-tomcat-$tomcat_8_version.tar.gz && Download_src
-src_url=$DOWN_ADDR/tomcat/tomcat-8/v$tomcat_8_version/bin/extras/catalina-jmx-remote.jar && Download_src
+src_url=http://mirrors.linuxeye.com/apache/tomcat/v$tomcat_8_version/apache-tomcat-$tomcat_8_version.tar.gz && Download_src
+src_url=http://mirrors.linuxeye.com/apache/tomcat/v$tomcat_8_version/catalina-jmx-remote.jar && Download_src
 
 id -u $run_user >/dev/null 2>&1
 [ $? -ne 0 ] && useradd -M -s /bin/bash $run_user || { [ -z "`grep ^$run_user /etc/passwd | grep '/bin/bash'`" ] && usermod -s /bin/bash $run_user; }

init.d/Shadowsocks-init

@@ -0,0 +1,90 @@
+#!/bin/bash
+# Author:  yeho <lj2007331 AT gmail.com>
+# BLOG:  https://blog.linuxeye.com
+#
+# chkconfig: - 90 10
+# description: Shadowsocks start/stop/status/restart script
+
+Shadowsocks_bin=/usr/bin/ssserver
+Shadowsocks_conf=/etc/shadowsocks.json
+
+#Shadowsocks_USAGE is the message if this script is called without any options
+Shadowsocks_USAGE="Usage: $0 {\e[00;32mstart\e[00m|\e[00;31mstop\e[00m|\e[00;32mstatus\e[00m|\e[00;31mrestart\e[00m}"
+
+#SHUTDOWN_WAIT is wait time in seconds for shadowsocks proccess to stop
+SHUTDOWN_WAIT=20
+
+Shadowsocks_pid(){
+	echo `ps -ef | grep $Shadowsocks_bin | grep -v grep | tr -s " "|cut -d" " -f2`
+}
+
+start() {
+  pid=$(Shadowsocks_pid)
+  if [ -n "$pid" ];then
+    echo -e "\e[00;31mShadowsocks is already running (pid: $pid)\e[00m"
+  else
+    $Shadowsocks_bin -c $Shadowsocks_conf -d start
+    RETVAL=$?
+    if [ "$RETVAL" = "0" ]; then
+    	echo -e "\e[00;32mStarting Shadowsocks\e[00m"
+    else
+    	echo -e "\e[00;32mShadowsocks start Failed\e[00m"
+    fi
+    status
+  fi
+  return 0
+}
+
+status(){
+  pid=$(Shadowsocks_pid)
+  if [ -n "$pid" ];then
+    echo -e "\e[00;32mShadowsocks is running with pid: $pid\e[00m"
+  else
+    echo -e "\e[00;31mShadowsocks is not running\e[00m"
+  fi
+}
+
+stop(){
+  pid=$(Shadowsocks_pid)
+  if [ -n "$pid" ];then
+    echo -e "\e[00;31mStoping Shadowsocks\e[00m"
+    $Shadowsocks_bin -c $Shadowsocks_conf -d stop
+    let kwait=$SHUTDOWN_WAIT
+    count=0;
+    until [ `ps -p $pid | grep -c $pid` = '0' ] || [ $count -gt $kwait ]
+    do
+      echo -n -e "\e[00;31mwaiting for processes to exit\e[00m\n";
+      sleep 1
+      let count=$count+1;
+    done
+
+    if [ $count -gt $kwait ];then
+      echo -n -e "\n\e[00;31mkilling processes which didn't stop after $SHUTDOWN_WAIT seconds\e[00m"
+      kill -9 $pid
+    fi
+  else
+    echo -e "\e[00;31mShadowsocks is not running\e[00m"
+  fi
+
+  return 0
+}
+
+case $1 in
+	start)
+          start
+        ;;
+        stop)  
+          stop
+        ;;
+        restart)
+          stop
+          start
+        ;;
+        status)
+	  status
+        ;;
+        *)
+	  echo -e $Shadowsocks_USAGE
+        ;;
+esac    
+exit 0

shadowsocks.sh

@@ -47,7 +47,6 @@ elif [ $OS == 'Debian' -o $OS == 'Ubuntu' ];then
 fi
 
 src_url=http://mirrors.linuxeye.com/oneinstack/src/ez_setup.py && Download_src
-src_url=http://mirrors.linuxeye.com/lnmp/init/Shadowsocks-init && Download_src
 
 which pip > /dev/null 2>&1
 if [ $? -ne 0 ]; then
@@ -62,7 +61,7 @@ if [ -f /usr/bin/pip ]; then
     pip install gevent
     pip install shadowsocks
     if [ -f /usr/bin/ssserver -o -f /usr/local/bin/ssserver ]; then
-        /bin/cp Shadowsocks-init /etc/init.d/shadowsocks
+        /bin/cp ../init.d/Shadowsocks-init /etc/init.d/shadowsocks
         chmod +x /etc/init.d/shadowsocks
         OS_CentOS='chkconfig --add shadowsocks \n
 chkconfig shadowsocks on'

vhost.sh

@@ -127,7 +127,7 @@ fi
 if [ "$NGX_FLAG" == 'php' ];then
     NGX_CONF=$(echo -e "location ~ .*\.(php|php5)?$ {\n    #fastcgi_pass remote_php_ip:9000;\n    fastcgi_pass unix:/dev/shm/php-cgi.sock;\n    fastcgi_index index.php;\n    include fastcgi.conf;\n    }")
 elif [ "$NGX_FLAG" == 'java' ];then
-    NGX_CONF=$(echo -e "location ~ {\n    proxy_set_header Host \$host;\n    proxy_set_header X-Real-IP \$remote_addr;\n    proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;\n    proxy_pass http://127.0.0.1:8080;\n    }")
+    NGX_CONF=$(echo -e "location ~ {\n    proxy_pass http://127.0.0.1:8080;\n    include proxy.conf;\n    }")
 elif [ "$NGX_FLAG" == 'hhvm' ];then
     NGX_CONF=$(echo -e "location ~ .*\.(php|php5)?$ {\n    fastcgi_pass unix:/var/log/hhvm/sock;\n    fastcgi_index index.php;\n    fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name;\n    include fastcgi_params;\n    }")
 fi
@@ -459,11 +459,12 @@ location / {
     try_files \$uri @apache;
     }
 location @apache {
-    internal;
-    proxy_pass http://127.0.0.1:9090;
+    proxy_pass http://127.0.0.1:88;
+    include proxy.conf;
     }
 location ~ .*\.(php|php5)?$ {
-    proxy_pass http://127.0.0.1:9090;
+    proxy_pass http://127.0.0.1:88;
+    include proxy.conf;
     }
 location ~ .*\.(gif|jpg|jpeg|png|bmp|swf|flv|ico)$ {
     expires 30d;
@@ -490,7 +491,7 @@ fi
 [ "`$apache_install_dir/bin/apachectl -v | awk -F'.' /version/'{print $2}'`" == '4' ] && R_TMP='Require all granted' || R_TMP=
 [ ! -d $apache_install_dir/conf/vhost ] && mkdir $apache_install_dir/conf/vhost
 cat > $apache_install_dir/conf/vhost/$domain.conf << EOF
-<VirtualHost *:9090>
+<VirtualHost *:88>
     ServerAdmin admin@linuxeye.com
     DocumentRoot "$vhostdir"
     ServerName $domain