Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/296085
Change subject: Revert "Rewrite rules for git.wikimedia.org" ...................................................................... Revert "Rewrite rules for git.wikimedia.org" This reverts commit 49a44e9604df7b2414c459d196749d91cd6e921f. Change-Id: I1e6d09e0e23b79348086d54b6bb905c6034cbbb9 --- M modules/phabricator/manifests/init.pp D modules/phabricator/templates/gitblit_vhost.conf.erb M modules/role/manifests/phabricator/main.pp 3 files changed, 0 insertions(+), 112 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/85/296085/1 diff --git a/modules/phabricator/manifests/init.pp b/modules/phabricator/manifests/init.pp index 787384a..6eafb2d 100644 --- a/modules/phabricator/manifests/init.pp +++ b/modules/phabricator/manifests/init.pp @@ -117,22 +117,6 @@ require => $base_requirements, } - # git.wikimedia.org hosts rewrite rules to redirect old gitblit urls to - # equivilent diffusion urls. - - $gitblit_servername = $phab_settings['gitblit.hostname'] - - file { '/srv/git.wikimedia.org': - ensure => 'directory', - owner => 'root', - group => 'root', - } - - apache::site { 'git.wikimedia.org': - content => template('phabricator/gitblit_vhost.conf.erb'), - require => File['/srv/git.wikimedia.org'], - } - # Robots.txt disallowing to crawl the alias domain if $serveralias { file {"${phabdir}/robots.txt": diff --git a/modules/phabricator/templates/gitblit_vhost.conf.erb b/modules/phabricator/templates/gitblit_vhost.conf.erb deleted file mode 100644 index c317a1f..0000000 --- a/modules/phabricator/templates/gitblit_vhost.conf.erb +++ /dev/null @@ -1,95 +0,0 @@ -<VirtualHost *:80> - ServerName <%= @gitblit_servername %> -<% if !@serveradmin.empty? -%> - ServerAdmin <%= @serveradmin %> -<%- end %> - DocumentRoot /srv/git.wikimedia.org - - ##### https://git.wikimedia.org -> https://phabricator.wikimedia.org/diffusion redirects - ##### @author [[meta:User:Danny B.]] - ##### Maniphest Task: https://phabricator.wikimedia.org/T137224 - - ### Directives - - # logging - LogLevel warn - ErrorLog /var/log/apache2/git.wikimedia.org_error.log - CustomLog /var/log/apache2/git.wikimedia.org_access.log wmf - ServerSignature Off - - # don't decode "%2F" in URL to "/" - AllowEncodedSlashes NoDecode - - # allow URL rewriting - RewriteEngine On - - ### Static links - - # home page - RewriteRule ^/$ https://phabricator.wikimedia.org/diffusion [L,R=301] - - # searches & lists - RewriteRule ^/activity/?$ https://phabricator.wikimedia.org/diffusion/query/active/ [L,R=301] - RewriteRule ^/lucene/?$ https://phabricator.wikimedia.org/diffusion/query/advanced/ [L,R=301] - RewriteRule ^/(projects|repositories)/?$ https://phabricator.wikimedia.org/diffusion/query/all/ [L,R=301] - - - ### Preformat - - # ?r=<repo/name> -> /<repo/name> - RewriteCond %{QUERY_STRING} ^(.*&)?r=([0-9A-Za-z/_\.-]+).git(&.*)?$ - RewriteRule ^/(blame|blob|commit|commitdiff|docs|history|log|patch|summary|tree)/$ /$1/%2.git [NE] - - # remove "refs%2Fheads%2F" and "refs%2Fremotes%2Forigin%2F" - RewriteRule ^(.*)refs\%2[Ff](heads|remotes\%2[Ff]origin)\%2[Ff](.*)$ $1$3 - - # <repo%2Fname> -> <repo/name> - RewriteRule ^/(blame|blob|commit|commitdiff|docs|history|log|patch|summary|tree)/([0-9A-Za-z/_\.-]+)\%2[Ff](.*)\.git(.*)$ /$1/$2/$3.git$4 [N] - - # <tag%2Fname> -> <tag%25252Fname> - RewriteRule ^/(blame|blob|commit|commitdiff|docs|history|log|patch|summary|tree)/([0-9A-Za-z/_\.-]+)\.git/([0-9A-Za-z_\.-]+)\%2[Ff]([^/]+)(.*)$ /$1/$2.git/$3\%25252F$4$5 [N] - - # <path%2Fto%2Ffile> -> <path/to/file> - RewriteRule ^/(blame|blob|commit|commitdiff|docs|history|log|patch|summary|tree)/([0-9A-Za-z/_\.-]+)\.git/([^/]+)/([0-9A-Za-z/_\.-]+)\%2[Ff]([^/]*)$ /$1/$2.git/$3/$4/$5 [N] - - - ### /commit/ - ### /commitdiff/ - ### /patch/ - - # https://git.wikimedia.org/<commit(diff)?|patch>/<repo%2Fname>.git/<commithash> - # -> https://git.wikimedia.org/<commit(diff)?|patch>/<repo/name>.git/<commithash> - # ---> https://phabricator.wikimedia.org/r/<(commit|patch)>/<repo/name>;<commithash> - RewriteRule ^/(commit|patch)(diff)?/([0-9A-Za-z/_\.-]+)\.git/([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f])$ https://phabricator.wikimedia.org/r/$1/$3;$4 [NE,L,R=301] - - - ### /blame/ - ### /blob/ - ### /docs/ - ### /history/ - ### /log/ - ### /summary/ - ### /tree/ - - # translate Gitblit actions to Diffusion actions - RewriteRule ^/(blame|blob|docs|tree)/(.*)$ /browse/$2 [NE] - RewriteRule ^/log/(.*)$ /history/$1 [NE] - RewriteRule ^/summary/(.*)$ /$1 [NE] - - # https://git.wikimedia.org/<(blame|blob|history|log|tree)>/<repo%2Fname>.git/<commithash><(/<path%2Fto%2Ffile>)?> - # -> https://git.wikimedia.org/<(blame|blob|history|log|tree)>/<repo/name>.git/<commithash><(/<path/to/file>)?> - # ---> https://phabricator.wikimedia.org/r/p/<repo/name>;<(browse|history)>/master/<(<path/to/file>)?>;<commithash> - RewriteRule ^/(browse|history)/([0-9A-Za-z/_\.-]+)\.git/([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f])(/([0-9A-Za-z/_\.-]+))?$ https://phabricator.wikimedia.org/r/p/$2;$1/master/$5;$3 [NE,L,R=301] - - # https://git.wikimedia.org/<(blame|blob|history|log|summary|tree)>/<repo%2Fname>.git<(/<tag%2Fname><(/<path%2Fto%2Ffile>)?>)?> - # -> https://git.wikimedia.org/<(blame|blob|history|log|summary|tree)/<repo/name>.git<(/<tag%25252Fname><(/<path/to/file>)?>)?> - # ---> https://phabricator.wikimedia.org/r/p/<repo/name>;<(browse|history)?><(/<tag%25252Fname><(/<path/to/file>)?>)?> - RewriteRule ^/((browse|history)(/))?([0-9A-Za-z/_\.-]+)\.git((/[^/]+)(/([0-9A-Za-z/_\.-]+))?)?$ https://phabricator.wikimedia.org/r/p/$4;$2$6$3$8 [NE,L,R=301] - - - ### Unmatched above - - # redirect all remaining requests to the Diffusion main page - RewriteRule ^.*$ https://phabricator.wikimedia.org/diffusion [L,R=301] - -</VirtualHost> diff --git a/modules/role/manifests/phabricator/main.pp b/modules/role/manifests/phabricator/main.pp index 4087f54..1bccc2d 100644 --- a/modules/role/manifests/phabricator/main.pp +++ b/modules/role/manifests/phabricator/main.pp @@ -54,7 +54,6 @@ 'events.listeners' => [], 'diffusion.allow-http-auth' => true, 'diffusion.ssh-host' => 'git-ssh.wikimedia.org', - 'gitblit.hostname' => 'git.wikimedia.org', }, } # lint:endignore -- To view, visit https://gerrit.wikimedia.org/r/296085 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e6d09e0e23b79348086d54b6bb905c6034cbbb9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits