Unify cgit configuration

Author: hsbt

recipes/files/etc/apache2/conf-available/cgit.conf

@@ -1,10 +1,21 @@
-ScriptAlias /cgit/ "/usr/lib/cgit/cgit.cgi/"
-RedirectMatch ^/cgit$ /cgit/
 Alias /cgit-css "/usr/share/cgit/"
+ScriptAlias / "/usr/lib/cgit/cgit.cgi/"
+RedirectMatch ^/cgit$ /cgit/
 <Directory "/usr/lib/cgit/">
    AllowOverride None
    Options ExecCGI FollowSymlinks
    Require all granted
+   RLimitNPROC 5
+
+   RewriteEngine On
+   RewriteCond %{QUERY_STRING} ^id=([0-9a-fA-F]{40})$
+   RewriteRule ^/ruby\.git/commit/?$ https://github.com/ruby/ruby/commit/%1 [R=permanent,L,NE,QSD]
+   RewriteCond %{QUERY_STRING} ^id=([0-9a-fA-F]{40})$
+   RewriteRule ^/ruby\.git/commit/(.*)$ https://github.com/ruby/ruby/blob/%1/$1 [R=permanent,L,NE,QSD]
+   RewriteCond %{QUERY_STRING} ^id=([0-9a-fA-F]{40})$
+   RewriteRule ^/ruby\.git/tree/(.*)$ https://github.com/ruby/ruby/blob/%1/$1 [R=permanent,L,NE,QSD]
+   RewriteCond %{QUERY_STRING} ^id=([0-9a-fA-F]{40})(&showmsg=1)?$
+   RewriteRule ^/ruby\.git/log/(.*)$ https://github.com/ruby/ruby/commits/%1/$1 [R=permanent,L,NE,QSD]
 
    Order Allow,Deny
    Allow from all

recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf

@@ -18,31 +18,13 @@
 
         TimeOut 300
 
-        RewriteEngine On
-        RewriteCond %{QUERY_STRING} ^id=([0-9a-fA-F]{40})$
-        RewriteRule ^/ruby\.git/commit/?$ https://github.com/ruby/ruby/commit/%1 [R=permanent,L,NE,QSD]
-        RewriteCond %{QUERY_STRING} ^id=([0-9a-fA-F]{40})$
-        RewriteRule ^/ruby\.git/commit/(.*)$ https://github.com/ruby/ruby/blob/%1/$1 [R=permanent,L,NE,QSD]
-        RewriteCond %{QUERY_STRING} ^id=([0-9a-fA-F]{40})$
-        RewriteRule ^/ruby\.git/tree/(.*)$ https://github.com/ruby/ruby/blob/%1/$1 [R=permanent,L,NE,QSD]
-        RewriteCond %{QUERY_STRING} ^id=([0-9a-fA-F]{40})(&showmsg=1)?$
-        RewriteRule ^/ruby\.git/log/(.*)$ https://github.com/ruby/ruby/commits/%1/$1 [R=permanent,L,NE,QSD]
-
-        Alias /cgit-css "/usr/share/cgit/"
-        Alias /robots.txt "/var/www/git.ruby-lang.org/robots.txt"
+        # Alias /robots.txt "/var/www/git.ruby-lang.org/robots.txt"
+        DocumentRoot /var/www/git.ruby-lang.org
 
         ScriptAlias /webhook "/home/git/git.ruby-lang.org/cgi-bin/webhook.cgi/"
         <Directory "/home/git/git.ruby-lang.org/cgi-bin/">
                 AllowOverride None
                 Options ExecCGI FollowSymlinks
                 Require all granted
         </Directory>
-
-        ScriptAlias / "/usr/lib/cgit/cgit.cgi/"
-        <Directory "/usr/lib/cgit/">
-                AllowOverride None
-                Options ExecCGI FollowSymlinks
-                Require all granted
-                RLimitNPROC 5
-        </Directory>
 </VirtualHost>