summaryrefslogtreecommitdiffstats
path: root/doc/appendix/files/mysql.txt
diff options
context:
space:
mode:
authorFabian Affolter <fabian@bernewireless.net>2010-12-13 23:26:31 +0100
committerFabian Affolter <fabian@bernewireless.net>2010-12-13 23:26:31 +0100
commit875aefd9beb9e7fd464348c0e0fa42896dc329ff (patch)
tree6c9920648f7c56a9a5854c1dafa474d8e8139508 /doc/appendix/files/mysql.txt
parentf5792d907e357c90624ec110d908d42b94296a12 (diff)
parent71bb583ac04ff1c52e03d69a91bbb508783566f8 (diff)
downloadbcfg2-875aefd9beb9e7fd464348c0e0fa42896dc329ff.tar.gz
bcfg2-875aefd9beb9e7fd464348c0e0fa42896dc329ff.tar.bz2
bcfg2-875aefd9beb9e7fd464348c0e0fa42896dc329ff.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'doc/appendix/files/mysql.txt')
-rw-r--r--doc/appendix/files/mysql.txt17
1 files changed, 6 insertions, 11 deletions
diff --git a/doc/appendix/files/mysql.txt b/doc/appendix/files/mysql.txt
index ae4a1450b..81104ec17 100644
--- a/doc/appendix/files/mysql.txt
+++ b/doc/appendix/files/mysql.txt
@@ -1,10 +1,10 @@
.. -*- mode: rst -*-
-.. _getting_started-mysql:
+.. _appendix-files-mysql:
.. Author: Patrick Ruckstuhl
-Mysql example
+MySQL example
=============
I had some time ago to continue with putting my configuration into
@@ -15,8 +15,8 @@ I added a new bundle:
.. code-block:: xml
<Bundle name="mysql-server" version="3.0">
- <ConfigFile name="/root/bcfg2-install/mysql/users.sh"/>
- <ConfigFile name="/root/bcfg2-install/mysql/users.sql"/>
+ <Path name="/root/bcfg2-install/mysql/users.sh"/>
+ <Path name="/root/bcfg2-install/mysql/users.sql"/>
<PostInstall name="/root/bcfg2-install/mysql/users.sh"/>
<Package name="mysql-server-4.1"/>
<Service name="mysql"/>
@@ -34,18 +34,14 @@ The ``users.sh`` script looks like this:
On debian there is a user account in ``/etc/mysql/debian.cnf``
automatically created, but you could also (manually) create a
user in the database that has enough permissions and add the
-login information in a file yourself. This file looks like this:
-
-.. code-block:: sh
+login information in a file yourself. This file looks like this::
[client]
host = localhost
user = debian-sys-maint
password = XXXXXXXXXX
-The ``users.sql`` looks like this:
-
-.. code-block:: sh
+The ``users.sql`` looks like this::
DELETE FROM db;
INSERT INTO db VALUES ('localhost', 'phpmyadmin', 'pma', 'Y', 'Y',
@@ -60,4 +56,3 @@ The ``users.sql`` looks like this:
'N', 'N', 'N', '', '', '', '', 0, 0, 0);
FLUSH PRIVILEGES;
-