Skip to content

Commit 7c0e0c1

Browse files
committed
Cleaned up the settings a little bit
1 parent 4ec89ac commit 7c0e0c1

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

ssl-conf.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use_lets_encrypt_certificates() {
1414
echo "switching webserver to use Let's Encrypt certificate for $1"
1515
sed 's/#LoadModule/LoadModule/' $3/extra/httpd-vhosts.conf > $3/extra/httpd-vhosts.conf.bak
1616
sed 's/example.com/'$1'/g' $3/extra/httpd-ssl.conf > $3/extra/httpd-ssl.conf.bak
17-
sed '/^#\(.*\)httpd-ssl\.conf/ s/^#//' $3/httpd.conf > $3/httpd.conf.bak
17+
sed '/^#\(.*\)httpd-ssl\.conf/ s/^#//' $3/httpd.conf > $3/httpd.conf.bak
1818
}
1919

2020
reload_webserver() {
@@ -23,7 +23,7 @@ reload_webserver() {
2323
cp $1/httpd.conf.bak $1/httpd.conf
2424
rm $1/extra/httpd-ssl.conf.bak
2525
rm $1/extra/httpd-vhosts.conf.bak
26-
rm $1/httpd.conf.bak
26+
rm $1/httpd.conf.bak
2727
echo "Starting webserver apache2 service"
2828
httpd -t
2929
}
@@ -42,12 +42,11 @@ wait_for_lets_encrypt() {
4242
reload_webserver "$3"
4343
}
4444

45-
46-
if [ ! -d "$2/live/$1" ]; then
47-
wait_for_lets_encrypt "$1" "$2" "$3" &
48-
else
49-
use_lets_encrypt_certificates "$1" "$2" "$3"
50-
reload_webserver "$3"
51-
fi
45+
if [ ! -d "$2/live/$1" ]; then
46+
wait_for_lets_encrypt "$1" "$2" "$3" &
47+
else
48+
use_lets_encrypt_certificates "$1" "$2" "$3"
49+
reload_webserver "$3"
50+
fi
5251

5352
httpd-foreground

0 commit comments

Comments
 (0)