Merge branch 'master' of https://github.com/monarc-project/MonarcAppFO

* 'master' of https://github.com/monarc-project/MonarcAppFO:
  Fixed indentiation in installation guides.
  Updates install guides for Ubuntu 18.04 and Debian 10.
  bumped version number in VERSION.json

INSTALL/INSTALL.debian10.md

@@ -5,30 +5,30 @@ Installation on Debian 10
 
 ## 1.1. Install system dependencies
 
-    $ sudo apt-get install zip unzip git gettext curl gsfonts software-properties-common
+    # apt-get install zip unzip git gettext curl gsfonts software-properties-common
 
 Some might already be installed.
 
 ## 1.2. Install MariaDB
 
-    $ sudo apt-get install mariadb-server
+    # apt-get install mariadb-server
 
 ### Secure the MariaDB installation
 
-    $ sudo mysql_secure_installation
+    # mysql_secure_installation
 
 Especially by setting a strong root password.
 
 ## 1.3. Install Apache2
 
-    $ sudo apt-get install apache2
+    # apt-get install apache2
 
 ### Enable modules, settings, and default of SSL in Apache
 
-    $ sudo a2dismod status
+    # a2dismod status
-    $ sudo a2enmod ssl
+    # a2enmod ssl
-    $ sudo a2enmod rewrite
+    # a2enmod rewrite
-    $ sudo a2enmod headers
+    # a2enmod headers
 
 ### Apache Virtual Host
 
@@ -56,14 +56,14 @@ Especially by setting a strong root password.
 
 ## 1.4. Install PHP and dependencies
 
-    $ sudo apt-get install php7.3 libapache2-mod-php7.3 php7.3-curl php7.3-gd php7.3-mysql php-apcu php7.3-xml php7.3-mbstring php7.3-intl php-imagick php7.3-zip
+    # apt-get install php7.3 libapache2-mod-php7.3 php7.3-curl php7.3-gd php7.3-mysql php-apcu php7.3-xml php7.3-mbstring php7.3-intl php-imagick php7.3-zip
 
     $ curl -sS https://getcomposer.org/installer -o composer-setup.php
-    $ sudo php composer-setup.php --install-dir=/usr/bin --filename=composer
+    # php composer-setup.php --install-dir=/usr/bin --filename=composer
 
 ## 1.5 Apply all changes
 
-    $ sudo systemctl restart apache2.service
+    # systemctl restart apache2.service
 
 
 
@@ -120,9 +120,9 @@ There are 2 parts:
 
 With the root MariaDB user create a new user for MONARC:
 
-MariaDB [(none)]> CREATE USER 'monarc'@'%' IDENTIFIED BY 'password';
+    MariaDB [(none)]> CREATE USER 'monarc'@'%' IDENTIFIED BY 'password';
-MariaDB [(none)]> GRANT ALL PRIVILEGES ON * . * TO 'monarc'@'%';
+    MariaDB [(none)]> GRANT ALL PRIVILEGES ON * . * TO 'monarc'@'%';
-MariaDB [(none)]> FLUSH PRIVILEGES;
+    MariaDB [(none)]> FLUSH PRIVILEGES;
 
 ### Create 2 databases
 
@@ -178,8 +178,8 @@ And configure the database connection:
 Install Grunt:
 
     $ curl -sL https://deb.nodesource.com/setup_13.x | sudo bash -
-    $ sudo apt-get install nodejs
+    # apt-get install nodejs
-    $ npm install -g grunt-cli
+    # npm install -g grunt-cli
 
 then update MONARC:
 

INSTALL/INSTALL.ubuntu1804.md

@@ -111,6 +111,14 @@ There are 2 parts:
 
 ## 2.2. Databases
 
+### Create a MariaDB user for MONARC
+
+With the root MariaDB user create a new user for MONARC:
+
+    MariaDB [(none)]> CREATE USER 'monarc'@'%' IDENTIFIED BY 'password';
+    MariaDB [(none)]> GRANT ALL PRIVILEGES ON * . * TO 'monarc'@'%';
+    MariaDB [(none)]> FLUSH PRIVILEGES;
+
 ### Create 2 databases
 
 In your MariaDB interpreter:
@@ -124,8 +132,8 @@ In your MariaDB interpreter:
 
 ### Initializes the database
 
-    $ mysql -u user monarc_common < db-bootstrap/monarc_structure.sql
+    $ mysql -u monarc -ppassword monarc_common < db-bootstrap/monarc_structure.sql
-    $ mysql -u user monarc_common < db-bootstrap/monarc_data.sql
+    $ mysql -u monarc -ppassword monarc_common < db-bootstrap/monarc_data.sql
 
 ### Database connection
 
@@ -141,16 +149,16 @@ And configure the database connection:
                 'orm_default' => array(
                     'params' => array(
                         'host' => 'localhost',
-                        'user' => 'sqlmonarcuser',
+                        'user' => 'monarc',
-                        'password' => '<password>',
+                        'password' => 'password',
                         'dbname' => 'monarc_common',
                     ),
                 ),
                 'orm_cli' => array(
                     'params' => array(
                         'host' => 'localhost',
-                        'user' => 'sqlmonarcuser',
+                        'user' => 'monarc',
-                        'password' => '<password>',
+                        'password' => 'password',
                         'dbname' => 'monarc_cli',
                     ),
                 ),
@@ -164,7 +172,8 @@ And configure the database connection:
 
 Install Grunt:
 
-    $ sudo apt-get -y install npm
+    $ curl -sL https://deb.nodesource.com/setup_13.x | sudo bash -
+    $ sudo apt-get install nodejs
     $ npm install -g grunt-cli
 
 then update MONARC:

VERSION.json

@@ -1 +1 @@
-{"major":2, "minor":9, "hotfix":3}
+{"major":2, "minor":9, "hotfix":4}