diff options
| author | Andy Doan <andy.doan@linaro.org> | 2016-11-09 09:00:05 -0600 |
|---|---|---|
| committer | Andy Doan <andy.doan@linaro.org> | 2016-11-10 18:57:20 +0000 |
| commit | 42fb96d6002e9f1c79cc8f2e139512c2239f9217 (patch) | |
| tree | 571e0ea7854d21d27c666c199e3b782437e86c8f | |
| parent | ba42d5d7715b3b107f64dc3d3d2f4b52c32cb98d (diff) | |
git: remove apache 2.2 checks
We've moved all servers to Trusty and no longer have to deal with Apache
2.2
Change-Id: Ic09fbae04750d5dbff31c61a07ec625d3930f8bd
Reviewed-on: https://review.linaro.org/15425
Reviewed-by: Ben Copeland <ben.copeland@linaro.org>
| -rw-r--r-- | per-service/git-servers/files/android-git.linaro.org.conf | 23 | ||||
| -rw-r--r-- | per-service/git-servers/files/git.linaro.org.conf | 16 |
2 files changed, 4 insertions, 35 deletions
diff --git a/per-service/git-servers/files/android-git.linaro.org.conf b/per-service/git-servers/files/android-git.linaro.org.conf index ae7af995..fe99cb07 100644 --- a/per-service/git-servers/files/android-git.linaro.org.conf +++ b/per-service/git-servers/files/android-git.linaro.org.conf @@ -1,9 +1,4 @@ -<IfVersion < 2.3 > -RewriteLock /tmp/rewritelock -</IfVersion> -<IfVersion >= 2.3> Mutex default rewrite-map -</IfVersion> <VirtualHost *:80> ServerName {{ git_host }} @@ -128,23 +123,15 @@ Mutex default rewrite-map ScriptAliasMatch "(?x)^/git/(.*/(HEAD | info/refs | objects/info/[^/]+ | git-(upload|receive)-pack))$" /usr/lib/git-core/git-http-backend/$1 ScriptAlias /gitweb /usr/lib/cgi-bin/gitweb.cgi - <IfVersion >= 2.3> <Directory "/usr/lib/git-core"> Options +ExecCgi -MultiViews +SymLinksIfOwnerMatch AllowOverride none Require all granted </Directory> - </IfVersion> <Directory "{{ repo_root }}"> AllowOverride None - <IfVersion < 2.3 > - Order deny,allow - Allow from all - </IfVersion> - <IfVersion >= 2.3> - Require all granted - </IfVersion> + Require all granted Options +FollowSymLinks -ExecCGI ExpiresActive Off @@ -158,12 +145,6 @@ Mutex default rewrite-map <Directory "{{ apache_root }}/{{ git_host }}/"> AllowOverride None - <IfVersion < 2.3 > - Order allow,deny - Allow from all - </IfVersion> - <IfVersion >= 2.3> - Require all granted - </IfVersion> + Require all granted </Directory> </VirtualHost> diff --git a/per-service/git-servers/files/git.linaro.org.conf b/per-service/git-servers/files/git.linaro.org.conf index b6d517b8..7e25bf07 100644 --- a/per-service/git-servers/files/git.linaro.org.conf +++ b/per-service/git-servers/files/git.linaro.org.conf @@ -90,13 +90,7 @@ ServerTokens Prod <Directory "{{ repo_root }}"> AllowOverride None - <IfVersion < 2.3 > - Order allow,deny - Allow from all - </IfVersion> - <IfVersion >= 2.3> - Require all granted - </IfVersion> + Require all granted Options +FollowSymLinks -ExecCGI +Indexes ExpiresActive Off FileEtag None @@ -219,13 +213,7 @@ ServerTokens Prod <Directory "{{ repo_root }}/"> AllowOverride None - <IfVersion < 2.3 > - Order allow,deny - Allow from all - </IfVersion> - <IfVersion >= 2.3> - Require all granted - </IfVersion> + Require all granted Options +FollowSymLinks -ExecCGI +Indexes ExpiresActive Off FileEtag None |