evolix/ansible-roles
22
2
Fork 2
Code Issues 61 Pull requests 18 Releases 32 Wiki Activity

evoacme: change function name to be more specific

Browse source
This commit is contained in:
Jérémy Lecour 2017-10-12 18:19:53 +02:00 committed by Jérémy Lecour
parent 3c61484448
commit 118a9759af
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
evoacme/files/evoacme.sh
View file

@ -29,7 +29,7 @@ error() {
exit 1
}
change_cert_path_for_apache() {
sed_cert_path_for_apache() {
vhost=$1
vhost_full_path="/etc/apache2/ssl/${vhost}.conf"
cert_path=$2
@ -39,7 +39,7 @@ change_cert_path_for_apache() {
${APACHE2CTL_BIN} -t
}
change_cert_path_for_nginx() {
sed_cert_path_for_nginx() {
vhost=$1
vhost_full_path="/etc/nginx/ssl/${vhost}.conf"
cert_path=$2
@ -142,12 +142,8 @@ main() {
else
# We don't have a live symlink yet
# Let's start from scratch and configure our web server(s)
if [ -n "${APACHE2CTL_BIN}" ]; then
change_cert_path_for_apache "${VHOST}" "${LIVE_FULLCHAIN}"
fi
if [ -n "${NGINX_BIN}" ]; then
change_cert_path_for_nginx "${VHOST}" "${LIVE_FULLCHAIN}"
fi
command -v apache2ctl && sed_cert_path_for_apache "${VHOST}" "${LIVE_FULLCHAIN}"
command -v nginx && sed_cert_path_for_nginx "${VHOST}" "${LIVE_FULLCHAIN}"
fi
#### CERTIFICATE CREATION WITH CERTBOT