diff --git a/SOURCES/fix-tarball-for-local-build.patch b/SOURCES/fix-tarball-for-local-build.patch index 56c97df..01a900a 100644 --- a/SOURCES/fix-tarball-for-local-build.patch +++ b/SOURCES/fix-tarball-for-local-build.patch @@ -19,7 +19,7 @@ index ee0f595..e2372e8 100755 echo "${MIN_VER}" > "${SHARED_API_MIN_VER_FILE}" } diff --git a/build.sh b/build.sh -index 949dda5..29f77be 100755 +index 949dda5..398f906 100755 --- a/build.sh +++ b/build.sh @@ -50,21 +50,21 @@ else @@ -87,38 +87,26 @@ index 949dda5..29f77be 100755 prepareLinux() { OSTYPE=unknownlinux -@@ -486,25 +465,13 @@ updateSrcCMakelistfile() - - cpModuleSoFiles() - { -- if [ ! -d dist/modules/ ] ; then -- mkdir dist/modules/ -- fi -- +@@ -490,14 +469,14 @@ cpModuleSoFiles() + mkdir dist/modules/ + fi + - for module in build/src/modules/*; do - cp -f ${module}/*.so dist/modules/ - done -- -- if [ -e build/src/modules/modsecurity-ls/mod_security.so ] ; then -- cp -f build/src/modules/modsecurity-ls/mod_security.so dist/modules/ -- fi -+ mkdir dist/modules/ -+ cp -f build/src/modules/modsecurity-ls/mod_security.so dist/modules/ - -- if [ -e build/src/modules/lua/mod_lua.so ] ; then -- cp -f build/src/modules/lua/mod_lua.so dist/modules/ -- fi -+ cp -f build/src/modules/lua/mod_lua.so dist/modules/ -+ -+ cp -f build/src/modules/pagespeed/modpagespeed.so dist/modules/ - -- if [ -e build/src/modules/pagespeed/modpagespeed.so ] ; then -- cp -f build/src/modules/pagespeed/modpagespeed.so dist/modules/ -- fi - } - - -@@ -514,9 +481,6 @@ fixshmdir() ++ #for module in build/src/modules/*; do ++ # cp -f ${module}/*.so dist/modules/ ++ #done + + if [ -e build/src/modules/modsecurity-ls/mod_security.so ] ; then + cp -f build/src/modules/modsecurity-ls/mod_security.so dist/modules/ + fi +- ++ + if [ -e build/src/modules/lua/mod_lua.so ] ; then + cp -f build/src/modules/lua/mod_lua.so dist/modules/ + fi +@@ -514,9 +493,6 @@ fixshmdir() mkdir /tmp/shm chmod 777 /tmp/shm sed -i -e "s/\/dev\/shm/\/tmp\/shm/g" dist/conf/httpd_config.conf.in @@ -128,7 +116,7 @@ index 949dda5..29f77be 100755 fi } -@@ -574,7 +538,7 @@ if [ "${OS}" = "FreeBSD" ] ; then +@@ -574,7 +550,7 @@ if [ "${OS}" = "FreeBSD" ] ; then prepareBsd elif [ "${OS}" = "Linux" ] ; then ISLINUX=yes @@ -137,7 +125,7 @@ index 949dda5..29f77be 100755 elif [ "${OS}" = "Darwin" ] ; then prepareMac fi -@@ -582,32 +546,26 @@ fi +@@ -582,32 +558,26 @@ fi cd .. @@ -184,7 +172,7 @@ index 949dda5..29f77be 100755 if [ "$MOD_PAGESPEED" = "ON" ]; then -@@ -625,7 +583,7 @@ fi +@@ -625,7 +595,7 @@ fi cd src/modules/lsrecaptcha export GOPATH=$CUR_PATH/src/modules/lsrecaptcha export GO111MODULE=off @@ -193,7 +181,7 @@ index 949dda5..29f77be 100755 cp lsrecaptcha ../../../dist/lsrecaptcha/_recaptcha cd ../../../ -@@ -660,9 +618,9 @@ jobs=$(nproc) +@@ -660,9 +630,9 @@ jobs=$(nproc) make -j${jobs} cd .. @@ -205,7 +193,7 @@ index 949dda5..29f77be 100755 fi cpModuleSoFiles -@@ -672,11 +630,11 @@ if [ -e src/liblsquic ] ; then +@@ -672,11 +642,11 @@ if [ -e src/liblsquic ] ; then freebsdFix fi @@ -219,7 +207,10 @@ index 949dda5..29f77be 100755 OPENLSWS_USER=nobody OPENLSWS_GROUP=nobody OPENLSWS_ADMIN=admin -@@ -700,7 +658,7 @@ mv dist/install.sh dist/_in.sh +@@ -697,10 +667,10 @@ END + echo Start to pack files. + mv dist/install.sh dist/_in.sh + -cat > ./install.sh < ./dist/install.sh </dev/null 2>&1 -@@ -796,7 +753,7 @@ fi +@@ -796,7 +765,7 @@ fi END @@ -255,8 +246,28 @@ index 949dda5..29f77be 100755 echo -e "\033[38;5;71mBuilding finished, please run ./install.sh for installation.\033[39m" echo -e "\033[38;5;71mYou may want to update the ols.conf to change the settings before installation.\033[39m" +diff --git a/dist/admin/misc/lscmctl b/dist/admin/misc/lscmctl +index ee0f595..e2372e8 100755 +--- a/dist/admin/misc/lscmctl ++++ b/dist/admin/misc/lscmctl +@@ -92,14 +92,7 @@ printHelp() + + updateMinAPIVerFile() + { +- MIN_VER=$(wget -q https://www.litespeed.sh/sub/shared/MIN_VER -O -) +- RET=$? +- +- if [ "${RET}" = "127" ] ; then +- errorExit "Required command 'wget' not found with exit code 127." +- elif [ "$RET" != "0" ] ; then +- errorExit "Failed to download latest MIN_VER file with wget exit status ${RET}." +- fi ++ MIN_VER=1.17.1.1 + + echo "${MIN_VER}" > "${SHARED_API_MIN_VER_FILE}" + } diff --git a/dist/functions.sh b/dist/functions.sh -index fb7a33c..52fb032 100755 +index fb7a33c..9ef9038 100755 --- a/dist/functions.sh +++ b/dist/functions.sh @@ -398,11 +398,11 @@ EOF @@ -402,7 +413,9 @@ index fb7a33c..52fb032 100755 else SDIR_OWN=$DIR_OWN LOGDIR_OWN=$DIR_OWN -@@ -993,10 +993,10 @@ installation() +@@ -991,12 +991,12 @@ installation() + util_mkdir "$CONF_OWN" $SDIR_MOD conf conf/cert conf/templates conf/vhosts conf/vhosts/Example admin/conf admin/tmp phpbuild + util_mkdir "$SDIR_OWN" $SDIR_MOD cgid admin/cgid admin/cgid/secret util_mkdir "$DIR_OWN" $SDIR_MOD tmp/ocspcache - chgrp $WS_GROUP $LSWS_HOME/admin/tmp $LSWS_HOME/admin/cgid $LSWS_HOME/cgid + #chgrp $WS_GROUP $LSWS_HOME/admin/tmp $LSWS_HOME/admin/cgid $LSWS_HOME/cgid