Added cert bin, changed default ssl location for template

5 years ago · 8c66613e32
parent 35b7825969
commit 8c66613e32
7 changed files with 36 additions and 28 deletions
--- a/bin/cert.sh
+++ b/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
--- a/lsws/conf/httpd_config.conf
+++ b/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
  }
--- a/lsws/conf/httpd_config.conf.bak
+++ b/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
-  note                    test test
-
-  member example2.com {
-    vhDomain              example2.com
+  listeners               Default, HTTP, HTTPS
+  member larshagen.net {
+    vhDomain              larshagen.net
  }
-
-  member example6.com {
-    vhDomain              example6.com
-  }
-
  member localhost {
    vhDomain              localhost
  }
--- a/lsws/conf/httpd_config.conf0
+++ b/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
-  member example4.com {
-    vhDomain              example4.com
-  }
-  member example3.com {
-    vhDomain              example3.com
-  }
-  note                    test test
-
-  member example2.com {
-    vhDomain              example2.com
-  }
-
-  member example6.com {
-    vhDomain              example6.com
+  listeners               Default, HTTP, HTTPS
+  member larshagen.net {
+    vhDomain              larshagen.net
  }
-
  member localhost {
    vhDomain              localhost
  }
--- a/lsws/conf/templates/ccl.conf
+++ b/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
+  }
 }

--- a/lsws/conf/templates/ccl.conf.bak
+++ b/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/
--- a/lsws/conf/templates/ccl.conf0
+++ b/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
+  }
 }