Check in 1.8.3

Author: gwanglst

CMakeLists.txt

@@ -1,16 +1,10 @@
 cmake_minimum_required(VERSION 3.0)
 set( CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-Project(openlitespeed)
+Project(openlitespeed VERSION 1.8.3)
 INCLUDE( ${PROJECT_SOURCE_DIR}/CMakeModules/common.cmake)
 INCLUDE(GNUInstallDirs)
 
-set(openlitespeed_MAJOR_VERSION 1)
-set(openlitespeed_MINOR_VERSION 8)
-set(openlitespeed_PATCH_VERSION 2)
-set(openlitespeed_VERSION
-    ${openlitespeed_MAJOR_VERSION}.${openlitespeed_MINOR_VERSION}.${openlitespeed_PATCH_VERSION})
-
 SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_SKIP_BUILD_RPATH TRUE)
 

LSQUICCOMMIT

@@ -1 +1 @@
-d3582f34f0b8dcdb64b3d6b0a25d351bc96f8cdf
+7686d8fcef284cda07a951ad74a5e90c69a9dfb1

build.sh

@@ -662,9 +662,14 @@ cd ..
 
 cp build/src/openlitespeed  dist/bin/
 if [ -e build/support/unmount_ns/unmount_ns ] ; then
-    cp build/support/unmount_ns/unmount_ns  dist/bin/
+    cp build/support/unmount_ns/unmount_ns  dist/lsns/bin/
 fi
 
+if [ -e build/support/cmd_ns/cmd_ns ] ; then
+    cp build/support/cmd_ns/cmd_ns  dist/lsns/bin/
+fi
+
+
 cpModuleSoFiles
 
 #Version >= 1.6.0 which has QUIC need to fix for freebsd

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
- Generated by GNU Autoconf 2.69 for openlitespeed 1.8.2.
+ Generated by GNU Autoconf 2.69 for openlitespeed 1.8.3.
 #
 # Report bugs to <[email protected]>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='openlitespeed'
 PACKAGE_TARNAME='openlitespeed'
-PACKAGE_VERSION='1.8.2'
-PACKAGE_STRING='openlitespeed 1.8.2'
+PACKAGE_VERSION='1.8.3'
+PACKAGE_STRING='openlitespeed 1.8.3'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL='http://www.litespeedtech.com/'
 
@@ -1409,7 +1409,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures openlitespeed 1.8.2 to adapt to many kinds of systems.
+\`configure' configures openlitespeed 1.8.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1480,7 +1480,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of openlitespeed 1.8.2:";;
+     short | recursive ) echo "Configuration of openlitespeed 1.8.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1641,7 +1641,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-openlitespeed configure 1.8.2
+openlitespeed configure 1.8.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2315,7 +2315,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by openlitespeed $as_me 1.8.2, which was
+It was created by openlitespeed $as_me 1.8.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3181,7 +3181,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='openlitespeed'
- VERSION='1.8.2'
+ VERSION='1.8.3'
 
 
 # Some tools Automake needs.
@@ -19637,7 +19637,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by openlitespeed $as_me 1.8.2, which was
+This file was extended by openlitespeed $as_me 1.8.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19704,7 +19704,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-openlitespeed config.status 1.8.2
+openlitespeed config.status 1.8.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -7,7 +7,7 @@ m4_include(ax_check_libudns.m4)
 m4_include(ax_check_ip2location.m4)
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([openlitespeed],[1.8.2],[[email protected]],[openlitespeed],[http://www.litespeedtech.com/])
+AC_INIT([openlitespeed],[1.8.3],[[email protected]],[openlitespeed],[http://www.litespeedtech.com/])
 AM_INIT_AUTOMAKE([1.0 foreign no-define subdir-objects])
 
 AC_CONFIG_HEADERS(src/config.h:src/config.h.in)

dist/VERSION

@@ -1 +1 @@
-1.8.2
+1.8.3

dist/admin/misc/admpass.sh

@@ -55,7 +55,7 @@ done
 
 # generate password file
 
-ENCRYPT_PASS=`$CUR_DIR/../fcgi-bin/admin_php -q $CUR_DIR/htpasswd.php $PASS_ONE`
+ENCRYPT_PASS=`$CUR_DIR/../fcgi-bin/admin_php -q $CUR_DIR/htpasswd.php "$PASS_ONE"`
 echo "$ADMIN_USER:$ENCRYPT_PASS" > $CUR_DIR/../conf/htpasswd 
 if [ $? -eq 0 ]; then
 	echo "Administrator's username/password is updated successfully!"

dist/conf/mime.properties

@@ -46,7 +46,7 @@ java    = text/plain
 jar     = application/java-archive
 jnlp    = application/x-java-jnlp-file
 jpeg, jpe, jpg    = image/jpeg
-js      = text/javascript
+mjs, js = text/javascript
 js2     = application/javascript
 js3     = application/x-javascript
 json    = application/json

dist/functions.sh

@@ -1018,6 +1018,7 @@ installation()
 
     util_ccpfile "$SDIR_OWN" $EXEC_MOD fcgi-bin/lsperld.fpl fcgi-bin/RackRunner.rb fcgi-bin/lsnode.js
     util_cpfile "$SDIR_OWN" $EXEC_MOD  fcgi-bin/RailsRunner.rb  fcgi-bin/RailsRunner.rb.2.3
+    util_cpfile "$SDIR_OWN" $EXEC_MOD lsns/bin/common.py lsns/bin/lscgctl lsns/bin/lscgstats lsns/bin/lspkgctl lsns/bin/lsnsctl lsns/bin/unmount_ns lsns/bin/cmd_ns lsns/bin/lssetup
 
     pkill _recaptcha
     util_cpfile "$SDIR_OWN" $EXEC_MOD  lsrecaptcha/_recaptcha lsrecaptcha/_recaptcha.shtml

dist/lsns/bin/common.py

@@ -2,7 +2,9 @@
 from stat import *
 from subprocess import PIPE
 
-VERSION='0.0.1'
+VERSION='0.0.3' 
+# 0.0.2: Updated for package commands
+# 0.0.3: Updated for limited CloudLinux support
 
 OPTION_CPU=0
 OPTION_IO=1
@@ -14,6 +16,7 @@
 this.logged = None
 this.serverRoot = '/usr/local/lsws'
 this.min_uid = 0
+this.cl = False
 
 def init_logging():
     logging.basicConfig(format="%(asctime)s.%(msecs)03d" + " [%(levelname)s] %(message)s",
@@ -129,10 +132,22 @@ def pkg_to_filename(pkg):
         os.mkdir(get_pkg_dir(), mode=0o700)
     return get_pkg_dir() + '/%s.conf' % pkg
 
+def get_package_size_file():
+    return server_root() + '/lsns/conf/redis_package_size.conf'
+
 def ls_ok():
-    if os.access(container_file(), 0) == 0:
+    if not os.access(container_file(), os.F_OK):
         fatal_error("You must configure LiteSpeed for LiteSpeed Containers")
 
+def ls_cl_ok():
+    if os.access('/etc/cloudlinux-release', os.F_OK):
+        this.cl = True
+        return
+    ls_ok()
+
+def is_cl():
+    return this.cl
+
 def touch_restart_external(file, desc):
     logging.debug("restart_external %s by touch: %s" % (desc, file))
     result = subprocess.run(['touch', file], stdout=PIPE, stderr=PIPE)