The following commit has been merged in the ubuntu-master branch:
commit 8f54e140a48581621fcc7f8b5636064bf43fa894
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Wed Feb 20 00:15:30 2008 +0100
[UBUNTU] This site is packages.ubuntu.com now
diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 8e8e2cc..c79e41e 100644
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -136,16 +136,16 @@
</VirtualHost>
-#<VirtualHost *>
-# ServerAdmin [EMAIL PROTECTED]
-# DocumentRoot %TOPDIR%/www/
-# ServerName packages.ubuntu.net
-# ServerAlias packages.ubuntulinux.org
-# ErrorLog /var/log/apache2/%SITE%-error.log
-# CustomLog /var/log/apache2/%SITE%-access.log combined
-#
-# ScriptAlias /cgi-bin %TOPDIR%/cgi-bin/
-#
-# RedirectMatch permanent (.*) http://%SITE%$1
-#</VirtualHost>
+<VirtualHost *>
+ ServerAdmin [EMAIL PROTECTED]
+ DocumentRoot %TOPDIR%/www/
+ ServerName packages.ubuntu.net
+ ServerAlias packages.ubuntulinux.org
+ ErrorLog /var/log/apache2/%SITE%-error.log
+ CustomLog /var/log/apache2/%SITE%-access.log combined
+
+ ScriptAlias /cgi-bin %TOPDIR%/cgi-bin/
+
+ RedirectMatch permanent (.*) http://%SITE%$1
+</VirtualHost>
diff --git a/setup-site.conf b/setup-site.conf
index 4cf4502..3537636 100644
--- a/setup-site.conf
+++ b/setup-site.conf
@@ -1,2 +1,2 @@
-topdir=/srv/packages.ubuntu.com-new
-site=packages2.ubuntu.lichtenheld.net
+topdir=/srv/packages.ubuntu.com
+site=packages.ubuntu.com
diff --git a/static/index.tmpl b/static/index.tmpl
index 2b609ba..8932134 100644
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@ -129,6 +129,16 @@ Display:
<hr>
<h2>News</h2>
<dl>
+<dt>2008-02-19</dt>
+<dd>
+<p>Switched packages.ubuntu.com to the newer codebase that also runs
+on packages.debian.org. The two most important changes for users
+are that most pages are now generated dynamically (which makes
+for faster updates and more flexibility) and that the search
+functions should be much faster now.
+<p>Still waiting for a volunteer that optimizes the used stylesheets,
+I myself have not much talent in this area...
+</dd>
<dt>2007-10-21</dt>
<dd>
Add hardy.
diff --git a/templates/config.tmpl b/templates/config.tmpl
index 9b71c47..8cc3a27 100644
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -5,7 +5,7 @@
organisation = 'Ubuntu'
homepage = 'http://www.ubuntu.com/'
- packages_homepage = 'http://packages.ubuntu.lichtenheld.net/'
+ packages_homepage = 'http://packages.ubuntu.com/'
searchformurl = packages_homepage
search_url = '/'
tags_url = 'http://debtags.alioth.debian.org/'
@@ -52,7 +52,9 @@
[%-
# possible values for importance: high, normal, low
sitewidemsg = { importance => "high",
- txt => g('Please note that this is an experimental version
of <a href="http://%s/">%s</a>. Errors and obsolete information should be
expected', 'packages.ubuntu.com', 'packages.ubuntu.com') }
+ txt => 'Site switched to completly new codebase. Please
report any problems.' }
+# sitewidemsg = { importance => "high",
+# txt => g('Please note that this is an experimental version
of <a href="http://%s/">%s</a>. Errors and obsolete information should be
expected', 'packages.ubuntu.com', 'packages.ubuntu.com') }
-%]
[%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
[%- USE num = Number.Format( decimal_point => g('.'),
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]