diff options
| author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2011-10-25 17:41:03 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2011-10-25 17:41:03 +0300 |
| commit | ca8d986df8613a11474bded43eae66132e5d7988 (patch) | |
| tree | 111f69f30a243d8fded99a72c519fae2f1925c2f /control | |
| parent | 8ac9c0cb3d8814ceff8b87d4202a9d33c0ea22e9 (diff) | |
Add additional HTTP alias /builds/ to allow shorter URLs.
Still keep /downloads/, as it allows browsing, while /builds/ doesn't.
Diffstat (limited to 'control')
| -rwxr-xr-x | control/setup-control-node | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/control/setup-control-node b/control/setup-control-node index d9a6258..70eb572 100755 --- a/control/setup-control-node +++ b/control/setup-control-node @@ -135,24 +135,27 @@ cat <<\EOF | sudo tee /etc/apache2/sites-available/android-build.linaro.org > /d ServerAdmin webmaster@localhost ServerName android-build.linaro.org Alias /download/ /var/lib/jenkins/jobs/ - Alias /seed/ /mnt2/seed/ + # Provide shortcut URLs to access artifacts + AliasMatch ^/builds/~([^/]+)/([^/]+)/(lastStable|lastSuccessful)(.*) /var/lib/jenkins/jobs/$1_$2/$3/archive/build/out$4 + AliasMatch ^/builds/~([^/]+)/([^/]+)/([^/]+)(.*) /var/lib/jenkins/jobs/$1_$2/builds/$3/archive/build/out$4 <Directory "/var/lib/jenkins/jobs/"> Options Indexes MultiViews FollowSymLinks AllowOverride None </Directory> + Alias /seed/ /mnt2/seed/ <Directory "/mnt2/seed/"> Options Indexes MultiViews FollowSymLinks AllowOverride None # Order deny,allow # Deny from all -# Allow from 127.0.0.0/255.0.0.0 ::1/128 +# Allow from 127.0.0.0/8 ::1/128 10.0.0.0/8 </Directory> # RewriteLog /var/log/apache2/mod_rewrite_log # RewriteLogLevel 3 RewriteEngine on - RewriteCond %{REQUEST_URI} !^/(download|seed) + RewriteCond %{REQUEST_URI} !^/(download|seed|builds) RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [redirect=301,last] # Allow to access XMLs in build artifact archives RewriteCond %{REQUEST_URI} .+/archive/.+\.xml$ |