Author: jfs Date: Mon Mar 3 22:55:25 2014 New Revision: 10377 URL: http://svn.debian.org/wsvn/?sc=1&rev=10377 Log:
Apply patch provided by Paul Wise: - Apache configuration redirects call to the (old) manpages.debian.net domain to manpages.debian.org - htaccess: optional language parameters for manual page redirects. For example: http://manpages.debian.org/man/sid/es/8/aptitude is transformed into: http://manpages.debian.org/cgi-bin/man.cgi?manpath=sid&sektion=8&query=aptitude&apropos=0&locale=es and http://manpages.debian.org/es/man8/aptitude is transformed into http://manpages.debian.org/cgi-bin/man.cgi?sektion=8&query=aptitude&apropos=0&manpath=sid&locale=es Modified: man-cgi/conf/apache.conf man-cgi/conf/htaccess Modified: man-cgi/conf/apache.conf URL: http://svn.debian.org/wsvn/man-cgi/conf/apache.conf?rev=10377&op=diff ============================================================================== --- man-cgi/conf/apache.conf (original) +++ man-cgi/conf/apache.conf Mon Mar 3 22:55:25 2014 @@ -1,6 +1,4 @@ -<VirtualHost *:80> - ServerName manpages.debian.org - ServerAlias manpages.debian.net +<Macro CommonVirtualHostConfiguration> ServerAdmin [email protected] ErrorLog /srv/manpages.debian.org/manpages.debian.org-error.log @@ -8,6 +6,17 @@ # For debugging: # ErrorLog /srv/manpages.debian.org/logs/error.log # CustomLog /srv/manpages.debian.org/logs/access.log combined +</Macro> + +<VirtualHost *:80> + Use CommonVirtualHostConfiguration + ServerName manpages.debian.net + RedirectPermanent / http://manpages.debian.org/ +</VirtualHost> + +<VirtualHost *:80> + Use CommonVirtualHostConfiguration + ServerName manpages.debian.org <IfModule mod_userdir.c> UserDir disabled Modified: man-cgi/conf/htaccess URL: http://svn.debian.org/wsvn/man-cgi/conf/htaccess?rev=10377&op=diff ============================================================================== --- man-cgi/conf/htaccess (original) +++ man-cgi/conf/htaccess Mon Mar 3 22:55:25 2014 @@ -22,9 +22,9 @@ # redirections for HTML documentation # to be used when the server is running RedirectMatch 301 ^/man/([0-9ln]p?m?)/(.*$) /cgi-bin/man.cgi?sektion=$1\&query=$2\&apropos=0\&manpath=sid\&locale=en -RedirectMatch 301 ^/man([0-9ln]p?m?)/(.*$) /cgi-bin/man.cgi?sektion=$1\&query=$2\&apropos=0\&manpath=sid\&locale=en -RedirectMatch 301 ^/man/([a-z]*)/([0-9ln]p?m?)/(.*$) /cgi-bin/man.cgi?manpath=$1\&sektion=$2\&query=$3\&apropos=0\&locale=en -RedirectMatch 301 ^/man/(.*$) /cgi-bin/man.cgi?query=$1\&apropos=1\&manpath=sid\&format=html\&locale=en +RedirectMatch 301 ^/(?:([^/]+)/)?man([0-9ln]p?m?)/(.*$) /cgi-bin/man.cgi?sektion=$2\&query=$3\&apropos=0\&manpath=sid\&locale=$1 +RedirectMatch 301 ^/man/([a-z]*)/(?:([^/]+)/)?([0-9ln]p?m?)/(.*$) /cgi-bin/man.cgi?manpath=$1\&sektion=$3\&query=$4\&apropos=0\&locale=$2 +RedirectMatch 301 ^/man/(?:([^/]+)/)?(.*$) /cgi-bin/man.cgi?query=$2\&apropos=1\&manpath=sid\&format=html\&locale=$1 RedirectMatch 301 ^/index.html /cgi-bin/man.cgi -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
