projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add x86-ubc-02.d.o
[mirror/dsa-puppet.git]
/
modules
/
roles
/
templates
/
apache-www.debian.org.erb
diff --git
a/modules/roles/templates/apache-www.debian.org.erb
b/modules/roles/templates/apache-www.debian.org.erb
index
197c60c
..
c3ffd24
100644
(file)
--- a/
modules/roles/templates/apache-www.debian.org.erb
+++ b/
modules/roles/templates/apache-www.debian.org.erb
@@
-136,7
+136,6
@@
RewriteRule ^/(?!devel/website/errors/)(.*/)?404\.(.+)\.html$ /devel/website/errors/404.$2.html [L]
# the joys of backwards compatibility
RewriteRule ^/(?!devel/website/errors/)(.*/)?404\.(.+)\.html$ /devel/website/errors/404.$2.html [L]
# the joys of backwards compatibility
- RedirectPermanent /cgi-bin/cvsweb https://cvs.debian.org
RedirectPermanent /Lists-Archives https://lists.debian.org
RedirectPermanent /search https://search.debian.org
RedirectPermanent /Packages https://packages.debian.org
RedirectPermanent /Lists-Archives https://lists.debian.org
RedirectPermanent /search https://search.debian.org
RedirectPermanent /Packages https://packages.debian.org
@@
-145,6
+144,7
@@
RedirectPermanent /SPI https://www.spi-inc.org
# RedirectPermanent /OpenHardware http://www.openhardware.org
RedirectPermanent /OpenSource https://opensource.org
RedirectPermanent /SPI https://www.spi-inc.org
# RedirectPermanent /OpenHardware http://www.openhardware.org
RedirectPermanent /OpenSource https://opensource.org
+ RedirectPermanent /misc/bsd.license https://opensource.org/licenses/BSD-3-Clause
RedirectPermanent /Bugs/db/ix/pseudopackages.html /Bugs/pseudo-packages
RewriteEngine on
RedirectPermanent /Bugs/db/ix/pseudopackages.html /Bugs/pseudo-packages
RewriteEngine on
@@
-277,6
+277,10
@@
# Relocation of derivatives pages
RewriteRule ^/misc/children-distros(?:\.html)?$ /derivatives/ [R=301,L]
RewriteRule ^/misc/children-distros(\.[^\.]+(?:\.html)?)$ /derivatives/index$1 [R=301,L]
# Relocation of derivatives pages
RewriteRule ^/misc/children-distros(?:\.html)?$ /derivatives/ [R=301,L]
RewriteRule ^/misc/children-distros(\.[^\.]+(?:\.html)?)$ /derivatives/index$1 [R=301,L]
+
+# Relocation of memberships information
+ RewriteRule ^/misc/memberships(?:\.html)?$ /intro/organization$1#memberships [R=301,L]
+ RewriteRule ^/misc/memberships(\.[^\.]+(?:\.html)?)$ /intro/organization$1#memberships [R=301,L]
</Macro>
<Macro common-www.d.o>
</Macro>
<Macro common-www.d.o>