Pooria
/
ols-docker-env
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
master
lars-hagen 5 years ago
parent fbdd2421e6 8c66613e32
commit 670810a022
7 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File

3
bin/cert.sh
Unescape View File

@ -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

1
lsws/conf/httpd_config.conf
Unescape View File

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

20
lsws/conf/httpd_config.conf.bak
Unescape View File

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

26
lsws/conf/httpd_config.conf0
Unescape View File

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

5
lsws/conf/templates/ccl.conf
Unescape View File

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

2
lsws/conf/templates/ccl.conf.bak
Unescape View File

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

7
lsws/conf/templates/ccl.conf0
Unescape View File

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

Write Preview
Loading…
Cancel
Save