From a971dad44ffd0b01eff21ff3ce14738c14d8aa6f Mon Sep 17 00:00:00 2001 From: kusztel Date: Fri, 9 Jun 2017 13:27:00 +0200 Subject: [PATCH 1/2] EZEE-1489 - install.md update Updated naming and links to Confluence. --- INSTALL.md | 28 ++++++++++++++-------------- app/config/parameters.yml.dist | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 6c0f92eee6..0f0d90f509 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -8,7 +8,7 @@ https://doc.ez.no/display/DEVELOPER/Step+1%3A+Installation ## Terms for future reference: - * `//`: The filesystem path where eZ Studio is installed in. + * `//`: The filesystem path where eZ Platform Enterprise Edition is installed in. Examples: `/home/myuser/www/` or `/var/sites//` * cli: command line interface. For *Linux/BSD/OS X* specific commands, use of `bash` or similar is assumed. @@ -21,13 +21,13 @@ https://doc.ez.no/display/DEVELOPER/Step+1%3A+Installation - Create Database: Installation will ask you for credentials/details for which database to use, example with mysql: `CREATE DATABASE CHARACTER SET utf8;` *Note: Right now installer only supports MySQL and MariaDB, Postgres support will be (re)added in one of the upcoming releases.* - Set php.ini memory_limit=256M before running commands below - - *Optional:* You can also setup Solr to be used by eZ Studio and take note of the url it is accessible on + - *Optional:* You can also setup Solr to be used by eZ Platform Enterprise Edition and take note of the url it is accessible on ## Install -1. **Install/Extract eZ Studio**: +1. **Install/Extract eZ Platform Enterprise Edition**: - There are two ways to install eZ Studio described below, what is common is that you should make sure + There are two ways to install eZ Platform Enterprise Edition described below, what is common is that you should make sure relevant settings are generated into `app/config/parameters.yml` as a result of this step. `parameters.yml` contains settings for your database, mail system, and optionally [Solr](http://lucene.apache.org/solr/) @@ -36,7 +36,7 @@ https://doc.ez.no/display/DEVELOPER/Step+1%3A+Installation A. **Extract archive** (tar/zip) Download archive from [support.ez.no/Downloads](https://support.ez.no/Downloads/), __not from GitHub__ *(those are for composer)*. - Extract the eZ Studio archive to a directory, then execute post install scripts: + Extract the eZ Enterprise Edition archive to a directory, then execute post install scripts: *Note: The post install scripts will ask you to fill in some settings, including database settings.* @@ -48,21 +48,21 @@ https://doc.ez.no/display/DEVELOPER/Step+1%3A+Installation B. **Install via Composer** - If you have a eZ Enterprise Subscription and [have setup composer authentication tokens](https://doc.ez.no/display/TECHDOC/Using+Composer), you can get eZ Studio using composer with the following commands: + If you have a eZ Enterprise Subscription and [have setup composer authentication tokens](https://doc.ez.no/display/DEVELOPER/Using+Composer), you can get eZ using composer with the following commands: *Note: composer will take its time to download all libraries and when done you will be asked to fill in some settings, including database settings.* ```bash $ curl -sS https://getcomposer.org/installer | php $ php -d memory_limit=-1 composer.phar create-project --no-dev ezsystems/ezplatform-ee - $ cd /ezstudio/ + $ cd /ezplatform-ee/ ``` Arguments *(also see `php composer.phar create-project -h`)*: - ``: Distribution to install, `ezsystems/ezplatform` is a clean installs of eZ Platform, others: - `ezsystems/ezplatform-demo`: Adds a demo site as an example of eZ Platform web site. - - `ezsystems/ezstudio`: Commercial flavour that adds additional capabilities, see [ezstudio.com](http://ezstudio.com/). - - ``: Folder to extract to, if omitted same as package name so in example: `ezstudio`. + - `ezsystems/ezplatform-ee`: Commercial flavour that adds additional capabilities, see [ez.no/Products/eZ-Platform-Enterprise-Edition](https://ez.no/Products/eZ-Platform-Enterprise-Edition). + - ``: Folder to extract to, if omitted same as package name so in example: `ezplatform-ee`. - ``: Optional, *when omitted you'll get latest stable*. Examples: - `~1.3.0`: To pick latests 1.3 release, to pick latests 1.x release use `~1.3`. - `v1.1.0` : To pick a specific tag, could also have been `v1.0.0-rc1` @@ -152,13 +152,13 @@ https://doc.ez.no/display/DEVELOPER/Step+1%3A+Installation 3. **Run installation command**: - You may now complete the eZ Studio installation with ezplatform:install command, example of use: + You may now complete the eZ Platform Enterprise Edition installation with ezplatform:install command, example of use: ```bash $ php -d memory_limit=-1 app/console ezplatform:install --env=prod studio-clean ``` - **Note**: Password for the generated `admin` user is `publish`, this name and password is needed when you would like to login to backend UI. Future versions will prompt you for a unique password during installation. + **Note**: Password for the generated `admin` user is `publish`, this name and password is needed when you would like to login to backend UI. 4. **Configure a VirtualHost**: @@ -167,10 +167,10 @@ https://doc.ez.no/display/DEVELOPER/Step+1%3A+Installation Configure virtual host by either taking examples from [Nginx](doc/nginx) or [Apache2](doc/apache2) documentation, or by using provided script to generate from templates, for help see `./bin/vhost.sh -h`, example: ```bash - ./bin/vhost.sh --basedir=/var/www/ezstudio \ + ./bin/vhost.sh --basedir=/var/www/ezplatform-ee \ --template-file=doc/apache2/vhost.template \ - --host-name=ezstudio \ - | sudo tee /etc/apache2/sites-enabled/ezstudio.conf > /dev/null + --host-name=ezplatform-ee \ + | sudo tee /etc/apache2/sites-enabled/ezplatform-ee.conf > /dev/null ``` Check and adapt the generated vhost config, and then restart Apache or Nginx. diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index d14b421ef2..7b1f59cfbf 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -8,6 +8,6 @@ parameters: database_driver: pdo_mysql database_host: localhost database_port: ~ - database_name: ezstudio + database_name: ezplatform-ee database_user: root database_password: From 2f6d341e6273a697bae7f0aea7284b526dde5e39 Mon Sep 17 00:00:00 2001 From: kusztel Date: Fri, 9 Jun 2017 13:56:45 +0200 Subject: [PATCH 2/2] EZEE-1489 - install.md update Hyphen to underscore in parameters.yml.dist --- app/config/parameters.yml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 7b1f59cfbf..e3720ea243 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -8,6 +8,6 @@ parameters: database_driver: pdo_mysql database_host: localhost database_port: ~ - database_name: ezplatform-ee + database_name: ezplatform_ee database_user: root database_password: