summaryrefslogtreecommitdiff
path: root/per-service
diff options
context:
space:
mode:
authorAndy Doan <andy.doan@linaro.org>2016-10-14 12:22:20 -0500
committerAndy Doan <andy.doan@linaro.org>2016-10-28 14:32:46 +0000
commit1722f29a1a36c69a211ec23363ca67f09e43decf (patch)
treed0be821bd990f1b0890effdd1d0fb556d9f7e1b0 /per-service
parent8a89e887b02d84f162b38cb66f8b983e961611b8 (diff)
downloadansible-playbooks-1722f29a1a36c69a211ec23363ca67f09e43decf.tar.gz
git.l.o: move to only using CGIT
This removes the usage of gitweb from git.l.o servers. Long term we probably want /var/www/cgit to be in /var/www/git.linaro.org, but we can't do that until we first move all our Git servers to CGIT. Change-Id: Iecf8b2a168f5ed01042c0f4bdd777b44087fab12 Reviewed-on: https://review.linaro.org/14772 Reviewed-by: Ben Copeland <ben.copeland@linaro.org> Reviewed-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Diffstat (limited to 'per-service')
-rw-r--r--per-service/git-servers/files/git.linaro.org.conf47
1 files changed, 4 insertions, 43 deletions
diff --git a/per-service/git-servers/files/git.linaro.org.conf b/per-service/git-servers/files/git.linaro.org.conf
index a6a7bc8..83da3ee 100644
--- a/per-service/git-servers/files/git.linaro.org.conf
+++ b/per-service/git-servers/files/git.linaro.org.conf
@@ -11,7 +11,7 @@ ServerTokens Prod
CustomLog ${APACHE_LOG_DIR}/{{ git_host }}-access.log "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D microseconds" env=!dontlog
ErrorLog ${APACHE_LOG_DIR}/{{ git_host }}-error.log
- DocumentRoot {{ apache_root }}/{{ git_host }}
+ DocumentRoot {{ apache_root }}/cgit
ExpiresActive On
ExpiresDefault "access plus 0 seconds"
@@ -108,27 +108,8 @@ ServerTokens Prod
</FilesMatch>
</Directory>
- <Directory "{{ apache_root }}/{{ git_host }}/">
- Options +ExecCGI +FollowSymLinks
- AllowOverride None
- <IfVersion < 2.3 >
- Order allow,deny
- Allow from all
- </IfVersion>
- <IfVersion >= 2.3>
- Require all granted
- </IfVersion>
- AddHandler cgi-script cgi
- DirectoryIndex gitweb.cgi
- RewriteEngine On
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule ^.* /gitweb.cgi/$0 [B,passthrough,last]
- </Directory>
-
Alias /cgit-css "/var/www/cgit/cgit-css/"
- ScriptAlias /cgit/ "{{ apache_root}}/cgit/cgit/"
- RedirectMatch ^/cgit$ /cgit/
+ ScriptAlias / "{{ apache_root}}/cgit/cgit/"
<Directory "{{ apache_root }}/cgit/">
AllowOverride None
Options ExecCGI FollowSymlinks
@@ -159,7 +140,7 @@ ServerTokens Prod
CustomLog ${APACHE_LOG_DIR}/{{ git_host }}-access.log "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D microseconds" env=!dontlog
ErrorLog ${APACHE_LOG_DIR}/{{ git_host }}-error.log
- DocumentRoot {{ apache_root }}/{{ git_host }}
+ DocumentRoot {{ apache_root }}/cgit
ExpiresActive On
ExpiresDefault "access plus 0 seconds"
@@ -257,28 +238,8 @@ ServerTokens Prod
</FilesMatch>
</Directory>
- <Directory "{{ apache_root }}/{{ git_host }}/">
- Options +ExecCGI +FollowSymLinks
- AllowOverride None
- <IfVersion < 2.3 >
- Order allow,deny
- Allow from all
- </IfVersion>
- <IfVersion >= 2.3>
- Require all granted
- </IfVersion>
- AddHandler cgi-script cgi
- DirectoryIndex gitweb.cgi
-
- RewriteEngine On
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule ^.* /gitweb.cgi/$0 [B,passthrough,last]
- </Directory>
-
Alias /cgit-css "/var/www/cgit/cgit-css/"
- ScriptAlias /cgit/ "{{ apache_root}}/cgit/cgit/"
- RedirectMatch ^/cgit$ /cgit/
+ ScriptAlias / "{{ apache_root}}/cgit/cgit/"
<Directory "{{ apache_root }}/cgit/">
AllowOverride None
Options ExecCGI FollowSymlinks