diff --git a/.travis.yml b/.travis.yml index c1bdf66..a2b013a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ install: before_script: - docker image ls - - sleep 15 + - sleep 20 script: - curl -Ik http://localhost:80/ diff --git a/bin/container/downloadctl.sh b/bin/container/downloadctl.sh index 0fb9dee..5ee6251 100755 --- a/bin/container/downloadctl.sh +++ b/bin/container/downloadctl.sh @@ -38,7 +38,7 @@ get_owner(){ } get_db_pass(){ - if [ ${VH_DOC_ROOT}/.db_pass ]; then + if [ -f ${DEFAULT_VH_ROOT}/${1}/.db_pass ]; then SQL_DB=$(grep -i Database ${VH_DOC_ROOT}/.db_pass | awk -F ':' '{print $2}' | tr -d '"') SQL_USER=$(grep -i Username ${VH_DOC_ROOT}/.db_pass | awk -F ':' '{print $2}' | tr -d '"') SQL_PASS=$(grep -i Password ${VH_DOC_ROOT}/.db_pass | awk -F ':' '{print $2}' | tr -d '"') @@ -74,7 +74,7 @@ check_sql_native(){ } preinstall_wordpress(){ - get_db_pass + get_db_pass ${DOMAIN} if [ ! -f ${VH_DOC_ROOT}/wp-config.php ] && [ -f ${VH_DOC_ROOT}/wp-config-sample.php ]; then cp ${VH_DOC_ROOT}/wp-config-sample.php ${VH_DOC_ROOT}/wp-config.php NEWDBPWD="define('DB_PASSWORD', '${SQL_PASS}');" diff --git a/config/litespeed/1.6.4.lh/Dockerfile b/config/litespeed/1.6.4.lh/Dockerfile index 11424f0..7f99591 100644 --- a/config/litespeed/1.6.4.lh/Dockerfile +++ b/config/litespeed/1.6.4.lh/Dockerfile @@ -6,7 +6,8 @@ RUN apt-get update && apt-get install wget curl -y RUN wget https://openlitespeed.org/preuse/openlitespeed-1.6.4.tgz && \ tar xzvf openlitespeed-1.6.4.tgz && cd openlitespeed && ./install.sh && rm -rf /openlitespeed -RUN apt-get install mysql-client lsphp73 lsphp73-mysql lsphp73-opcache lsphp73-curl lsphp73-json -y +RUN apt-get install mysql-client lsphp73 lsphp73-common lsphp73-mbstring lsphp73-mysql lsphp73-opcache \ + lsphp73-curl lsphp73-json lsphp73-imagick lsphp73-redis lsphp73-memcached -y #RUN echo "admin:$(/usr/local/lsws/admin/fcgi-bin/admin_php* -q /usr/local/lsws/admin/misc/htpasswd.php ${WEB_ADMIN_PASSWORD})" \ # > /usr/local/lsws/admin/conf/htpasswd diff --git a/config/litespeed/1.6.4.lh/conf/httpd_config.conf b/config/litespeed/1.6.4.lh/conf/httpd_config.conf index 18bf7b5..8c16df5 100644 --- a/config/litespeed/1.6.4.lh/conf/httpd_config.conf +++ b/config/litespeed/1.6.4.lh/conf/httpd_config.conf @@ -223,8 +223,18 @@ listener Default { listener HTTP { address *:80 secure 0 + map Example * } +listener HTTPS { + address *:443 + secure 1 + keyFile /usr/local/lsws/admin/conf/webadmin.key + certFile /usr/local/lsws/admin/conf/webadmin.crt + map Example * +} + + vhTemplate centralConfigLog { templateFile conf/templates/ccl.conf listeners Default diff --git a/config/litespeed/1.6.4/Dockerfile b/config/litespeed/1.6.4/Dockerfile index 61da101..8c4389b 100644 --- a/config/litespeed/1.6.4/Dockerfile +++ b/config/litespeed/1.6.4/Dockerfile @@ -10,7 +10,8 @@ RUN apt-get install -y software-properties-common && \ add-apt-repository 'deb http://ftp.debian.org/debian jessie-backports main' && \ apt-get update && apt-get install -y python-certbot-apache -t jessie-backports -RUN apt-get install mysql-client lsphp73 lsphp73-mysql lsphp73-opcache lsphp73-curl lsphp73-json -y +RUN apt-get install mysql-client lsphp73 lsphp73-common lsphp73-mbstring lsphp73-mysql lsphp73-opcache \ + lsphp73-curl lsphp73-json lsphp73-imagick lsphp73-redis lsphp73-memcached -y RUN echo "admin:$(/usr/local/lsws/admin/fcgi-bin/admin_php* -q /usr/local/lsws/admin/misc/htpasswd.php ${WEB_ADMIN_PASSWORD})" \ > /usr/local/lsws/admin/conf/htpasswd