Skip to content

Commit

Permalink
Changed to .yml
Browse files Browse the repository at this point in the history
  • Loading branch information
ambroisemaupate committed Feb 23, 2015
1 parent df0d551 commit 6a5f29a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions intro/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,11 @@ and to build PHP class autolader.
composer install -n --no-dev;
Then copy `conf/config.default.yaml` file to `conf/config.yaml`.
Then copy `conf/config.default.yml` file to `conf/config.yml`.

.. code-block:: bash
cp conf/config.default.yaml conf/config.yaml;
cp conf/config.default.yml conf/config.yml;
When your virtual host is ready, just go to your website to begin with the setup assistant.

Expand All @@ -154,7 +154,7 @@ if you need to setup your website on a shared hosting plan without any SSH or Gi
If you downloaded Roadiz on the `Github release <https://github.com/roadiz/roadiz/releases>`_ page or
`directly from our website <http://www.roadiz.io>`_, you should get a bundled
Zip containing every Roadiz files and Composer dependencies. We even have generated ``.htaccess`` files
and a ``conf/config.yaml`` file for you.
and a ``conf/config.yml`` file for you.

If you can unzip directly on your server, that’s cool. It will save you time,
if not, just unzip it on your desktop and upload files to your server via FTP.
Expand Down
8 changes: 4 additions & 4 deletions intro/manual_config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
Manual configuration
====================

This section explains how main configuration file ``conf/config.yaml`` works as you would find
This section explains how main configuration file ``conf/config.yml`` works as you would find
it more convenient than launching Install theme for each update.

Your ``conf/config.yaml`` file is built using YAML syntax. Each part match a Roadiz *service* configuration.
Your ``conf/config.yml`` file is built using YAML syntax. Each part match a Roadiz *service* configuration.
The most important part deals with Doctrine database credentials:

.. code-block:: yaml
Expand Down Expand Up @@ -49,7 +49,7 @@ Solr endpoint
-------------

Roadiz can use an *Apache Solr* search-engine to index nodes-sources.
Add this to your `config.yaml` to link your CMS to your *Solr* server:
Add this to your `config.yml` to link your CMS to your *Solr* server:

.. code-block:: yaml
Expand Down Expand Up @@ -87,7 +87,7 @@ Swift Mailer

Roadiz uses *Swift Mailer* to send emails. This awesome librairy is built to enable different
kinds of mail transports or protocols. By default, Roadiz uses your PHP ``sendmail`` configuration
but you can tell it to use another transport (such as SMTP) in your ``conf/config.yaml`` file.
but you can tell it to use another transport (such as SMTP) in your ``conf/config.yml`` file.

You can use *SSL*, *TLS* or no encryption at all.

Expand Down
6 changes: 3 additions & 3 deletions intro/moving.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ From this point you can install your new webserver, as described in :ref:`Instal

Then import your dump and files into your new server.

Once you’ve imported your database, you must edit manually your `conf/config.yaml`,
Once you’ve imported your database, you must edit manually your `conf/config.yml`,
you can reuse the former server’s one and adapt its database credentials.

.. warning::
**Do not perform any schema update if no *gen-src\\GeneratedNodeSources* classes is available**,
it will erase your NodesSources data as their entities files haven’t been generated yet.

When you’ve edited your ``conf/config.yaml`` file, regenerate your entities source files
When you’ve edited your ``conf/config.yml`` file, regenerate your entities source files

.. code-block:: bash
Expand Down Expand Up @@ -80,7 +80,7 @@ your SFTP connection or worst, an old FTP one. Don’t panic, it will take a lit
* If you only have FTP, you must be prepared to transfer your Roadiz folder, file-by-file. Just go get a cup of coffee.
* Once everything is copied on your production server, verify than you have the same files as on your dev-server.
* Import your database dump with phpmyadmin or pgmyadmin.
* Edit your ``conf/config.yaml`` to match your new database credentials. Enable ``devMode`` manually.
* Edit your ``conf/config.yml`` to match your new database credentials. Enable ``devMode`` manually.
* Verify that every sensitive folders contain an ``.htaccess`` file to deny access. Verify that root ``.htaccess`` file contains every informations to enable Apache url-rewriting.
* Try to connect to your website, if everything works disable ``devMode`` and enjoy your hard work.
* If it doesn’t work or display anything, read your PHP log file to understand where does the problem come from. It might be your database credentials or you PHP version that is too low. Check that your hoster has installed every needed PHP extensions, see :ref:`requirements`.

0 comments on commit 6a5f29a

Please sign in to comment.