fixed addDomain.sh, auto correct folder permissions, included localhost

.env

@@ -8,7 +8,7 @@ MYSQL_USER=wordpress
 MYSQL_PASSWORD=password
 
 #wordpress
-DOMAIN=127.0.0.1
+DOMAIN=localhost
 ADMIN_USERNAME=admin
 ADMIN_PASSWORD=password
 ADMIN_EMAIL=test@test.com

bin/container/addDomainCtl.sh

@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
-perl -0777 -p -i.bak -e "s/(vhTemplate centralConfigLog \{[^}]+)\}*(^$)/\1
-  member $1 {
-    vhDomain              $1
-  }/gmi" httpd_config.conf  
+
+perl -0777 -p -i -e 's/(vhTemplate centralConfigLog \{[^}]+)\}*(^.*listeners.*$)/\1$2
+  member '$1' {
+    vhDomain              '$1'
+  }/gmi' httpd_config.conf
+
+#perl -0777 -p -i.bak -e "s/(vhTemplate centralConfigLog \{[^}]+)\}*(^$)/\1
+#  member $1 {
+#    vhDomain              $1
+#  }/gmi" httpd_config.conf  

bin/container/addDomainCtl.sh.bak

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+perl -0777 -p -i.bak -e "s/(vhTemplate centralConfigLog \{[^}]+)\}*(^$)/\1
+  member $1 {
+    vhDomain              $1
+  }/gmi" httpd_config.conf  

conf/httpd_config.conf

@@ -228,21 +228,8 @@ listener HTTP {
 vhTemplate centralConfigLog {
   templateFile            conf/templates/ccl.conf
   listeners               Default, HTTP
-
-  member example6.com {
-    vhDomain              example6.com
-  }
-
-  member example5.com {
-    vhDomain              example5.com
-  }
-
-  member example2.com {
-    vhDomain              example2.com
-  }
-
-  member example3.com {
-    vhDomain              example3.com
+  member localhost {
+    vhDomain              localhost
   }
 }
 

conf/httpd_config.conf.bak

@@ -228,15 +228,18 @@ listener HTTP {
 vhTemplate centralConfigLog {
   templateFile            conf/templates/ccl.conf
   listeners               Default, HTTP
+  note                    test test
+
+  member example2.com {
+    vhDomain              example2.com
+  }
 
   member example6.com {
     vhDomain              example6.com
   }
-  member example5.com {
-    vhDomain              example5.com
-  }
-  member example2.com {
-    vhDomain              example2.com
+
+  member localhost {
+    vhDomain              localhost
   }
 }
 

conf/httpd_config.conf0

@@ -228,16 +228,25 @@ listener HTTP {
 vhTemplate centralConfigLog {
   templateFile            conf/templates/ccl.conf
   listeners               Default, HTTP
-
-  member example6.com {
-    vhDomain              example6.com
+  member example4.com {
+    vhDomain              example4.com
   }
-  member example5.com {
-    vhDomain              example5.com
+  member example3.com {
+    vhDomain              example3.com
   }
+  note                    test test
+
   member example2.com {
     vhDomain              example2.com
   }
+
+  member example6.com {
+    vhDomain              example6.com
+  }
+
+  member localhost {
+    vhDomain              localhost
+  }
 }
 
 vhTemplate EasyRailsWithSuEXEC {

config/litespeed/1.6.4.lh/Dockerfile

@@ -14,7 +14,7 @@ RUN apt-get install mysql-client lsphp73 lsphp73-mysql lsphp73-opcache lsphp73-c
 EXPOSE 7080
 
 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 && \
+	chmod +x wp-cli.phar && mv wp-cli.phar /usr/bin/wp && \
 	ln -s /usr/local/lsws/lsphp73/bin/php7.3 /usr/bin/php
 
 

config/litespeed/1.6.4.lh/entrypoint.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+chown 999:999 /usr/local/lsws/conf -R
 cd /var/www/vhosts/localhost/html
 if [ ! -f "./wp-config.php" ]; then
 	# su -s /bin/bash www-data -c
@@ -37,14 +38,18 @@ if [ ! -f "./wp-config.php" ]; then
 	wp plugin install litespeed-cache \
 	    --activate \
 	    --allow-root
+	first_www_uid=$(stat -c "%u" /var/www/vhosts/localhost)
+	first_www_gid=$(stat -c "%g" /var/www/vhosts/localhost)
+	chown $first_www_uid:$first_www_gid /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
+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:1000 /var/www/vhosts/localhost -R
+fi
 
 echo "WordPress installation finished."
 exec "$@"

sites/localhost/html/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

sites/localhost/logs/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore