Merge pull request #286 from dbarzin/main

Rebase

Author: dbarzin

INSTALL.fr.md

@@ -2,7 +2,7 @@
 
 ## Configuration recommandée
 
-- OS : Ubuntu 22.04 LTS
+- OS : Ubuntu 24.04.1 LTS
 - RAM : 2G
 - Disque : 30G
 - VCPU 2
@@ -39,19 +39,15 @@ Installer les packages avec composer
 
     composer install
 
-## MySQL
+## Database
 
-Installer MySQL
+Installer la base de données (fonctionne aussi avec PostgreSQL et MySQL)
 
-    sudo apt install mysql-server
+    sudo apt install mariadb-server
 
-Vérifier que vous utilisez MySQL et pas MariaDB (Deming ne fonctionne pas avec MariaDB).
+Lancer MariaDB avec les droits root
 
-    sudo mysql --version
-
-Lancer MySQL avec les droits root
-
-    sudo mysql
+    sudo mariadb
 
 Créer la base de données _deming_ et l'utilisateur _deming_user_
 

INSTALL.md

@@ -2,7 +2,7 @@
 
 ## Recommended configuration
 
-- OS : Ubuntu 24.04 LTS
+- OS : Ubuntu 24.04.1 LTS
 - RAM : 2G
 - Disk : 30G
 - VCPU 2
@@ -36,19 +36,15 @@ Install packages with composer :
     mkdir -p bootstrap/cache
     composer install
 
-## MySQL
+## Database
 
-Install MySQL
+Install MariaDB (works also with ProgresSQL and MySQL)
 
-    sudo apt install mysql-server
+    sudo apt install mariadb-server
 
-Make sure you're using MySQL and not MariaDB (Deming doesn't work with MariaDB).
+Start database client 
 
-    sudo mysql --version
-
-Run MySQL with root rights
-
-    sudo mysql
+    sudo mariadb
 
 Create database _deming_ and user _deming_user_.
 
@@ -72,7 +68,7 @@ Set database connection parameters :
     vi .env
 
     ## .env file
-    DB_CONNECTION=mysql
+    DB_CONNECTION=mariadb
     DB_HOST=127.0.0.1
     DB_PORT=3306
     DB_DATABASE=deming

docker-compose.yml

@@ -0,0 +1 @@
+docker/docker-compose.yml

docker/docker-compose.yml

@@ -1,9 +1,8 @@
-version: "3.7"
 services:
-  web:
+  deming:
     build:
       context: .
-      dockerfile: Dockerfile_web
+      dockerfile: Dockerfile
     environment:
       ### PLEASE DISABLE AFTER THE FIRST RUN FOR OPTIMIZATION PRODUCTION
       - DB_SLEEP=10
@@ -17,19 +16,19 @@ services:
       - INITIAL_DB=FR #EN OR FR
       - TZ=Europe/Paris
     volumes:
-      - ./custom/.env:/var/www/deming/.env
-      - ./custom/custom_postfix_main.cf:/etc/postfix/main.cf
-      - ./custom/custom_postfix_mailname:/etc/mailname
-      - ./custom/deming.php:/var/www/deming/config/deming.php
-      - ./custom/Kernel.php:/var/www/deming/app/Console/Kernel.php
-      - ./custom/app.php:/var/www/deming/config/app.php
+      - .env:/var/www/deming/.env
+      - ./docker/custom/custom_postfix_main.cf:/etc/postfix/main.cf
+      - ./docker/custom/custom_postfix_mailname:/etc/mailname
+      - ./docker/custom/deming.php:/var/www/deming/config/deming.php
+      - ./docker/custom/Kernel.php:/var/www/deming/app/Console/Kernel.php
+      - ./docker/custom/app.php:/var/www/deming/config/app.php
     ports:
-      - 80:80
+      - 80:8000
     depends_on:
       mysql:
         condition: service_healthy
   mysql:
-    image: mysql:8
+    image: mysql:9
     environment:
       MYSQL_DATABASE: 'deming'
       MYSQL_USER: 'deming_user'

storage/app/repository/MPA-5.3-Best-Practices.xlsx

@@ -7,6 +7,7 @@
 | ISO27001-2022.en.xlsx                | [ISO/IEC 27001, 2022, in English](https://www.iso.org/fr/standard/27001)       |
 | ISO27001-2022.fr.xlsx                | [ISO/IEC 27001, 2022, in French](https://www.iso.org/fr/standard/27001)        |
 | MPA-5.2-Best-Practices.xlsx          | [Motion Picture Association Best Practices, v5.2](https://www.ttpn.org/wp-content/uploads/2023/08/MPA-Content-Security-Best-Practices-v5.2_Aug30_2023-Release.xlsx) |
+| MPA-5.3-Best-Practices.xlsx          | [Motion Picture Association Best Practices, v5.3](https://www.ttpn.org/wp-content/uploads/2025/01/MPA-Content-Security-Best-Practices-v5.3_Jan6_2025_English.xlsx) |
 | NIS2.en.xlsx                         | [NIS 2 directive requirements](https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX%3A32022L2555) |
 | NIS2.fr.xlsx                         | [NIS 2 directive requirements](https://eur-lex.europa.eu/legal-content/FR/TXT/?uri=CELEX%3A32022L2555) |
 | MVSP-3.0.xlsx                        | [Minimum Viable Security Product, v3.0](https://mvsp.dev/mvsp.en/)             |