Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
s.djellali committed Nov 3, 2024
2 parents 68d42cc + edf70f1 commit eed6663
Show file tree
Hide file tree
Showing 167 changed files with 14,179 additions and 2,670 deletions.
30 changes: 10 additions & 20 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -38,28 +38,18 @@ QUEUE_CONNECTION=sync
SESSION_DRIVER=file
SESSION_LIFETIME=120

REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379

MAIL_MAILER=smtp
MAIL_HOST=smtp.mailtrap.io
MAIL_HOST=mailtrap.io
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS=null
MAIL_FROM_NAME="${APP_NAME}"

AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=us-east-1
AWS_BUCKET=
MAIL_AUTH=true
MAIL_SMTP_SECURE='tls'
MAIL_SMTP_AUTO_TLS=true
MAIL_USERNAME=
MAIL_PASSWORD=

PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1
# MAIL_DKIM_DOMAIN = 'yourdomain.com'
# MAIL_DKIM_PRIVATE = '/path/to/private/key'
# MAIL_DKIM_SELECTOR = 'default'
# MAIL_DKIM_PASSPHRASE = ''

MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
packages: write
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Test naming
run: echo "ghcr.io/${{ github.repository }}:latest"
Expand Down
28 changes: 15 additions & 13 deletions INSTALL.RedHat.fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,23 +186,25 @@ Changer les permission d'accès à la clé

## Configuration du mail

Si vous souhaitez envoyer des mails de notification depuis Mercator.
Si vous souhaitez envoyer des e-mails de notification depuis Deming.
Vous devez configurer l'accès au serveur SMTP dans .env

Installer postfix et mailx
MAIL_HOST='smtp.localhost'
MAIL_PORT=2525
MAIL_AUTH=true
MAIL_SMTP_SECURE='ssl'
MAIL_SMTP_AUTO_TLS=false
MAIL_USERNAME=
MAIL_PASSWORD=

sudo apt install postfix mutt
Vous pouvez également configurer DKIM :

Configurer postfix
MAIL_DKIM_DOMAIN = 'admin.local';
MAIL_DKIM_PRIVATE = '/path/to/private/key';
MAIL_DKIM_SELECTOR = 'default'; // Match your DKIM DNS selector
MAIL_DKIM_PASSPHRASE = ''; // Only if your key has a passphrase

sudo vi /etc/postfix/main.cf

Redémarrer le service Postfix

sudo systemctl restart postfix

Envoyer un mail de test avec

echo "Test mail body" | mailx -r "mercator@yourdomain.local" -s "Subject Test" yourname@yourdomain.local
N'oubliez pas de [configurer](https://dbarzin.github.io/deming/config.fr/#notifications) le contenu et la fréquence d'envoi des mails.

## Sheduler

Expand Down
28 changes: 15 additions & 13 deletions INSTALL.RedHat.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,23 +185,25 @@ Change key access permissions

## Email configuration

If you want to send notification emails from Mercator.
If you wish to send notification e-mails from Deming.
You have to configure the SMTP server access in .env

Install postfix and mailx
MAIL_HOST='smtp.localhost'
MAIL_PORT=2525
MAIL_AUTH=true
MAIL_SMTP_SECURE='ssl'
MAIL_SMTP_AUTO_TLS=false
MAIL_USERNAME=
MAIL_PASSWORD=

sudo apt install postfix mutt
You may also configure DKIM :

Configure postfix
MAIL_DKIM_DOMAIN = 'admin.local';
MAIL_DKIM_PRIVATE = '/path/to/private/key';
MAIL_DKIM_SELECTOR = 'default'; // Match your DKIM DNS selector
MAIL_DKIM_PASSPHRASE = ''; // Only if your key has a passphrase

sudo vi /etc/postfix/main.cf

Restart the Postfix service

sudo systemctl restart postfix

Send a test email with

echo "Test mail body" | mailx -r "mercator@yourdomain.local" -s "Subject Test" yourname@yourdomain.local
Don't forget to [configure](https://dbarzin.github.io/deming/config/#notifications) the content and frequency of your emails.

## Sheduler

Expand Down
24 changes: 15 additions & 9 deletions INSTALL.fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,19 +154,25 @@ Changer les permission d'accès à la clé

## Configuration du mail

