diff --git a/doc/source/conf.py b/doc/source/conf.py index f64aa49a73..db89177aa7 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -42,7 +42,7 @@ master_doc = 'index' # General information about the project. project = u'OpenStack Project Infrastructure' -copyright = u'2012, OpenStack Infastructure Team - see git repo for details' +copyright = u'2012-2013, OpenStack Infastructure Team - see git repo for details' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/doc/source/gerrit.rst b/doc/source/gerrit.rst index 404da5d0d7..6bf3a309c5 100644 --- a/doc/source/gerrit.rst +++ b/doc/source/gerrit.rst @@ -47,34 +47,8 @@ host for use by the OpenStack project. Install MySQL ------------- -You should setup MySQL as follows, changing 'secret' to a suitable password: -.. code-block:: bash - - mysql -u root -p - -.. code-block:: mysql - - CREATE USER 'gerrit2'@'localhost' IDENTIFIED BY 'secret'; - CREATE DATABASE reviewdb; - ALTER DATABASE reviewdb charset=latin1; - GRANT ALL ON reviewdb.* TO 'gerrit2'@'localhost'; - FLUSH PRIVILEGES; - -Then create the gerrit2 system user as follows: - -.. code-block:: bash - - sudo useradd -mr gerrit2 - sudo chsh gerrit2 -s /bin/bash - sudo su - gerrit2 - -With Gerrit 2.2.2 onwards edit /etc/mysql/my.cnf with the following: - -.. code-block:: ini - - [mysqld] - default-storage-engine=INNODB +Basic configuration of MySQL is handled via puppet. Install Gerrit --------------