1 files changed, 46 insertions, 27 deletions
diff --git a/development/cgit/config/cgit-httpd.conf b/development/cgit/config/cgit-httpd.conf
index 4d713503be..4b757ea049 100644
--- a/development/cgit/config/cgit-httpd.conf
+++ b/development/cgit/config/cgit-httpd.conf
@@ -1,43 +1,62 @@
-# sample folder and virtual host configurations for httpd.
+# Sample folder and virtual host configurations for httpd.
 # edit, move it to /etc/httpd/extra and include it in
 # /etc/httpd/httpd.conf with a line
 #
-# Include /etc/httpd/extra/cgit-httpd.conf
+# Include /etc/httpd/extra/cgit.conf
 #
 # uncomment also the line
 #
 # AddHandler cgi-script .cgi
+#
+# and enable mod_cgi (or mod_cgid, depending on your apache
+# configuration)
+
+## Version 1: cgit in a /cgit subdirectory of the main host
+## This will need the following 3 lines in your /etc/cgitrc
+##
+## virtual-root=/cgit/
+## css=/static/cgit.css
+## logo=/static/cgit.png
+##
+#Alias /static/cgit.css "@DOCROOT@/cgi-bin/cgit.css"
+#Alias /static/cgit.png "@DOCROOT@/cgi-bin/cgit.png"
+#ScriptAlias /cgit/ "@DOCROOT@/cgi-bin/cgit.cgi/"
+#RedirectMatch ^/cgit$ /cgit/
+#<Directory "@DOCROOT@/cgi-bin/">
+#   AllowOverride None
+#   Options ExecCGI FollowSymlinks
+#   Require all granted
+#</Directory>
 
-<Directory @DOCROOT@/cgi-bin>
-    AllowOverride None
-    Require all granted
-</Directory>
-
-## Version 1 (default): under /cgi-bin/cgit.cgi address
-#ScriptAlias /cgi-bin/cgit.cgi @DOCROOT@/cgi-bin/cgit.cgi
-#Alias /cgit/ @DOCROOT@/cgi-bin/
-#<Location /cgit/cgit.cgi>
-#    Options FollowSymlinks ExecCGI
-#    Require all granted
-#</Location>
-#RewriteEngine on
-#RewriteCond %{REQUEST_FILENAME} !-f
-#RewriteCond %{REQUEST_FILENAME} !-d
-#RewriteRule ^/cgit/(.*)$ /cgit/cgit.cgi?url=$1 [L,QSA]
-
-# Version 2: cgit as a handler to whole vhost:
+# Version 2: cgit as a handler to whole vhost
+# Thanks to Robby Workman for this elegant example
 <VirtualHost *:80>
-     ServerName cgit.my.domain
+     ServerName cgit.yourdomain.ltd
+     
+     Options FollowSymlinks
+
      SetEnv CGIT_CONFIG /etc/cgitrc
-     Options FollowSymlinks ExecCGI
-     DirectoryIndex cgit.cgi
+
      DocumentRoot @DOCROOT@/cgi-bin
+
+     <Directory @DOCROOT@/cgi-bin>
+          AllowOverride None
+          Require all granted
+          DirectoryIndex cgit.cgi
+     </Directory>
+
+     Alias /cgit.css @DOCROOT@/cgi-bin/cgit.css
+     Alias /cgit.png @DOCROOT@/cgi-bin/cgit.png
+     Alias /favicon.ico @DOCROOT@/cgi-bin/favicon.ico
+     Alias /robots.txt @DOCROOT@/cgi-bin/robots.txt
+     Alias / @DOCROOT@/cgi-bin/cgit.cgi/
+
      <Location />
           Options ExecCGI
           Require all granted
      </Location>
-     RewriteEngine on
-     RewriteCond %{REQUEST_FILENAME} !-f
-     RewriteCond %{REQUEST_FILENAME} !-d
-     RewriteRule ^(.*)$ /cgit.cgi?url=$1 [L,QSA]
+
+     <Files cgit.cgi>
+          SetHandler cgi-script
+     </Files>
 </VirtualHost>