From 7ef2cb2ce0e27e27320b9f473aae6041fcd22c5c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 20 Jul 2018 15:49:53 +0200 Subject: sbin/e2guardian-setup-sslmitm: Use more variables. --- sbin/e2guardian-setup-sslmitm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'sbin') diff --git a/sbin/e2guardian-setup-sslmitm b/sbin/e2guardian-setup-sslmitm index 84a6c42..cfde66f 100755 --- a/sbin/e2guardian-setup-sslmitm +++ b/sbin/e2guardian-setup-sslmitm @@ -21,6 +21,7 @@ set -e NULL="" E2G_SSLDIR=/etc/e2guardian/ssl/ +E2G_GENCERTDIR=/var/lib/e2guardian/generatedcerts mkdir -p ${E2G_SSLDIR} chmod 0755 ${E2G_SSLDIR} @@ -52,9 +53,9 @@ chown root:e2guardian ${E2G_SSLDIR}/e2guardian.key # Create generatedcerts dir... -mkdir -p /var/lib/e2guardian/generatedcerts -chown e2guardian:e2guardian /var/lib/e2guardian/generatedcerts -chmod go-rwx /var/lib/e2guardian/generatedcerts -Rfv +mkdir -p ${E2G_GENCERTDIR} +chown e2guardian:e2guardian ${E2G_GENCERTDIR} +chmod go-rwx ${E2G_GENCERTDIR} -Rfv echo "###" echo "### All preparations done..." @@ -67,10 +68,10 @@ echo "/etc/e2guardian/e2guardian.conf:" echo echo '```' echo "enablessl = on" -echo "cacertificatepath = '/etc/e2guardian/ssl/ca.crt'" -echo "caprivatekeypath = '/etc/e2guardian/ssl/ca.key'" -echo "certprivatekeypath = '/etc/e2guardian/ssl/e2guardian.key'" -echo "generatedcertpath = '/var/lib/e2guardian/generatedcerts'" +echo "cacertificatepath = '${E2G_SSLDIR}/ca.crt'" +echo "caprivatekeypath = '${E2G_SSLDIR}/ca.key'" +echo "certprivatekeypath = '${E2G_SSLDIR}/e2guardian.key'" +echo "generatedcertpath = '${E2G_GENCERTDIR}'" echo '```' echo echo "###" @@ -83,6 +84,6 @@ echo "sslmitm = on" echo '```' echo echo -echo "Finally, copy '/etc/e2guardian/ssl/ca.crt' and 'ca.der' to TJENER as" +echo "Finally, copy '${E2G_SSLDIR}/ca.crt' and 'ca.der' to TJENER as" echo "/etc/debian-edu/www/E2Guardian-ca.crt and E2Guardian-ca.der." -echo \ No newline at end of file +echo -- cgit v1.2.3