diff --git a/CHANGELOG.md b/CHANGELOG.md index 93a15db..340e424 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,24 @@ MONARC Changelog ================ +## 2.8.0 (2019-03-01) + +### New + +- [management of multiple referentials](https://objects.monarc.lu/news/2019/03/01/monarc-280-released#management-of-multiple-security-referentials); +- [mapping between security referentials](https://objects.monarc.lu/news/2019/03/01/monarc-280-released#mapping-between-security-referentials); +- [improvements to the statement of applicability](https://objects.monarc.lu/news/2019/03/01/monarc-280-released#improvements-to-the-statement-of-applicability); +- [batch import of objects](https://objects.monarc.lu/news/2019/03/01/monarc-280-released#batch-import-of-objects); +- [improvements to the dashboard](https://objects.monarc.lu/news/2019/03/01/monarc-280-released#improvements-to-the-dashboard); +- [MONARC Objects Sharing Platform](https://objects.monarc.lu/news/2019/03/01/monarc-280-released#monarc-objects-sharing-platform); +- it is now possible to set a page for your terms of service when MONARC is used to provide a service. + +### Fix + +- Fixed an issue when deleting threat theme [#143](https://github.com/monarc-project/MonarcAppFO/issues/143) +- Improved the go back on risk sheet [#95](https://github.com/monarc-project/MonarcAppFO/issues/95) + + ## 2.7.4 (2018-11-27) ### Fix diff --git a/INSTALL/INSTALL.rhel7.md b/INSTALL/INSTALL.rhel7.md new file mode 100644 index 0000000..f1a9fa7 --- /dev/null +++ b/INSTALL/INSTALL.rhel7.md @@ -0,0 +1,124 @@ + + +# Software repositories & packages + +Install Apache (httpd), MariaDB, mod_ssl & dependencies from the standard Red Hat repositories. + +Install Remi's rpm repository for Red Hat 7. + + yum install https://rpms.remirepo.net/enterprise/remi-release-7.rpm + +Install the epel repo - extra packages for enterprise Linux 7 + + yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + +Install php7.2, required modules & dependencies from Remi's repository: + + php72.x86_64 php72-php.x86_64 php72-php-gd.x86_64 php72-php-mysqlnd.x86_64 php72-php-mbstring.x86_64 php72-php-pear.noarch php72-php-pecl-apcu.x86_64 php72-php-xml.x86_64 php72-php-intl.x86_64 php72-php-pecl-imagick.x86_64 php72-php-pecl-zip.x86_64 + +Install npm, nodejs-grunt-cli & dependencies + +# Database configuration + +Add the following line to server.cnf (/etc/my.cnf.d/server.cnf) otherwise you +may get an error when initializing the database + + [mariadb] + max_allowed_packet=8M + +Start the server and create the databases (in the interpreter) + + CREATE DATABASE monarc_cli DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci; + CREATE DATABASE monarc_common DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci; + +Initialize the database + + mysql -u root -p monarc_common < db-bootstrap/monarc_structure.sql + mysql -u root -p monarc_common < db-bootstrap/monarc_data.sql + +Create a database user for monarc (in the interpreter) + + create user 'monarc'@'localhost' identified by 'password'; + grant create, delete, insert, select, update, drop, alter on monarc_common.* to 'monarc'@'localhost'; + grant create, delete, insert, select, update, drop, alter on monarc_cli.* to 'monarc'@'localhost'; + +# Installation of MONARC + +Create the subdirectory __monarc__ under Apache documentroot (/var/www/html/) and cd to it + +If you're behind an explicit proxy, set the env variables and configure git to use the proxy: + + $ export HTTP_PROXY=proxy:port + $ export HTTPS_PROXY=proxy:port + $ export HTTP_PROXY_REQUEST_FULLURI=0 + $ export HTTPS_PROXY_REQUEST_FULLURI=0 + $ git config --global http.proxy http://proxy:port + +Add php to $PATH + + $ export PATH=$PATH:/opt/remi/php72/root/usr/bin:/opt/remi/php72/root/usr/sbin + +Clone the repository and invoke composer + + $ git clone https://github.com/monarc-project/MonarcAppFO.git fo + $ cd fo + (as root) /opt/remi/php72/root/usr/bin/php ./composer.phar self-update + $ /opt/remi/php72/root/usr/bin/php ./composer.phar install -o + +Backend + + $ mkdir module + $ cd module/ + $ ln -s ./../vendor/monarc/core MonarcCore + $ ln -s ./../vendor/monarc/frontoffice MonarcFO + +Frontend + + $ mkdir node_modules + $ cd node_modules + $ git clone https://github.com/monarc-project/ng-client.git ng_client + $ git clone https://github.com/monarc-project/ng-anr.git ng_anr + +Set up the database connection: + + $ cd /var/www/html/monarc/fo/config/autoload/ + $ cp local.php.dist local.php + +Edit local.php and change the installation path (/var/www/html/monarc/fo) and the database credentials. + +Update MONARC (including npm config for explicit proxy) + + $ npm config set proxy http://proxy:port + $ npm config set https-proxy http://proxy:port + $ cd /var/www/html/monarc/fo + $ ./scripts/update-all.sh + +Create initial user + + $ php ./vendor/robmorgan/phinx/bin/phinx seed:run -c ./module/MonarcFO/migrations/phinx.php + +# Configure apache (as root) + +Set file ownership for monarc installation + + cd /var/www/html/ + chown -R apache:apache monarc + +## Configure virtual host + + cd /etc/httpd/conf.d/ + vim virtualhost.conf + + + ServerName monarc. + DocumentRoot /var/www/html/monarc/fo/public + + + DirectoryIndex index.php + AllowOverride All + Require all granted + + + SetEnv APPLICATION_ENV "development" diff --git a/VERSION.json b/VERSION.json index cbf7f1f..b0c0532 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1 +1 @@ -{"major":2, "minor":7, "hotfix":4} +{"major":2, "minor":8, "hotfix":0} diff --git a/composer.json b/composer.json index 034e487..2005fc1 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,9 @@ "monarc/core": "dev-master", "monarc/frontoffice": "dev-master", "phing/phing": "~2.0", - "phpoffice/phpword": "dev-stable" + "phpoffice/phpword": "dev-stable", + "ramsey/uuid": "^3.8", + "ramsey/uuid-doctrine": "^1.5" }, "config": { "bin-dir": "bin/" diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist index bd6732b..39e4f77 100644 --- a/config/autoload/local.php.dist +++ b/config/autoload/local.php.dist @@ -93,6 +93,8 @@ return array( 'from' => 'info@monarc.lu', ], + 'terms' => 'https://my.monarc.lu/terms.html', + 'monarc' => array( 'ttl' => 60, // timeout 'cliModel' => 'generic', // model to display for the client, an ID of a specific model or 'generic' (empty for all) diff --git a/data/cache/.gitignore b/data/cache/.gitignore deleted file mode 100755 index d6b7ef3..0000000 --- a/data/cache/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/package.json b/package.json index 9adbe81..e8cc7ec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "MONARC", - "version": "2.7.4", + "version": "2.8.0", "description": "MONARC Frontoffice App", "private": true, "repository": { diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index ec53b08..e77d4c6 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -53,7 +53,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # # # Use VBoxManage to customize the VM. For example to change memory: vb.customize ["modifyvm", :id, "--memory", "1024"] - vb.customize ["modifyvm", :id, "--name", "MONARC FO - Ubuntu 18.04 - DEV"] + vb.customize ["modifyvm", :id, "--name", "MONARC FO - Ubuntu 18.04 - DEV - 19-02-2019"] end # # View the documentation for the provider you're using for more