From 4d5594d75da9bb0130d2838966725f770b5d813b Mon Sep 17 00:00:00 2001 From: gauthiier Date: Thu, 29 Nov 2018 22:29:38 +0100 Subject: [PATCH] vhost_tmpl --- vhost-apache2/vhost.py | 5 +++-- vhost-apache2/vhost_tmpl | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/vhost-apache2/vhost.py b/vhost-apache2/vhost.py index 90ec10d..b07e6cb 100755 --- a/vhost-apache2/vhost.py +++ b/vhost-apache2/vhost.py @@ -2,6 +2,7 @@ import sys, os, platform, subprocess, re, argparse +# only support linux platform_support = ['Linux'] html_dir_path = "" @@ -34,11 +35,11 @@ def sanity_check_system(): # check apache2 r = subprocess.call("apache2 -v", shell=True) == 0 - # check apache2 (ubuntu-style) + # check apache2 (ubuntu) u = os.path.exists('/etc/apache2/sites-available/') if not r and u: - sys.exit("Apache2 (ubuntu-style) not installed on your system. Aborting...") + sys.exit("Apache2 (ubuntu) not installed on your system. Aborting...") def sanity_chek_platform(): diff --git a/vhost-apache2/vhost_tmpl b/vhost-apache2/vhost_tmpl index 430205d..c927f0c 100644 --- a/vhost-apache2/vhost_tmpl +++ b/vhost-apache2/vhost_tmpl @@ -35,4 +35,5 @@ SSLEngine on SSLCertificateFile /etc/letsencrypt/live/%domain?/fullchain.pem SSLCertificateKeyFile /etc/letsencrypt/live/%domain?/privkey.pem + Include /etc/letsencrypt/options-ssl-apache.conf \ No newline at end of file