diff options
| author | Steffen Hansen <steffen@kdab.com> | 2005-05-28 22:09:06 (GMT) |
|---|---|---|
| committer | Steffen Hansen <steffen@kdab.com> | 2005-05-28 22:09:06 (GMT) |
| commit | 24b39220570305a089e26d43c9666f986bff6d4e (patch) | |
| tree | b9c65c54c8acf024a18ab0a673eefa06f3a42521 /conf | |
| parent | e575c117ad74b7cb06a3e34fac8d29ed23312160 (diff) | |
| download | kolab-conf-24b39220570305a089e26d43c9666f986bff6d4e.tar.gz | |
no extra template file for legacy mode
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/templates/httpd.conf.template | 17 | ||||
| -rw-r--r-- | conf/templates/legacy.conf.template | 21 |
2 files changed, 13 insertions, 25 deletions
diff --git a/conf/templates/httpd.conf.template b/conf/templates/httpd.conf.template index bf26bf3..0d9c79d 100644 --- a/conf/templates/httpd.conf.template +++ b/conf/templates/httpd.conf.template @@ -176,7 +176,18 @@ ScriptAlias /cgi-bin/ "@l_prefix@/var/kolab/www/cgi-bin/" DavLockDB @l_prefix@/var/kolab/www/locks/DAVlock -@@@legacy-mode@@@ +<Location /admin> + SSLRequireSSL +</Location> +@@@if apache-http@@@ +@@@else@@@ +<Location /fbview> + SSLRequireSSL +</Location> +<Location /freebusy> + SSLRequireSSL +</Location> +@@@endif@@@ #<Location /freebusy> # SSLVerifyClient require @@ -186,7 +197,7 @@ DavLockDB @l_prefix@/var/kolab/www/locks/DAVlock <Directory "@l_prefix@/var/kolab/www/freebusy"> #Dav On - Script PUT /freebusy/freebusy.php + #Script PUT /freebusy/freebusy.php AllowOverride None Options None # Disallow for everyone as default @@ -249,7 +260,6 @@ DavLockDB @l_prefix@/var/kolab/www/locks/DAVlock <Directory "/kolab/var/kolab/www/fbview"> AllowOverride All Allow from all - SSLRequireSSL php_value include_path ".:@l_prefix@/var/kolab/php:@l_prefix@/var/kolab/php/pear:/php/include:@l_prefix@/lib/php" </Directory> @@ -271,7 +281,6 @@ DavLockDB @l_prefix@/var/kolab/www/locks/DAVlock #Base_DN "@@@base_dn@@@" #UID_Attr uid #require valid-user - SSLRequireSSL </Directory> AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip diff --git a/conf/templates/legacy.conf.template b/conf/templates/legacy.conf.template deleted file mode 100644 index f4f8fad..0000000 --- a/conf/templates/legacy.conf.template +++ /dev/null @@ -1,21 +0,0 @@ -<Directory "@l_prefix@/var/kolab/www/freebusy"> - - AllowOverride None - Options None - Order allow,deny - Allow from all - AuthName "Kolab Freebusy" - AuthType Basic - LDAP_Server @@@ldap_ip@@@ - LDAP_Port @@@ldap_port@@@ - Base_DN "@@@base_dn@@@" - # temporary : openldap changed from 2.1.9 to 2.1.12 - # anonymous bind with dn is nolonger allowed - # unfortunately mod_auth_ldap seems to exactly do so - # need to investigate ... - Bind_DN "@@@bind_dn@@@" - Bind_Pass "@@@bind_pw@@@" - UID_Attr uid - require valid-user - -</Directory> |