Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid removing terms and conditions files #211

Merged
merged 4 commits into from
Jan 15, 2025
Merged

Conversation

cudeso
Copy link
Contributor

@cudeso cudeso commented Jan 15, 2025

Update core/files/entrypoint_nginx.sh

cudeso added 4 commits January 8, 2025 16:38
Possible rsyslog file can be: /etc/rsyslog.d/40-misp.conf

```
global(parser.PermitSlashInProgramname="on")

if (
    (
        $programname == '/var/www/MISP/app/tmp/logs/' or
        $programname == 'MISP-SYNC' or
        $programname == 'MISP-SCRIPTS'
    ) and not (
        $msg contains 'contracts.canonical.' or
        $msg contains 'ubuntupro.http'
    )
)

then /var/www/MISP/app/tmp/logs/mispsyslog.log

& stop
```
@ostefano
Copy link
Collaborator

Why is this needed? Can terms be updated by MISP users and not just by MISP developers?

@ostefano ostefano self-requested a review January 15, 2025 13:58
@ostefano ostefano self-assigned this Jan 15, 2025
@HugeekMcGill
Copy link

I also have issue (Didn't dig deep yet) where the term files is overwritten after every rebuild/upgrade.

@cudeso
Copy link
Contributor Author

cudeso commented Jan 15, 2025

Why is this needed? Can terms be updated by MISP users and not just by MISP developers?

When you install MISP you can add your custom terms and conditions in MISP/app/files/terms (can be an HTML file). You can then enable the new terms via the MISP.terms_file setting.

@cudeso
Copy link
Contributor Author

cudeso commented Jan 15, 2025

I also have issue (Didn't dig deep yet) where the term files is overwritten after every rebuild/upgrade.

The --delete in the rsync (of core/files/entrypoint_nginx.sh) removes your term file.

@ostefano ostefano merged commit db47cf5 into MISP:master Jan 15, 2025
4 checks passed
@ostefano
Copy link
Collaborator

Merged.

@cudeso on a separate note, could you document in the README the example of a rsyslog configuration?
Or add a sane default so it is fully enabled.

Referring to:

global(parser.PermitSlashInProgramname="on")

if (
    (
        $programname == '/var/www/MISP/app/tmp/logs/' or
        $programname == 'MISP-SYNC' or
        $programname == 'MISP-SCRIPTS'
    ) and not (
        $msg contains 'contracts.canonical.' or
        $msg contains 'ubuntupro.http'
    )
)

then /var/www/MISP/app/tmp/logs/mispsyslog.log

& stop

@cudeso cudeso mentioned this pull request Jan 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants