Auto-ssl Test
This commit is contained in:
parent
a81be287c4
commit
de9eef2574
|
@ -1,9 +1,13 @@
|
||||||
<VirtualHost *:80>
|
<VirtualHost *:80 *:443>
|
||||||
|
|
||||||
# FQDN principal
|
# FQDN principal
|
||||||
ServerName SERVERNAME
|
ServerName SERVERNAME
|
||||||
#ServerAlias SERVERNAME
|
#ServerAlias SERVERNAME
|
||||||
|
|
||||||
|
SSLEngine On
|
||||||
|
SSLCertificateFile /etc/letsencrypt/XXX-fullchain.pem
|
||||||
|
SSLCertificateKeyFile /etc/ssl/private/XXX.key
|
||||||
|
|
||||||
# Repertoire principal
|
# Repertoire principal
|
||||||
DocumentRoot HOME_DIR/XXX/www/
|
DocumentRoot HOME_DIR/XXX/www/
|
||||||
|
|
||||||
|
@ -49,7 +53,7 @@
|
||||||
UseCanonicalName On
|
UseCanonicalName On
|
||||||
RewriteEngine On
|
RewriteEngine On
|
||||||
RewriteCond %{HTTP_HOST} !^SERVERNAME$
|
RewriteCond %{HTTP_HOST} !^SERVERNAME$
|
||||||
RewriteRule ^/(.*) http://%{SERVER_NAME}/$1 [L,R]
|
RewriteRule ^/(.*) %{REQUEST_SCHEME}://%{SERVER_NAME}/$1 [L,R]
|
||||||
|
|
||||||
# PHP
|
# PHP
|
||||||
#php_admin_flag engine off
|
#php_admin_flag engine off
|
||||||
|
|
|
@ -251,6 +251,15 @@ create_www_account() {
|
||||||
|
|
||||||
random=$RANDOM
|
random=$RANDOM
|
||||||
vhostfile="/etc/apache2/sites-available/${in_login}.conf"
|
vhostfile="/etc/apache2/sites-available/${in_login}.conf"
|
||||||
|
keyfile="/etc/ssl/private/${in_login}.key"
|
||||||
|
csrfile="/etc/ssl/requests/${in_login}.csr"
|
||||||
|
crtfile="/etc/letsencrypt/${in_login}-fullchain.pem"
|
||||||
|
|
||||||
|
openssl genrsa -out $keyfile 2048
|
||||||
|
|
||||||
|
openssl req -new -sha256 -key $keyfile -subj "/CN=${in_wwwdomain}" -out $csrfile
|
||||||
|
|
||||||
|
openssl x509 -req -sha256 -days 365 -in $csrfile -signkey $keyfile -out $crtfile
|
||||||
|
|
||||||
cat $TPL_VHOST | \
|
cat $TPL_VHOST | \
|
||||||
sed -e "s/XXX/$in_login/g ; s/SERVERNAME/$in_wwwdomain/ ; s/RANDOM/$random/ ; s#HOME_DIR#$HOME_DIR#" >$vhostfile
|
sed -e "s/XXX/$in_login/g ; s/SERVERNAME/$in_wwwdomain/ ; s/RANDOM/$random/ ; s#HOME_DIR#$HOME_DIR#" >$vhostfile
|
||||||
|
@ -370,6 +379,7 @@ op_del() {
|
||||||
sed -i.bak "/-config=$login /d" /etc/cron.d/awstats
|
sed -i.bak "/-config=$login /d" /etc/cron.d/awstats
|
||||||
apache2ctl configtest
|
apache2ctl configtest
|
||||||
set +x
|
set +x
|
||||||
|
rm /etc/letsencrypt/${login}*
|
||||||
|
|
||||||
if [ -n "$dbname" ]; then
|
if [ -n "$dbname" ]; then
|
||||||
echo "Deleting mysql DATABASE $dbname and mysql user $login. Continue ?"
|
echo "Deleting mysql DATABASE $dbname and mysql user $login. Continue ?"
|
||||||
|
|
Loading…
Reference in a new issue