Si vous souhaitez envoyer des mails de notification depuis Mercator.
Si vous souhaitez envoyer des e-mails de notification depuis Deming.
Vous devez configurer l'accès au serveur SMTP dans .env

Installer postfix et mailx
MAIL_HOST='smtp.localhost'
MAIL_PORT=2525
MAIL_AUTH=true
MAIL_SMTP_SECURE='ssl'
MAIL_SMTP_AUTO_TLS=false
MAIL_USERNAME=
MAIL_PASSWORD=

sudo apt install postfix mailx
Vous pouvez également configurer DKIM :

Configurer postfix
MAIL_DKIM_DOMAIN = 'admin.local';
MAIL_DKIM_PRIVATE = '/path/to/private/key';
MAIL_DKIM_SELECTOR = 'default'; // Match your DKIM DNS selector
MAIL_DKIM_PASSPHRASE = ''; // Only if your key has a passphrase

sudo dpkg-reconfigure postfix

Envoyer un mail de test avec

echo "Test mail body" | mailx -r "mercator@yourdomain.local" -s "Subject Test" yourname@yourdomain.local
N'oubliez pas de [configurer](https://dbarzin.github.io/deming/config.fr/#notifications) le contenu et la fréquence d'envoi des mails.

## Sheduler

Expand Down
24 changes: 15 additions & 9 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,19 +155,25 @@ Change the access permissions of the key

## Mail configuration

If you want to send notification mails from Mercator.
If you wish to send notification e-mails from Deming.
You have to configure the SMTP server access in .env

Install postfix and mailx
MAIL_HOST='smtp.localhost'
MAIL_PORT=2525
MAIL_AUTH=true
MAIL_SMTP_SECURE='ssl'
MAIL_SMTP_AUTO_TLS=false
MAIL_USERNAME=
MAIL_PASSWORD=

sudo apt install postfix mailutils
You may also configure DKIM :

Configure postfix
MAIL_DKIM_DOMAIN = 'admin.local';
MAIL_DKIM_PRIVATE = '/path/to/private/key';
MAIL_DKIM_SELECTOR = 'default'; // Match your DKIM DNS selector
MAIL_DKIM_PASSPHRASE = ''; // Only if your key has a passphrase

sudo dpkg-reconfigure postfix

Send a test mail with

echo "Test mail body" | mailx -r "mercator@yourdomain.local" -s "Subject Test" yourname@yourdomain.local
Don't forget to [configure](https://dbarzin.github.io/deming/config/#notifications) the content and frequency of your emails.

## Scheduler

Expand Down
5 changes: 3 additions & 2 deletions ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Changements prévus en 2024 :
- [ ] Revoir le modèle des pages web avec Intertia.js (https://laracasts.com/series/build-modern-laravel-apps-using-inertia-js)
- [ ] Utiliser un modèle de document pour les rapports
- [x] Pouvoir changer les images des objets
- [ ] Upgrade to [Bootstrap 5.3](https://getbootstrap.com/)

## Evolutions mineurs

Expand All @@ -37,15 +38,15 @@ Changements prévus en 2024 :
- [x] Renseigner les ports utilisables lors de la définition d'un équipement (https://github.com/dbarzin/mercator/issues/410)
- [x] Ajout des clusters
- [x] Ajout des flux logiques
- [ ] Afficher l'historique des changements d'un objet
- [x] Afficher l'historique des changements d'un objet
- [x] Cloner un objet

## Petites évolutions

- [ ] Améliorer les tests Dusk
- [x] Documenter une procédure de déploiement sous Debian
- [ ] Dark Theme
- [ ] Ajout d'une chart Helm pour simplifier le déploiement dans Kubernetes (https://helm.sh/docs/topics/charts/)
- [x] Ajout d'une chart Helm pour simplifier le déploiement dans Kubernetes (https://helm.sh/docs/topics/charts/)

# Changements réalisés en 2023 :

Expand Down
6 changes: 5 additions & 1 deletion app/AuditLog.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?php

namespace App;

use DateTimeInterface;
Expand All @@ -26,6 +25,11 @@ class AuditLog extends Model
'properties' => 'collection',
];

public function user()
{
return $this->belongsTo(User::class, 'user_id');
}

public static function subject_url(string $subject_type)
{
return '/admin/' .
Expand Down
Loading

0 comments on commit eed6663

Please sign in to comment.