X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Flib-httpd%2Fapache.conf;h=0a4cdfa93ece7d8a4177835b5569583c22303564;hb=16c06fcb39eec5505c383b412ca2254bccf354a5;hp=4961505d1dd99da529b43abd42522e6a005961b1;hpb=28bf4ba014c9b41679f41580fa9e1cc294b240d9;p=git.git
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 4961505d1..0a4cdfa93 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -17,8 +17,33 @@ ErrorLog error.log
LoadModule env_module modules/mod_env.so
+
+ LoadModule rewrite_module modules/mod_rewrite.so
+
+
+ LoadModule version_module modules/mod_version.so
+
+
+
+
+ LoadModule auth_module modules/mod_auth.so
+
+
+
+= 2.1>
+
+ LoadModule auth_basic_module modules/mod_auth_basic.so
+
+
+ LoadModule authn_file_module modules/mod_authn_file.so
+
+
+ LoadModule authz_user_module modules/mod_authz_user.so
+
+
Alias /dumb/ www/
+Alias /auth/ www/auth/
SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
@@ -36,6 +61,10 @@ ScriptAlias /smart_noexport/ ${GIT_EXEC_PATH}/git-http-backend/
Options ExecCGI
+RewriteEngine on
+RewriteRule ^/smart-redir-perm/(.*)$ /smart/$1 [R=301]
+RewriteRule ^/smart-redir-temp/(.*)$ /smart/$1 [R=302]
+
LoadModule ssl_module modules/mod_ssl.so
@@ -48,6 +77,13 @@ SSLMutex file:ssl_mutex
SSLEngine On
+
+ AuthType Basic
+ AuthName "git-auth"
+ AuthUserFile passwd
+ Require valid-user
+
+
LoadModule dav_module modules/mod_dav.so
LoadModule dav_fs_module modules/mod_dav_fs.so