diff options
Diffstat (limited to 'docs/en')
| -rw-r--r-- | docs/en/install.rst | 29 | ||||
| -rw-r--r-- | docs/en/upgrade.rst | 64 |
2 files changed, 71 insertions, 22 deletions
diff --git a/docs/en/install.rst b/docs/en/install.rst index 1bb5771..59884b7 100644 --- a/docs/en/install.rst +++ b/docs/en/install.rst @@ -5,15 +5,18 @@ Installation ============ :Author: Étienne Loks -:date: 2013-02-01 +:date: 2013-03-16 :Copyright: CC-BY 3.0 This document presents the installation of Chimère. -It has been updated for version 2.0.0. Prerequisites ************* +If you want to install the Chimère package for Debian Wheezy dependencies are +managed by the package. +You can go to the next section of the documentation. + - `Apache <http://www.apache.org/>`_ version 2.x - `Python <http://www.python.org/>`_ versions 2.6 or 2.7 - `Django <http://www.djangoproject.com/>`_ >= version 1.4 @@ -103,6 +106,23 @@ Choose a path to install your Chimère:: INSTALL_PATH=/var/local/django mkdir $INSTALL_PATH +From Debian package ++++++++++++++++++++ + +If you want to install the last stable version of Chimère +and your system is under Debian Wheezy it is wise to use +Chimère Debian packages. + +You can install Chimère this way. + +.. code-block:: bash + + # add Chimère repository + echo "deb http://debian.peacefrogs.net wheezy main" >> /etc/apt/sources.list + apt-get update + # install + apt-get install python-django-chimere + From an archive +++++++++++++++ @@ -131,11 +151,12 @@ From the Git repository Another solution is to get it from the Git repository:: + CHIMERE_LOCALNAME=mychimere + CHIMERE_BRANCH=v2.0 # choose v2.0 for stable ou master for bleeding edge cd $INSTALL_PATH git clone git://www.peacefrogs.net/git/chimere cd chimere - git tag -l # list tagged versions - git checkout v2.0 # checkout the desired version + git checkout origin/$CHIMERE_BRANCH Creating a custom project template diff --git a/docs/en/upgrade.rst b/docs/en/upgrade.rst index d0eaa4c..7ed2a3f 100644 --- a/docs/en/upgrade.rst +++ b/docs/en/upgrade.rst @@ -5,11 +5,10 @@ Upgrade ======= :Author: Étienne Loks -:date: 2013-02-01 +:date: 2013-03-16 :Copyright: CC-BY 3.0 This document presents the upgrade of Chimère. -It has been updated for version 2.0.0. .. Warning:: Before any upgrade backup the database and all your installation files @@ -34,6 +33,10 @@ The instructions are given for Debian Squeeze and Debian Wheezy. Getting new versions of dependencies ------------------------------------ +If you want to install the Chimère package for Debian Wheezy dependencies are +managed by the package. +You can go to the next section of the documentation. + Version 1.1 -> 1.2 ****************** @@ -71,19 +74,15 @@ If you are planning to do major import consider the install of `Celery Getting the new sources ----------------------- -First of all you have to get the new version of the source code. -For the upgrade process, the source code has to be from the Git -repository. - To simplify further instructions, some environment variables are initialized. .. code-block:: bash CHIMERE_PATH=/srv/chimere - CHIMERE_TAG=v1.2.0 # version 1.1 -> 1.2 - CHIMERE_TAG=v2.0-RC3 # version 1.2 -> 2.0 - CHIMERE_TAG=master # version 2.0 -> master + CHIMERE_BRANCH=v1.2 # version 1.1 -> 1.2 + CHIMERE_BRANCH=v2.0 # version 1.2 -> 2.0 + CHIMERE_BRANCH=master # version 2.0 -> master CHIMERE_LOCALNAME=mychimere Your local name is used for the name of your local Git branch and the Python @@ -92,21 +91,49 @@ it must be at least one letter and can have a string of numbers, letters and underscores ("_") to any length. Don't begin the name by "_" because it has special significance in Python. +From Debian package +******************* + +If you want to install the last stable version of Chimère +and your system is under Debian Wheezy it is wise to use +Chimère Debian packages. + +If you have a previous installation from sources remove +all chimère libraries but **keep** your project dir. + +.. code-block:: bash + + rm -rf $CHIMERE_PATH/chimere + +Then you can install Chimère. + +.. code-block:: bash + + # add Chimère repository + echo "deb http://debian.peacefrogs.net wheezy main" >> /etc/apt/sources.list + apt-get update + # install + apt-get install python-django-chimere + + +Installation from sources +************************* + +First of all you have to get the new version of the source code. +For the upgrade process, the source code has to be from the Git +repository. + From a previous Git installation -******************************** +++++++++++++++++++++++++++++++++ .. code-block:: bash cd $CHIMERE_PATH - git checkout -b $CHIMERE_LOCALNAME # only if you haven't created yet a local branch git stash # if you have uncommited changes - git checkout master - git pull - git checkout $CHIMERE_LOCALNAME - git rebase $CHIMERE_TAG + git checkout origin/$CHIMERE_BRANCH -b $CHIMERE_LOCALNAME From a previous tarball installation -************************************ +++++++++++++++++++++++++++++++++++++ First remove your old installation and get the Git version: @@ -117,8 +144,7 @@ First remove your old installation and get the Git version: rm -rf $CHIMERE_PATH git clone git://www.peacefrogs.net/git/chimere cd chimere - git checkout $CHIMERE_TAG - git checkout -b $CHIMERE_LOCALNAME + git checkout origin/$CHIMERE_BRANCH -b $CHIMERE_LOCALNAME Update basic settings @@ -283,6 +309,8 @@ Version 2.0 -> master cd $CHIMERE_APP_PATH ./manage.py syncdb + # les migrations ont été réinitialisées + ./manage.py migrate chimere --delete-ghost-migrations --fake 0001 ./manage.py migrate chimere Update translations |