← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to docs/configuration/options.rst

  • Committer: Henrik Ingo
  • Date: 2011-11-14 22:29:19 UTC
  • mto: This revision was merged to the branch mainline in revision 2460.
  • Revision ID: henrik.ingo@avoinelama.fi-20111114222919-vjv1rkmf1oay6ge2
Fixes to the new documentation in lp:~daniel-nichter/drizzle/7.1-docs 
as discussed / reviewed on mailing list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
docs/configuration/options.rst
23
23
``drizzled --plugin-add PLUGIN --help`` where ``PLUGIN`` is the name of any
24
24
plugin.  For example:
25
25
 
26
 
.. code-block:: bash
 
26
.. code-block:: none
27
27
 
28
28
   $ drizzled --plugin-add query_log --help
29
29
   sbin/drizzled  Ver 2011.08.25.2411 for pc-linux-gnu on i686 (Source distribution (trunk))
149
149
in this directory.)
150
150
 
151
151
A good strategy for configuring Drizzle with multiple config files is to
152
 
put :ref:`drizzled_options` in :file:`/etc/drizzle/drizzled.cnf`
 
152
put general :ref:`drizzled_options` in :file:`/etc/drizzle/drizzled.cnf`
153
153
(:file:`/etc/drizzle` is the default :option:`--config-dir` value)
154
 
and plugin options in spearate config files in
 
154
and any options related to a plugin in a separate config file in
155
155
:file:`/etc/drizzle/conf.d/`.  For example:
156
156
 
157
157
.. code-block:: bash
168
168
 
169
169
.. code-block:: ini
170
170
 
 
171
   server-id=42
 
172
   core-file
 
173
 
 
174
.. code-block:: bash
 
175
 
 
176
   $ cat /etc/drizzle/conf.d/auth-file
 
177
 
 
178
.. code-block:: ini
 
179
 
 
180
   # drizzled option to load the auth_file plugin
171
181
   plugin-remove=auth_all
172
182
   plugin-add=auth_file
173
 
 
174
 
.. code-block:: bash
175
 
 
176
 
   $ cat /etc/drizzle/conf.d/auth-file
177
 
 
178
 
.. code-block:: ini
179
 
 
 
183
   
 
184
   # Options for the plugin itself
180
185
   [auth-file]
181
186
   users=/etc/drizzle/users
182
187