diff options
| author | Peter Palfrader <peter@palfrader.org> | 2008-09-19 10:39:51 +0000 |
|---|---|---|
| committer | weasel <weasel@bc3d92e2-beff-0310-a7cd-cc87d7ac0ede> | 2008-09-19 10:39:51 +0000 |
| commit | e2eb34a15cf4f7a1d7b1971e152e13f10d9b5cba (patch) | |
| tree | c2440b178fe3257c8adfa9afab2ec40d040b96ce | |
| parent | 1f0b5e0b94b9951410c1dfe7ab10ecb30ba15866 (diff) | |
Support a flag to not upgrade all http connections to https when we do https
git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@366 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede
| -rwxr-xr-x | bin/ldap2apache | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/ldap2apache b/bin/ldap2apache index 85f747f..2282794 100755 --- a/bin/ldap2apache +++ b/bin/ldap2apache @@ -96,7 +96,10 @@ clients.each{ |c| docdiraddto = vhost['tnWebVHostDocDirAddto'][0].gsub("\n", "\n\t") if vhost['tnWebVHostDocDirAddto'] cgidiraddto = vhost['tnWebVHostCgiDirAddto'][0].gsub("\n", "\n\t") if vhost['tnWebVHostCgiDirAddto'] - ssl = true if property['https'] == "only" + if property['https'] == "only" + ssl = true + http_ssl_upgrade = true unless property['http_ssl_upgrade'] == "no" + end vhostuid = uid vhostgid = gid if property['vhostUser'] @@ -323,7 +326,7 @@ clients.each{ |c| throw "Clash on #{server_name} of client#{c['o'][0]}" if files[ c['o'][0] +"-"+ server_name ] files[ c['o'][0] +"-"+ server_name ] = config - if ssl + if ssl and http_ssl_upgrade config = [] config << "<VirtualHost #{bind}:#{bindhttpport}>" config << " ServerName #{server_name}" |