Merge lp:~hingo/drizzle/doc-7.1-installation into lp:~drizzle-trunk/drizzle/development

Proposed by Henrik Ingo on 2012-03-09
Status: Merged
Merged at revision: 2525
Proposed branch: lp:~hingo/drizzle/doc-7.1-installation
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 269 lines (+158/-29)
3 files modified
docs/installing/redhat.rst (+121/-22)
docs/installing/requirements.rst (+16/-3)
docs/installing/ubuntu.rst (+21/-4)
To merge this branch: bzr merge lp:~hingo/drizzle/doc-7.1-installation
Reviewer Review Type Date Requested Status
Drizzle Merge Team 2012-03-09 Pending
Review via email: mp+96710@code.launchpad.net

Description of the change

Docs: Adds information about 7.1 packages and updates "tested on following distributions" section.

Sorry for the confusion and extra work: I previously posted a merge request with a branch where I had forgot to commit, so the diff was empty.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/installing/redhat.rst'
2--- docs/installing/redhat.rst 2012-02-08 21:33:04 +0000
3+++ docs/installing/redhat.rst 2012-03-09 05:44:19 +0000
4@@ -1,11 +1,21 @@
5 Installing on RedHat and Fedora
6 ===============================
7
8-Using RPMs
9-----------
10-There is a custom RedHat/Fedora repository at
11-http://rpm.drizzle.org/7-dev/ which includes everything needed
12-to install or compile Drizzle on RedHat 5 and 6 as well as Fedora 13 - 14.
13+The recommended way to install Drizzle on RedHat, CentOS and Fedora is to use
14+`yum` to install Drizzle RPM packages.
15+
16+There is a custom RedHat/Fedora repository available which includes everything
17+needed to install or compile Drizzle on RedHat 5 and 6 as well as
18+Fedora 13 - 14. For Drizzle 7, the repositories are at
19+
20+http://rpm.drizzle.org/7-dev/
21+
22+and for Drizzle 7.1 at
23+
24+http://download.drizzle.org/7.1/
25+
26+EPEL repository (RedHat only)
27+-----------------------------
28
29 A pre-requisite of this repository in RedHat is that the
30 `EPEL <http://fedoraproject.org/wiki/EPEL>`_ repository is also added to your
31@@ -15,7 +25,8 @@
32
33 The EPEL repository is not required in Fedora.
34
35-To add the EPEL repository, run one of the following commands (choose from the i386(32-bit) or x86_64(64-bit) EPEL repository package).
36+To add the EPEL repository, run one of the following commands (choose from the
37+i386(32-bit) or x86_64(64-bit) EPEL repository package).
38
39 Install EPEL Repository on 32-bit Linux 5.X:
40
41@@ -29,7 +40,28 @@
42
43 sudo rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/x86_64/epel-release-5-4.noarch.rpm
44
45-To add the Drizzle repository to your system you also need to create a /etc/yum.repos.d/drizzle.repo file with the following content:
46+Install EPEL Repository on 32-bit Linux 6.X:
47+
48+.. code-block:: bash
49+
50+ sudo rpm -Uvh http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-5.noarch.rpm
51+
52+Install EPEL Repository on 64-bit Linux 6.X:
53+
54+.. code-block:: bash
55+
56+ sudo rpm -Uvh http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-5.noarch.rpm
57+
58+
59+Adding the Drizzle 7 yum repository
60+-----------------------------------
61+
62+.. note::
63+
64+ This section provides the repositories for Drizzle 7.
65+
66+To add the Drizzle repository to your system you also need to create a
67+/etc/yum.repos.d/drizzle.repo file with the following content:
68
69 *RedHat*
70
71@@ -43,11 +75,12 @@
72
73 [drizzle-src]
74 name=drizzle-src
75- baseurl=http://rpm.drizzle.org/7-dev/redhat/$releasever/SRPMS
76+ baseurl=http://rpm.drizzle.org/7-dev/redhat/$releasever/source
77 enabled=1
78 gpgcheck=0
79
80-**$releasever** uses RHEL 5 or RHEL 6, and **$basearch** is the architecture (i386 or x86_64).
81+**$releasever** uses RHEL 5 or RHEL 6, and **$basearch** is the architecture
82+(i386 or x86_64).
83
84 *Fedora*
85
86@@ -61,17 +94,83 @@
87
88 [drizzle-src]
89 name=drizzle-src
90- baseurl=http://rpm.drizzle.org/7-dev/fedora/$releasever/SRPMS
91- enabled=1
92- gpgcheck=0
93-
94-**$releasever** uses the Fedora version (currently 13 or 14), and **$basearch** is the architecture (i386 or x86_64).
95-
96-You can then install Drizzle by running the following command:
97-
98-.. code-block:: bash
99-
100- sudo yum install drizzle-server drizzle-client
101-
102-Note: On older versions of Fedora and RHEL, the packages are named drizzle7-server and drizzle7-client.
103+ baseurl=http://rpm.drizzle.org/7-dev/fedora/$releasever/source
104+ enabled=1
105+ gpgcheck=0
106+
107+**$releasever** uses the Fedora version (currently 13 or 14), and **$basearch**
108+is the architecture (i386 or x86_64).
109+
110+You can then install Drizzle by running the following command:
111+
112+.. code-block:: bash
113+
114+ sudo yum install drizzle-server drizzle-client
115+
116+
117+Adding the Drizzle 7.1 yum repository
118+-------------------------------------
119+
120+.. note::
121+
122+ This section provides the repositories for Drizzle 7.1.
123+
124+To add the Drizzle repository to your system you also need to create a
125+/etc/yum.repos.d/drizzle.repo file with the following content:
126+
127+*RedHat*
128+
129+.. code-block:: ini
130+
131+ [drizzle]
132+ name=drizzle
133+ baseurl=http://download.drizzle.org/7.1/redhat/$releasever/$basearch/
134+ enabled=1
135+ gpgcheck=0
136+
137+ [drizzle-src]
138+ name=drizzle-src
139+ baseurl=http://download.drizzle.org/7.1/redhat/$releasever/source
140+ enabled=1
141+ gpgcheck=0
142+
143+**$releasever** uses RHEL 5 or RHEL 6, and **$basearch** is the architecture
144+(i386 or x86_64).
145+
146+*Fedora*
147+
148+.. code-block:: ini
149+
150+ [drizzle]
151+ name=drizzle
152+ baseurl=http://download.drizzle.org/7.1/fedora/$releasever/$basearch/
153+ enabled=1
154+ gpgcheck=0
155+
156+ [drizzle-src]
157+ name=drizzle-src
158+ baseurl=http://download.drizzle.org/7.1/fedora/$releasever/source
159+ enabled=1
160+ gpgcheck=0
161+
162+**$releasever** uses the Fedora version (currently 13 or 14), and **$basearch**
163+is the architecture (i386 or x86_64).
164+
165+.. note::
166+
167+ At the time of this writing, Fedora packages were not yet released for
168+ Drizzle 7.1 series.
169+
170+
171+Installation
172+------------
173+
174+You can then install Drizzle by running the following command:
175+
176+.. code-block:: bash
177+
178+ sudo yum install drizzle-server drizzle-client
179+
180+Note: In the Drizzle 7-stable repository, the packages are named
181+drizzle7-server and drizzle7-client.
182
183
184=== modified file 'docs/installing/requirements.rst'
185--- docs/installing/requirements.rst 2011-10-23 05:45:09 +0000
186+++ docs/installing/requirements.rst 2012-03-09 05:44:19 +0000
187@@ -10,13 +10,22 @@
188 because the dependencies required by Drizzle can sometimes be too old or missing
189 in some Linux distributions.
190
191-Every build of Drizzle is currently tested on:
192+Drizzle 7 was tested on:
193 * Fedora 12 through 14
194 * RedHat (or CentOS) 5 and 6
195- * Debian Squeeze (6.0)
196+ * Debian Squeeze 6.0
197 * Ubuntu 10.04 and 10.10
198 * Apple OS X 10.6.4
199
200+Drizzle 7.1 was tested on
201+ * Fedora 15
202+ * RedHat and CentOS 5 and 6
203+ * Debian Squeeze 6.0
204+ * Ubuntu 10.04 through 11.10
205+ * OpenSuse 11
206+ * FreeBSD 8.0 and 8.1
207+
208+
209 We recommend using these platforms with Drizzle. Older platforms may have various
210 unforseen difficulties when compiling and/or installing. Drizzle is tested on
211 both 32bit and 64bit platforms but we recommend using a 64bit platform.
212@@ -30,4 +39,8 @@
213 * libuuid (part of the `E2fsprogs <http://e2fsprogs.sourceforge.net/>`_ project)
214 * `zlib <http://www.zlib.net/>`_ 1.1.3-5 or higher
215
216-Our repositories for RedHat/CentOS/Fedora and for Ubuntu will provide these where required.
217+In addition, several optional plugins will depend on additional libraries, like
218+V8 for JavaScript, or clients for Memcache, Gearman, RabbitMQ, ZeroMQ...
219+
220+Our repositories for RedHat/CentOS/Fedora and for Ubuntu will provide these
221+when they are not part of the distribution repositories.
222
223=== modified file 'docs/installing/ubuntu.rst'
224--- docs/installing/ubuntu.rst 2011-10-23 05:45:09 +0000
225+++ docs/installing/ubuntu.rst 2012-03-09 05:44:19 +0000
226@@ -1,22 +1,39 @@
227 Installing on Ubuntu
228 =====================
229
230+The preferred way of installing Drizzle on Ubuntu is to use the provided deb
231+packages.
232+
233+Ubuntu 11.04 Natty Narwhal and newer comes with Drizzle .deb files in the
234+standard Ubuntu repositories. You can install Drizzle without any further
235+configuration.
236+
237 Using DEBs
238 ----------
239
240-Ubuntu 11.04 Natty Narwhal has Drizzle .deb files in the standard Ubuntu repositories.
241-For Ubuntu 10.04 LTS Lucid Lynx and Ubuntu 10.10 Maverick Meerkat there is a PPA available at
242+For Ubuntu 10.04 LTS Lucid Lynx and Ubuntu 10.10 Maverick Meerkat there is a
243+PPA with Drizzle 7 binaries at
244 https://launchpad.net/~drizzle-developers/+archive/ppa
245
246 As a first step, run the following command: ::
247
248 sudo apt-get install python-software-properties
249
250-To add the above PPA at command line: ::
251+To add the PPA: ::
252
253 sudo apt-add-repository ppa:drizzle-developers/ppa
254 sudo apt-get update
255
256-Then to install Drizzle, both the server and the client utilities: ::
257+The same PPA is also used by drizzle-developers team to publish newer versions
258+of Drizzle than what is included in Ubuntu at the time of release. For instance,
259+at the moment when this was written, Drizzle 7.1.31-rc was available for Ubuntu
260+11.10 Oneiric, which by default includes Drizzle 7 packages. Hence you can
261+use this PPA on any Ubuntu version to update to the newest available Drizzle
262+version.
263+
264+Installing
265+----------
266+
267+To install Drizzle, both the server and the client utilities: ::
268
269 sudo apt-get install drizzle