KanonConductor

changeset 58:768f26ad37c5

find changesets by author, revision, files, or words in the commit message
support git-http-backend.
author chris
date Thu, 12 May 2011 19:19:27 +0900
parents d39149910d35
children a9d0b61f3260
files kanon-setup resource/httpd-vcs.conf resource/httpd.conf
diffstat 3 files changed, 51 insertions(+), 47 deletions(-) [+]
line diff
     1.1 --- a/kanon-setup	Sat Apr 09 17:25:14 2011 +0900
     1.2 +++ b/kanon-setup	Thu May 12 19:19:27 2011 +0900
     1.3 @@ -251,11 +251,13 @@
     1.4          if [ ! -f /etc/apache2/sites-available/kanon ]
     1.5          then
     1.6              cp resource/httpd.conf /etc/apache2/sites-available/kanon
     1.7 +            cp resource/httpd-vcs.conf /etc/apache2/sites-available/vcs
     1.8          fi
     1.9          a2enmod expires
    1.10          a2enmod auth_digest
    1.11          a2enmod dav_fs
    1.12          a2ensite kanon
    1.13 +        a2ensite vcs
    1.14          service apache2 stop
    1.15          service apache2 start
    1.16          ;;
    1.17 @@ -270,6 +272,7 @@
    1.18          if [ ! -f /etc/httpd/conf.d/kanon.conf ]
    1.19          then
    1.20              cp resource/httpd.conf /etc/httpd/conf.d/kanon.conf
    1.21 +            cp resource/httpd-vcs.conf /etc/httpd/conf.d/vcs.conf
    1.22          fi
    1.23          echo 0 > /selinux/enforce
    1.24          CHK=`grep SELINUX=enforcing /etc/selinux/config` 

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/resource/httpd-vcs.conf	Thu May 12 19:19:27 2011 +0900
     2.3 @@ -0,0 +1,48 @@
     2.4 +# Subversionの設定
     2.5 +<Location "/svn/">
     2.6 +	DAV svn
     2.7 +	SVNParentPath /var/opt/kanon/svn
     2.8 +	SVNListParentPath on
     2.9 +	#  SVNIndexXSLT /style/svnindex.xsl
    2.10 +	AuthType Digest
    2.11 +	AuthName kanon
    2.12 +	AuthUserFile /etc/opt/kanon/kanon_users.htdigest
    2.13 +	Require valid-user
    2.14 +	AuthzSVNAccessFile /etc/opt/kanon/svnauthz
    2.15 +</Location>
    2.16 +
    2.17 +
    2.18 +# Mercurialの設定
    2.19 +WSGIScriptAlias /hg /opt/kanon/lib/cgi-bin/hgweb.wsgi
    2.20 +<Location /hg>
    2.21 +	WSGIApplicationGroup %{GLOBAL}
    2.22 +	AuthType Digest
    2.23 +	AuthName kanon
    2.24 +	AuthUserFile /etc/opt/kanon/kanon_users.htdigest
    2.25 +	Require valid-user
    2.26 +</Location>
    2.27 +
    2.28 +
    2.29 +# Bazaarの設定
    2.30 +WSGIScriptAliasMatch ^/bzr /opt/kanon/lib/cgi-bin/bzr.wsgi
    2.31 +#WSGIScriptAliasMatch ^/bzr/.*/\.bzr/smart$ /opt/kanon/lib/cgi-bin/bzr.wsgi
    2.32 +<Location /bzr>
    2.33 +	WSGIApplicationGroup %{GLOBAL}
    2.34 +	AuthType Digest
    2.35 +	AuthName kanon
    2.36 +	AuthUserFile /etc/opt/kanon/kanon_users.htdigest
    2.37 +	Require valid-user
    2.38 +</Location>
    2.39 +
    2.40 +# Gitの設定
    2.41 +# Gitの設定
    2.42 +SetEnv GIT_PROJECT_ROOT /var/opt/kanon/git
    2.43 +SetEnv GIT_HTTP_EXPORT_ALL
    2.44 +ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/
    2.45 +
    2.46 +<LocationMatch /git>
    2.47 +        AuthType Digest
    2.48 +        AuthName kanon 
    2.49 +        AuthUserFile /etc/opt/kanon/kanon_users.htdigest
    2.50 +        Require valid-user                              
    2.51 +</LocationMatch>

     3.1 --- a/resource/httpd.conf	Sat Apr 09 17:25:14 2011 +0900
     3.2 +++ b/resource/httpd.conf	Thu May 12 19:19:27 2011 +0900
     3.3 @@ -23,53 +23,6 @@
     3.4  	ExpiresByType text/css A2592000
     3.5  </Location>
     3.6  
     3.7 -# Subversionの設定
     3.8 -<Location "/svn/">
     3.9 -	DAV svn
    3.10 -	SVNParentPath /var/opt/kanon/svn
    3.11 -	SVNListParentPath on
    3.12 -	#  SVNIndexXSLT /style/svnindex.xsl
    3.13 -	AuthType Digest
    3.14 -	AuthName kanon
    3.15 -	AuthUserFile /etc/opt/kanon/kanon_users.htdigest
    3.16 -	Require valid-user
    3.17 -	AuthzSVNAccessFile /etc/opt/kanon/svnauthz
    3.18 -</Location>
    3.19 -
    3.20 -
    3.21 -# Mercurialの設定
    3.22 -WSGIScriptAlias /hg /opt/kanon/lib/cgi-bin/hgweb.wsgi
    3.23 -<Location /hg>
    3.24 -	WSGIApplicationGroup %{GLOBAL}
    3.25 -	AuthType Digest
    3.26 -	AuthName kanon
    3.27 -	AuthUserFile /etc/opt/kanon/kanon_users.htdigest
    3.28 -	Require valid-user
    3.29 -</Location>
    3.30 -
    3.31 -
    3.32 -# Bazaarの設定
    3.33 -WSGIScriptAliasMatch ^/bzr /opt/kanon/lib/cgi-bin/bzr.wsgi
    3.34 -#WSGIScriptAliasMatch ^/bzr/.*/\.bzr/smart$ /opt/kanon/lib/cgi-bin/bzr.wsgi
    3.35 -<Location /bzr>
    3.36 -	WSGIApplicationGroup %{GLOBAL}
    3.37 -	AuthType Digest
    3.38 -	AuthName kanon
    3.39 -	AuthUserFile /etc/opt/kanon/kanon_users.htdigest
    3.40 -	Require valid-user
    3.41 -</Location>
    3.42 -
    3.43 -# Gitの設定
    3.44 -Alias /git /var/opt/kanon/git
    3.45 -<Location /git>
    3.46 -        Options Indexes
    3.47 -        DAV on         
    3.48 -        AuthType Digest
    3.49 -        AuthName kanon 
    3.50 -        AuthUserFile /etc/opt/kanon/kanon_users.htdigest
    3.51 -        Require valid-user                              
    3.52 -</Location>
    3.53 -
    3.54  # Mavenリポジトリの設定	
    3.55  #Alias /maven "/var/opt/kanon/maven"
    3.56  #<Directory "/var/opt/kanon/maven">