Re: Wierdness on install with new script

diff --git a/templates/pages/download/linux/debian.html b/templates/pages/download/linux/debian.html
index 96b75cf..cc064cb 100644
--- a/templates/pages/download/linux/debian.html
+++ b/templates/pages/download/linux/debian.html
@@ -41,6 +41,15 @@ version number as required):
<li>pgadmin3 - pgAdmin III graphical administration utility</li>
</ul>

+<script>
+ <!--
+ function updateSeries(select) {
+ var deb = document.getElementById('series-deb');
+ deb.innerHTML = select.value;
+ }
+ -->
+</script>
+
<h2>PostgreSQL Apt Repository</h2>
<p>
If the version included in your version of Debian is not the one you want,
@@ -52,24 +61,22 @@ updates for all supported versions of PostgreSQL throughout the support
<p>
To use the apt repository, follow these steps:
<ul>
- <li>Import the repository signing key
- <code>wget -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add -</code>
- </li>
- <li>Edit the file <i>/etc/apt/sources.list.d/pgdg.list</i>, and add a line
- for the repository, substituting the proper "codename" for your release
- <code>deb http://apt.postgresql.org/pub/repos/apt/ squeeze-pgdg main</code>
- </li>
- <li>Configure apt's package pinning to prefer the PGDG packages over the standard ones in <i>/etc/apt/preferences.d/pgdg.pref</i>
- <code>
-Package: *<br/>
-Pin: release o=apt.postgresql.org<br/>
-Pin-Priority: 500
- </code>
+ <li>Create the file <i>/etc/apt/sources.list.d/pgdg.list</i>, and add a line
+ for the repository
+ <form style="display: inline">
+ <select id="field.series" name="field.series" onChange='updateSeries(this);'>
+ <option selected="selected" value="YOUR_DEBIAN_VERSION_HERE">Choose your Debian version</option>
+ <option value="wheezy">Wheezy (7.0)</option>
+ <option value="squeeze">Squeeze (6.0)</option>
+ </select>
+ </form>
+ <code>deb http://apt.postgresql.org/pub/repos/apt/ <span id="series-deb">YOUR_DEBIAN_VERSION_HERE</span>-pgdg main</code>
</li>
- <li>Update the package lists, and install the pgdg-keyring package to automatically get repository key updates
+ <li>Import the repository signing key, and update the package lists
<code>
-sudo apt-get update<br/>
-sudo apt-get install pgdg-keyring
+wget --quiet -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | \<br/>
+&nbsp;&nbsp;sudo apt-key add -<br/>
+sudo apt-get update
</code>
</li>
</ul>
diff --git a/templates/pages/download/linux/ubuntu.html b/templates/pages/download/linux/ubuntu.html
index 664af81..a506d37 100644
--- a/templates/pages/download/linux/ubuntu.html
+++ b/templates/pages/download/linux/ubuntu.html
@@ -43,40 +43,42 @@ version number as required):
<li>pgadmin3 - pgAdmin III graphical administration utility</li>
</ul>

+<script>
+ <!--
+ function updateSeries(select) {
+ var deb = document.getElementById('series-deb');
+ deb.innerHTML = select.value;
+ }
+ -->
+</script>
+
<h2>PostgreSQL Apt Repository</h2>
<p>
-If the version included in your version of Debian is not the one you want,
+If the version included in your version of Ubuntu is not the one you want,
you can use the PostgreSQL Apt Repository. This repository will integrate
with your normal systems and patch management, and provide automatic
updates for all supported versions of PostgreSQL throughout the support
<a href="/support/versioning/">lifetime</a> of PostgreSQL.
</p>
<p>
-Not all Ubuntu releases are currently supported in the apt repository. For
-an up to date list of supported releases, please see the apt page on
-<a href="http://wiki.postgresql.org/wiki/Apt">the wiki</a>.
-</p>
-<p>
To use the apt repository, follow these steps:
<ul>
- <li>Import the repository signing key
- <code>wget -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add -</code>
- </li>
- <li>Edit the file <i>/etc/apt/sources.list.d/pgdg.list</i>, and add a line
- for the repository, substituting the proper "codename" for your release
- <code>deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main</code>
- </li>
- <li>Configure apt's package pinning to prefer the PGDG packages over the standard ones in <i>/etc/apt/preferences.d/pgdg.pref</i>
- <code>
-Package: *<br/>
-Pin: release o=apt.postgresql.org<br/>
-Pin-Priority: 500
- </code>
+ <li>Create the file <i>/etc/apt/sources.list.d/pgdg.list</i>, and add a line
+ for the repository
+ <form style="display: inline">
+ <select id="field.series" name="field.series" onChange='updateSeries(this);'>
+ <option selected="selected" value="YOUR_UBUNTU_VERSION_HERE">Choose your Ubuntu version</option>
+ <option value="precise">Precise (12.04)</option>
+ <option value="lucid">Lucid (10.04)</option>
+ </select>
+ </form>
+ <code>deb http://apt.postgresql.org/pub/repos/apt/ <span id="series-deb">YOUR_UBUNTU_VERSION_HERE</span>-pgdg main</code>
</li>
- <li>Update the package lists, and install the pgdg-keyring package to automatically get repository key updates
+ <li>Import the repository signing key, and update the package lists
<code>
-sudo apt-get update<br/>
-sudo apt-get install pgdg-keyring
+wget --quiet -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | \<br/>
+&nbsp;&nbsp;sudo apt-key add -<br/>
+sudo apt-get update
</code>
</li>
</ul>

