diff --git a/dicos/70_lemonldap_ng.xml b/dicos/70_lemonldap_ng.xml index 189f16d..fb8f3e4 100644 --- a/dicos/70_lemonldap_ng.xml +++ b/dicos/70_lemonldap_ng.xml @@ -5,9 +5,9 @@ - - - + + + diff --git a/posttemplate/70-lemon-nginx b/posttemplate/70-lemon-nginx index 690ee87..bc28e6f 100755 --- a/posttemplate/70-lemon-nginx +++ b/posttemplate/70-lemon-nginx @@ -16,14 +16,14 @@ do if [ -L /etc/nginx/sites-enabled/${SERVICE}-nginx.conf ];then rm /etc/nginx/sites-enabled/${SERVICE}-nginx.conf fi - if [ -L /etc/apache2/sites-enabled/${SERVICE}-apache2.4.conf ];then - a2dissite ${SERVICE}-apache2.4 + if [ -L /etc/apache2/sites-enabled/${SERVICE}-apache2.conf ];then + a2dissite ${SERVICE}-apache2 fi if [ "${ENABLE}" = 'oui' ];then if [ "${SERVER}" = 'nginx' ];then ln -s /etc/nginx/sites-available/${SERVICE}-nginx.conf /etc/nginx/sites-enabled/${SERVICE}-nginx.conf elif [ "${SERVER}" = 'apache2' ];then - a2ensite ${SERVICE}-apache2.4.conf + a2ensite ${SERVICE}-apache2.conf fi fi done