XMerge branch 'master' of https://github.com/litespeedtech/ols-docker-env

bin/cert.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+docker-compose exec litespeed su -c "certbot certonly --agree-tos --register-unsafely-without-email --webroot -w /var/www/vhosts/${1}/html -d ${1} -d www.${1}"
+echo OLS needs to be restarted to detect the certificates

lsws/conf/httpd_config.conf

@@ -235,6 +235,7 @@ listener HTTPS {
 vhTemplate centralConfigLog {
   templateFile            conf/templates/ccl.conf
   listeners               Default, HTTP, HTTPS
+
   member localhost {
     vhDomain              localhost
   }

lsws/conf/httpd_config.conf.bak

@@ -225,19 +225,19 @@ listener HTTP {
   secure                  0
 }
 
+listener HTTPS {
+  address                 *:443
+  secure                  1
+  keyFile                 /usr/local/lsws/admin/conf/webadmin.key
+  certFile                /usr/local/lsws/admin/conf/webadmin.crt
+}
+
 vhTemplate centralConfigLog {
   templateFile            conf/templates/ccl.conf
-  listeners               Default, HTTP
+  listeners               Default, HTTP, HTTPS
-  note                    test test
+  member larshagen.net {
-
+    vhDomain              larshagen.net
-  member example2.com {
-    vhDomain              example2.com
   }
-
-  member example6.com {
-    vhDomain              example6.com
-  }
-
   member localhost {
     vhDomain              localhost
   }

lsws/conf/httpd_config.conf0

@@ -225,25 +225,19 @@ listener HTTP {
   secure                  0
 }
 
+listener HTTPS {
+  address                 *:443
+  secure                  1
+  keyFile                 /usr/local/lsws/admin/conf/webadmin.key
+  certFile                /usr/local/lsws/admin/conf/webadmin.crt
+}
+
 vhTemplate centralConfigLog {
   templateFile            conf/templates/ccl.conf
-  listeners               Default, HTTP
+  listeners               Default, HTTP, HTTPS
-  member example4.com {
+  member larshagen.net {
-    vhDomain              example4.com
+    vhDomain              larshagen.net
   }
-  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
   }

lsws/conf/templates/ccl.conf

@@ -53,5 +53,10 @@ RewriteFile .htaccess
     enable                0
     logLevel              0
   }
+
+  vhssl  {
+    keyFile               /etc/letsencrypt/live/$VH_NAME/privkey.pem
+    certFile              /etc/letsencrypt/live/$VH_NAME/fullchain.pem
+  }
 }
 

lsws/conf/templates/ccl.conf.bak

@@ -3,7 +3,7 @@ configFile                $SERVER_ROOT/conf/vhosts/$VH_NAME/vhconf.conf
 allowSymbolLink           1
 enableScript              1
 restrained                1
-setUIDMode                0
+setUIDMode                2
 
 virtualHostConfig  {
   docRoot                 $VH_ROOT/html/

lsws/conf/templates/ccl.conf0

@@ -3,7 +3,7 @@ configFile                $SERVER_ROOT/conf/vhosts/$VH_NAME/vhconf.conf
 allowSymbolLink           1
 enableScript              1
 restrained                1
-setUIDMode                0
+setUIDMode                2
 
 virtualHostConfig  {
   docRoot                 $VH_ROOT/html/
@@ -53,5 +53,10 @@ RewriteFile .htaccess
     enable                0
     logLevel              0
   }
+
+  vhssl  {
+    keyFile               /etc/letsencrypt/live/$VH_NAME/privkey.pem
+    certFile              /etc/letsencrypt/live/$VH_NAME/fullchain.pem
+  }
 }