Permalink
Browse files

Simplify debian/ubuntu download instructions

Mainly by Christoph Berg, with some cleanups from me.
  • Loading branch information...
mhagander committed Mar 7, 2013
1 parent 5e57382 commit 05cbfd38e8cc9c85a8955ffd26711f816dfe8c2e
Showing with 89 additions and 40 deletions.
  1. +42 −0 media/keys/ACCC4CF8.asc
  2. +23 −17 templates/pages/download/linux/debian.html
  3. +24 −23 templates/pages/download/linux/ubuntu.html
View
@@ -0,0 +1,42 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+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
+VPZ67j5UMxqtT/Y4+NHcQGgwF/1i
+=Iugu
+-----END PGP PUBLIC KEY BLOCK-----
@@ -26,7 +26,6 @@ <h2>Included in distribution</h2>
<code>
apt-get install postgresql-9.1
</code>
-</p>
<p>
The repository contains many different packages including third party
addons. The most command and important packages are (substitute the
@@ -41,6 +40,15 @@ <h2>Included in distribution</h2>
<li>pgadmin3 - pgAdmin III graphical administration utility</li>
</ul>
+<script type="text/javascript">
+ <!--
+ 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,
@@ -51,29 +59,27 @@ <h2>PostgreSQL Apt Repository</h2>
</p>
<p>
To use the apt repository, follow these steps:
+</p>
<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>
+ <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>
</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>Create the file <i>/etc/apt/sources.list.d/pgdg.list</i>, and add a line
+ for the repository
+ <code>deb http://apt.postgresql.org/pub/repos/apt/ <span id="series-deb">YOUR_DEBIAN_VERSION_HERE</span>-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>
+ <li>Import the repository signing key, and update the package lists
<code>
-Package: *<br/>
-Pin: release o=apt.postgresql.org<br/>
-Pin-Priority: 500
- </code>
- </li>
- <li>Update the package lists, and install the pgdg-keyring package to automatically get repository key updates
- <code>
-sudo apt-get update<br/>
-sudo apt-get install pgdg-keyring
+wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \<br/>
+&nbsp;&nbsp;sudo apt-key add -<br/>
+sudo apt-get update
</code>
</li>
</ul>
-</p>
<p>
For more information about the apt repository, including answers to frequent
questions, please see the apt page on
@@ -28,7 +28,6 @@ <h2>Included in distribution</h2>
<code>
apt-get install postgresql-9.1
</code>
-</p>
<p>
The repository contains many different packages including third party
addons. The most command and important packages are (substitute the
@@ -43,44 +42,46 @@ <h2>Included in distribution</h2>
<li>pgadmin3 - pgAdmin III graphical administration utility</li>
</ul>
+<script type="text/javascript">
+ <!--
+ 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:
+</p>
<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>
+ <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>
</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>Create the file <i>/etc/apt/sources.list.d/pgdg.list</i>, and add a line
+ for the repository
+ <code>deb http://apt.postgresql.org/pub/repos/apt/ <span id="series-deb">YOUR_UBUNTU_VERSION_HERE</span>-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>
+ <li>Import the repository signing key, and update the package lists
<code>
-Package: *<br/>
-Pin: release o=apt.postgresql.org<br/>
-Pin-Priority: 500
- </code>
- </li>
- <li>Update the package lists, and install the pgdg-keyring package to automatically get repository key updates
- <code>
-sudo apt-get update<br/>
-sudo apt-get install pgdg-keyring
+wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \<br/>
+&nbsp;&nbsp;sudo apt-key add -<br/>
+sudo apt-get update
</code>
</li>
</ul>
-</p>
<p>
For more information about the apt repository, including answers to frequent
questions, please see the apt page on

0 comments on commit 05cbfd3

Please sign in to comment.