diff options
Diffstat (limited to 'bin/ldap2apache')
| -rwxr-xr-x | bin/ldap2apache | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/bin/ldap2apache b/bin/ldap2apache index 707b984..d6c51ba 100755 --- a/bin/ldap2apache +++ b/bin/ldap2apache @@ -348,7 +348,7 @@ clients.each{ |c| files[ c['o'][0] +"-"+ server_name ] = config if ssl and http_ssl_upgrade - config = [] + config = [''] config << make_vhostline(bind, bindhttpport) config << " ServerName #{server_name}" config << " ServerAlias #{server_aliases}" if server_aliases != "" @@ -365,14 +365,12 @@ clients.each{ |c| config << "</VirtualHost>" config << '# vim:ft=apache:' - sn2 = server_name +'-redir' - throw "Clash on #{sn2} of client#{c['o'][0]}" if files[ c['o'][0] +"-"+ sn2 ] - files[ c['o'][0] +"-"+ sn2 ] = config + files[ c['o'][0] +"-"+ server_name ] += config end # # webstats, part II - we need our own vhost since we can't have suexec enabled unless property['stats'] == "no" - config = [] + config = [''] config << "<VirtualHost #{@statsbind}>" config << " ServerName #{server_name}" config << " ServerAdmin #{server_admin}" @@ -394,9 +392,7 @@ clients.each{ |c| config << "</VirtualHost>" config << '# vim:ft=apache:' - sn2 = server_name +'-stats' - throw "Clash on #{sn2} of client#{c['o'][0]}" if files[ c['o'][0] +"-"+ sn2 ] - files[ c['o'][0] +"-"+ sn2 ] = config + files[ c['o'][0] +"-"+ server_name ] += config end } } |