diff --git a/etc/alternc/apache2-ssl.conf b/etc/alternc/apache2-ssl.conf index fa79dea6..36645f7a 100644 --- a/etc/alternc/apache2-ssl.conf +++ b/etc/alternc/apache2-ssl.conf @@ -1,7 +1,10 @@ - SSLEngine on - SSLCertificateFile /etc/alternc/apache.pem - SSLCaCertificatePath /etc/ssl/certs - DocumentRoot /var/alternc/bureau - Include /etc/alternc/bureau.conf + + Include /etc/alternc/bureau.conf + + SSLEngine on + SSLCertificateFile /etc/alternc/apache.pem + SSLCaCertificatePath /etc/ssl/certs + + diff --git a/etc/alternc/apache2.conf b/etc/alternc/apache2.conf index 198a56e0..ff20e0e6 100644 --- a/etc/alternc/apache2.conf +++ b/etc/alternc/apache2.conf @@ -63,5 +63,9 @@ ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/ Allow from all -Include /etc/alternc/bureau.conf + + Include /etc/alternc/bureau.conf + + + Include /var/alternc/apache-vhost/vhosts_all.conf diff --git a/etc/alternc/templates/alternc/bureau.conf b/etc/alternc/templates/alternc/bureau.conf index 896925d8..4c8d7320 100644 --- a/etc/alternc/templates/alternc/bureau.conf +++ b/etc/alternc/templates/alternc/bureau.conf @@ -1,4 +1,4 @@ - + DocumentRoot /var/alternc/bureau/admin ServerName %%fqdn%% RewriteEngine on @@ -7,4 +7,3 @@ alias /sql /usr/share/phpmyadmin alias /webmail /usr/share/squirrelmail -