Merge pull request #1 from teddysun/master

Merge updates from up source

Author: jazzi

README.md

@@ -30,11 +30,12 @@ Supported System
 
 Supported Software
 ==================
-- Apache-2.4 (Include HTTP2 module)
+- Apache-2.4 (Include HTTP/2 module: mod_http2)
+- Apache Additional Modules: mod_wsgi, mod_security, mod_jk
 - MySQL-5.5, MySQL-5.6, MySQL-5.7, MariaDB-5.5, MariaDB-10.0, MariaDB-10.1, MariaDB-10.2, Percona-Server-5.5, Percona-Server-5.6, Percona-Server-5.7
 - PHP-5.6, PHP-7.0, PHP-7.1, PHP-7.2
-- PHP Additional Modules: Opcache, ionCube Loader, XCache, Imagemagick, GraphicsMagick, Memcache, Memcached, Redis, Mongodb, Swoole, Xdebug
-- Other Software: Memcached, phpMyAdmin, Redis-Server
+- PHP Additional Modules: opcache, ioncube_loaders, xcache, imagick, gmagick, libsodium, memcached, redis, mongodb, swoole, xdebug
+- Other Software: ImageMagick, GraphicsMagick, Memcached, phpMyAdmin, Redis-Server
 
 Installation
 ============

conf/lamp

@@ -255,6 +255,8 @@ add_ssl_memu(){
             echo "Error: Please only enter 1 or 2"
         fi
     done
+
+    read -p "Do you want force redirection from HTTP to HTTPS automatically? [y/n]:" force_ssl
 }
 
 create_ssl_config(){
@@ -287,6 +289,16 @@ create_ssl_config(){
 EOF
 }
 
+create_ssl_htaccess(){
+    cat > ${website_root}/.htaccess << EOF
+<IfModule mod_rewrite.c>
+RewriteEngine On
+RewriteCond %{HTTPS} off
+RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [R,L]
+</IfModule>
+EOF
+}
+
 add_ssl(){
     if [ "${ssl_pick}" == "1" ]; then
         create_ssl_config
@@ -300,6 +312,13 @@ add_ssl(){
         fi
         add_letsencrypt
     fi
+    if [ "${force_ssl}" == "y" ] || [ "${force_ssl}" == "Y" ]; then
+        echo "You chosen force redirection from HTTP to HTTPS automatically"
+        create_ssl_htaccess
+        echo "and it's already done"
+    else
+        echo "Do not force redirection from HTTP to HTTPS automatically"
+    fi
 }
 
 add_letsencrypt(){

include/config.sh

@@ -35,7 +35,7 @@ parallel_compile=1
 
 ##Software version
 #nghttp2
-nghttp2_filename="nghttp2-1.30.0"
+nghttp2_filename="nghttp2-1.31.0"
 #openssl
 openssl_filename="openssl-1.0.2n"
 #apache2.4
@@ -76,10 +76,10 @@ apr_filename="apr-1.6.3"
 #apr-util
 apr_util_filename="apr-util-1.6.1"
 #mod_wsgi
-mod_wsgi_filename="mod_wsgi-4.5.24"
+mod_wsgi_filename="mod_wsgi-4.6.2"
 #mod_jk
-mod_jk_filename="tomcat-connectors-1.2.42-src"
-set_hint ${mod_jk_filename} "mod_jk-1.2.42"
+mod_jk_filename="tomcat-connectors-1.2.43-src"
+set_hint ${mod_jk_filename} "mod_jk-1.2.43"
 #mod_security
 mod_security_filename="modsecurity-2.9.2"
 set_hint ${mod_security_filename} "mod_security-2.9.2"
@@ -98,14 +98,14 @@ imap_filename='imap-2007f'
 #libiconv
 libiconv_filename="libiconv-1.15"
 #swoole
-swoole_filename="swoole-src-2.0.12"
-set_hint ${swoole_filename} "php-swoole-2.0.12"
+swoole_filename="swoole-src-2.1.1"
+set_hint ${swoole_filename} "php-swoole-2.1.1"
 #xcache
 xcache_filename="xcache-3.2.0"
 #xdebug
 xdebug_filename="xdebug-2.6.0"
 #ImageMagick
-ImageMagick_filename="ImageMagick-7.0.7-22"
+ImageMagick_filename="ImageMagick-7.0.7-26"
 php_imagemagick_filename="imagick-3.4.3"
 set_hint ${php_imagemagick_filename} "php-${php_imagemagick_filename}"
 #GraphicsMagick
@@ -121,7 +121,7 @@ ionCube64_filename="ioncube_loaders_lin_x86-64"
 #libevent
 libevent_filename="libevent-2.0.22-stable"
 #memcached
-memcached_filename="memcached-1.5.5"
+memcached_filename="memcached-1.5.6"
 #libmemcached
 libmemcached_filename="libmemcached-1.0.18"
 #php-memcached
@@ -133,11 +133,11 @@ set_hint ${php_memcached_filename2} "php-${php_memcached_filename2}"
 redis_filename="redis-3.2.11"
 #php-redis
 php_redis_filename="redis-2.2.8"
-php_redis_filename2="redis-3.1.5"
+php_redis_filename2="redis-3.1.6"
 set_hint ${php_redis_filename} "php-${php_redis_filename}"
 set_hint ${php_redis_filename2} "php-${php_redis_filename2}"
 #php-mongodb
-php_mongo_filename="mongodb-1.3.4"
+php_mongo_filename="mongodb-1.4.2"
 set_hint ${php_mongo_filename} "php-${php_mongo_filename}"
 #php-libsodium
 libsodium_filename="libsodium-1.0.16"