Christoph
--
cb(at)df7cb(dot)de | http://www.df7cb.de/

On Tue, Mar 5, 2013 at 3:36 PM, Christoph Berg <cb(at)df7cb(dot)de> wrote:
> diff --git a/templates/pages/download/linux/debian.html b/templates/pages/download/linux/debian.html

Any chance you can provide this as an attachment instead? To make sure
line endings and friends aren't messed up..

--
Magnus Hagander
Me: http://www.hagander.net/
Work: http://www.redpill-linpro.com/

Re: Magnus Hagander 2013-03-05 <CABUevExP_rY3CPac_Q6F=BZL7cpA-Fjd1LRHhmTpov0aVtiO0A(at)mail(dot)gmail(dot)com>
> Any chance you can provide this as an attachment instead? To make sure
> line endings and friends aren't messed up..

Here it is.

Christoph
--
cb(at)df7cb(dot)de | http://www.df7cb.de/

On Wed, Mar 6, 2013 at 11:14 AM, Christoph Berg <cb(at)df7cb(dot)de> wrote:
> Re: Magnus Hagander 2013-03-05 <CABUevExP_rY3CPac_Q6F=BZL7cpA-Fjd1LRHhmTpov0aVtiO0A(at)mail(dot)gmail(dot)com>
>> Any chance you can provide this as an attachment instead? To make sure
>> line endings and friends aren't messed up..
>
> Here it is.

Applied with minor modifications, sorry about the delay. It'll take a
while for it to show up, but it's on it's way.

--
Magnus Hagander
Me: http://www.hagander.net/
Work: http://www.redpill-linpro.com/

On Thu, Mar 7, 2013 at 09:44:06PM +0100, Magnus Hagander wrote:
> On Wed, Mar 6, 2013 at 11:14 AM, Christoph Berg <cb(at)df7cb(dot)de> wrote:
> > Re: Magnus Hagander 2013-03-05 <CABUevExP_rY3CPac_Q6F=BZL7cpA-Fjd1LRHhmTpov0aVtiO0A(at)mail(dot)gmail(dot)com>
> >> Any chance you can provide this as an attachment instead? To make sure
> >> line endings and friends aren't messed up..
> >
> > Here it is.
>
> Applied with minor modifications, sorry about the delay. It'll take a
> while for it to show up, but it's on it's way.

Nice. I like the drop-down Debian version list.

--
Bruce Momjian <bruce(at)momjian(dot)us> http://momjian.us
EnterpriseDB http://enterprisedb.com

+ It's impossible for everything to be true. +

Re: Josh Berkus 2013-05-17 <5196A185(dot)7000501(at)agliodbs(dot)com>
> Martin, Christoph,
>
> I'm trying the new apt.postgresql.org.sh script, and I get the following
> wierdness when I actually install Postgres:
>
> Configuration file `/etc/apt/trusted.gpg.d/apt.postgresql.org.gpg'
> ==> File on system created by you or by a script.
> ==> File also in package provided by package maintainer.
> What would you like to do about it ? Your options are:
> Y or I : install the package maintainer's version
> N or O : keep your currently-installed version
> D : show the differences between the versions
> Z : start a shell to examine the situation
> The default action is to keep your current version.
> *** apt.postgresql.org.gpg (Y/I/N/O/D/Z) [default=N] ?
>
> Doesn't seem to cause any actual problems, but not something I've seen
> before.

Hi Josh,

this is already fixed in a new version of pgdg-keyring which doesn't
create this file as a dpkg "conffile" anymore. I just forgot to upload
the new version - will do so shortly. Thanks for the notice.

Christoph
--
cb(at)df7cb(dot)de | http://www.df7cb.de/