From 8671e23eac4e88fd5bd8d4ea2b4934cf9f28d445 Mon Sep 17 00:00:00 2001
From: Cold-Egg <eleu@litespeedtech.com>
Date: Wed, 18 Dec 2019 16:24:03 -0500
Subject: [PATCH] set env/doc root

---
 .env                                          |  4 ++-
 README.md                                     | 26 ++++++++++++++++---
 config/litespeed/1.5.10wp/Dockerfile          |  4 ++-
 .../litespeed/1.5.10wp/conf/httpd_config.conf |  1 +
 .../1.5.10wp/conf/vhosts/Example/vhconf.conf  |  2 +-
 config/litespeed/1.5.10wp/entrypoint.sh       | 10 +++----
 6 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/.env b/.env
index 0369225..0601cc4 100644
--- a/.env
+++ b/.env
@@ -1,12 +1,14 @@
 LITESPEED=1.5.10wp
 
+WEB_ADMIN=123456
+
 MYSQL_DATABASE=wordpress
 MYSQL_ROOT_PASSWORD=password
 MYSQL_USER=wordpress
 MYSQL_PASSWORD=password
 
 #wordpress
-DOMAIN=example.com
+DOMAIN=127.0.0.1
 ADMIN_USERNAME=admin
 ADMIN_PASSWORD=password
 ADMIN_EMAIL=test@test.com
diff --git a/README.md b/README.md
index 00bff80..307d4d3 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,23 @@
-# ols-docker-env
-OpenLiteSpeed Docker Environment
-##   
\ No newline at end of file
+# OpenLiteSpeed WordPress Docker Container
+Lightweight WordPress container with OpenLiteSpeed 1.5.10 & PHP 7.3 based on Ubuntu 18.04 Linux.
+WordPress version will install: Latest
+
+### Prerequisites
+1. [Install Docker](https://www.docker.com/)
+2. [Install Docker Compose](https://docs.docker.com/compose/)
+3. Clone this repository or copy the files from this repository into a new folder.
+```
+git clone https://github.com/litespeedtech/ols-docker-env.git
+```
+
+## Configuration
+Edit the `.env` file to change the WordPress Domain, user and password, default MySQL root and wordpress password .
+
+## Installation
+Open a terminal and `cd` to the folder in which `docker-compose.yml` is saved and run:
+```
+docker-compose up
+```
+
+The containers are now built and running. You should be able to access the WordPress installation with the configured domain in the browser address. By default it is http://127.0.0.1.
+
diff --git a/config/litespeed/1.5.10wp/Dockerfile b/config/litespeed/1.5.10wp/Dockerfile
index 7363740..c0e76d3 100644
--- a/config/litespeed/1.5.10wp/Dockerfile
+++ b/config/litespeed/1.5.10wp/Dockerfile
@@ -9,9 +9,11 @@ RUN apt-get update && apt-get install -y wget && \
     apt-get install -y curl mysql-client \
     lsphp73 lsphp73-mysql lsphp73-opcache lsphp73-curl
 
+RUN echo "admin:$(/usr/local/lsws/admin/fcgi-bin/admin_php* -q /usr/local/lsws/admin/misc/htpasswd.php ${WEB_ADMIN})" \
+    > /usr/local/lsws/admin/conf/htpasswd
+
 EXPOSE 7080
 
-# get wp-cli
 RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar && \
 	chmod +x wp-cli.phar && mv wp-cli.phar /usr/local/bin/wp && \
 	ln -s /usr/local/lsws/lsphp73/bin/php7.3 /usr/bin/php
diff --git a/config/litespeed/1.5.10wp/conf/httpd_config.conf b/config/litespeed/1.5.10wp/conf/httpd_config.conf
index 4fa045d..baf5049 100644
--- a/config/litespeed/1.5.10wp/conf/httpd_config.conf
+++ b/config/litespeed/1.5.10wp/conf/httpd_config.conf
@@ -31,6 +31,7 @@ expires  {
   enableExpires           1
   expiresByType           image/*=A604800,text/css=A604800,application/x-javascript=A604800,application/javascript=A604800,font/*=A604800,application/x-font-ttf=A604800
 }
+autoLoadHtaccess          1
 
 tuning  {
   eventDispatcher         best
diff --git a/config/litespeed/1.5.10wp/conf/vhosts/Example/vhconf.conf b/config/litespeed/1.5.10wp/conf/vhosts/Example/vhconf.conf
index c75aa3d..d2ab9e2 100644
--- a/config/litespeed/1.5.10wp/conf/vhosts/Example/vhconf.conf
+++ b/config/litespeed/1.5.10wp/conf/vhosts/Example/vhconf.conf
@@ -1,4 +1,4 @@
-docRoot                   $VH_ROOT/html/
+docRoot                   /var/www/vhosts/
 enableGzip                1
 
 errorlog $VH_ROOT/logs/error.log {
diff --git a/config/litespeed/1.5.10wp/entrypoint.sh b/config/litespeed/1.5.10wp/entrypoint.sh
index 3357e31..2341b35 100644
--- a/config/litespeed/1.5.10wp/entrypoint.sh
+++ b/config/litespeed/1.5.10wp/entrypoint.sh
@@ -21,11 +21,11 @@ if [ ! -f "./wp-config.php" ]; then
 fi
 
 
-www_uid=$(stat -c "%u" /var/www/vhosts/localhost)
-if [ ${www_uid} -eq 0 ]; then
-    #echo "./sites/localhost is owned by root, auto changing ownership of ./sites/localhost to uid 1000"
-	chown 1000 /var/www/vhosts/localhost -R
-fi
+#www_uid=$(stat -c "%u" /var/www/vhosts/localhost)
+#if [ ${www_uid} -eq 0 ]; then
+#    #echo "./sites/localhost is owned by root, auto changing ownership of ./sites/localhost to uid 1000"
+#	chown 1000 /var/www/vhosts/localhost -R
+#fi
 
 echo "WordPress installation finished."
 exec "$@"
\ No newline at end of file