From 263ef07577616e2048e5a19a2b63c2050c38f4b4 Mon Sep 17 00:00:00 2001 From: Luciano Righetti Date: Tue, 21 Mar 2023 09:37:08 +0100 Subject: [PATCH] [fix]: comment (properly) md inclusion for archived guides, cannot include from parent dir --- docs/archive/xINSTALL.FreeBSD.md | 16 ++++-- docs/archive/xINSTALL.debian9-postgresql.md | 4 +- docs/archive/xINSTALL.debian9.md | 56 ++++++++++++++----- .../xINSTALL.ubuntu1804.with.webmin.md | 28 +++++++--- 4 files changed, 78 insertions(+), 26 deletions(-) diff --git a/docs/archive/xINSTALL.FreeBSD.md b/docs/archive/xINSTALL.FreeBSD.md index fbec46b44..f80b4147b 100644 --- a/docs/archive/xINSTALL.FreeBSD.md +++ b/docs/archive/xINSTALL.FreeBSD.md @@ -6,7 +6,9 @@ !!! warning NOT working: pydeep, lief -`{% include_relative generic/globalVariables.md %}` +{% comment %} +{% include_relative generic/globalVariables.md %} +{% endcomment %} ```bash PHP_ETC_BASE=/usr/local/etc @@ -434,7 +436,9 @@ then fi ``` -`{% include_relative generic/MISP_CAKE_init.md %}` +{% comment %} +{% include_relative generic/MISP_CAKE_init.md %} +{% endcomment %} ```bash sudo gsed -i -e '$i \sudo -u www bash /usr/local/www/MISP/app/Console/worker/start.sh > /tmp/worker_start_rc.local.log\n' /etc/rc.local @@ -461,9 +465,13 @@ sudo -H -u www ${PATH_TO_MISP}/venv/bin/pip install . sudo -H -u www ${PATH_TO_MISP}/venv/bin/pip install stix2 ``` -`{% include_relative generic/INSTALL.done.md %}` +{% comment %} +{% include_relative generic/INSTALL.done.md %} +{% endcomment %} -`{% include_relative generic/recommended.actions.md %}` +{% comment %} +{% include_relative generic/recommended.actions.md %} +{% endcomment %} ### Optional features ----------------- diff --git a/docs/archive/xINSTALL.debian9-postgresql.md b/docs/archive/xINSTALL.debian9-postgresql.md index 88a7d1085..bccbc4407 100644 --- a/docs/archive/xINSTALL.debian9-postgresql.md +++ b/docs/archive/xINSTALL.debian9-postgresql.md @@ -101,4 +101,6 @@ pgloader --type mysql --with "reset sequences" --with "data only" --set "mainten systemctl stop mysql systemctl disable mysql -`{% include_relative generic/hardening.md %}` +{% comment %} +{% include_relative generic/hardening.md %} +{% endcomment %} diff --git a/docs/archive/xINSTALL.debian9.md b/docs/archive/xINSTALL.debian9.md index d918928f8..7ec75bd6a 100644 --- a/docs/archive/xINSTALL.debian9.md +++ b/docs/archive/xINSTALL.debian9.md @@ -23,9 +23,13 @@ - OpenSSH server - This guide assumes a user name of 'misp' with sudo working -`{% include_relative generic/known-issues-debian.md %}` +{% comment %} +{% include_relative generic/known-issues-debian.md %} +{% endcomment %} -`{% include_relative generic/globalVariables.md %}` +{% comment %} +{% include_relative generic/globalVariables.md %} +{% endcomment %} ```bash PHP_ETC_BASE=/etc/php/7.0 @@ -35,9 +39,13 @@ sudo adduser $MISP_USER staff sudo adduser $MISP_USER ${WWW_USER} ``` -`{% include_relative generic/sudo_etckeeper.md %}` +{% comment %} +{% include_relative generic/sudo_etckeeper.md %} +{% endcomment %} -`{% include_relative generic/ethX.md %}` +{% comment %} +{% include_relative generic/ethX.md %} +{% endcomment %} #### Make sure your system is up2date ```bash @@ -465,7 +473,9 @@ then sudo chmod u+x /etc/rc.local fi ``` -`{% include_relative generic/MISP_CAKE_init.md %}` +{% comment %} +{% include_relative generic/MISP_CAKE_init.md %} +{% endcomment %} ```bash # Add the following lines before the last line (exit 0). Make sure that you replace ${WWW_USER} with your apache user: @@ -474,16 +484,22 @@ sudo sed -i -e '$i \echo 1024 > /proc/sys/net/core/somaxconn\n' /etc/rc.local sudo sed -i -e '$i \sysctl vm.overcommit_memory=1\n' /etc/rc.local ``` -`{% include_relative generic/misp-modules-debian.md %}` +{% comment %} +{% include_relative generic/misp-modules-debian.md %} +{% endcomment %} ```bash echo "Admin (root) DB Password: $DBPASSWORD_ADMIN" echo "User (misp) DB Password: $DBPASSWORD_MISP" ``` -`{% include_relative generic/INSTALL.done.md %}` +{% comment %} +{% include_relative generic/INSTALL.done.md %} +{% endcomment %} -`{% include_relative generic/recommended.actions.md %}` +{% comment %} +{% include_relative generic/recommended.actions.md %} +{% endcomment %} ### Optional features ------------------- @@ -517,14 +533,26 @@ sudo phpenmod rdkafka sudo service apache2 restart ``` -`{% include_relative generic/misp-dashboard-debian.md %}` +{% comment %} +{% include_relative generic/misp-dashboard-debian.md %} +{% endcomment %} -`{% include_relative generic/viper-debian.md %}` +{% comment %} +{% include_relative generic/viper-debian.md %} +{% endcomment %} -`{% include_relative generic/ssdeep-debian.md %}` +{% comment %} +{% include_relative generic/ssdeep-debian.md %} +{% endcomment %} -`{% include_relative generic/mail_to_misp-debian.md %}` +{% comment %} +{% include_relative generic/mail_to_misp-debian.md %} +{% endcomment %} -`{% include_relative generic/upgrading.md %}` +{% comment %} +{% include_relative generic/upgrading.md %} +{% endcomment %} -`{% include_relative generic/hardening.md %}` +{% comment %} +{% include_relative generic/hardening.md %} +{% endcomment %} diff --git a/docs/archive/xINSTALL.ubuntu1804.with.webmin.md b/docs/archive/xINSTALL.ubuntu1804.with.webmin.md index 99d783fe7..6f8912504 100644 --- a/docs/archive/xINSTALL.ubuntu1804.with.webmin.md +++ b/docs/archive/xINSTALL.ubuntu1804.with.webmin.md @@ -6,9 +6,13 @@ !!! notice Tested semi-working by @SteveClement on 20181120. -`{% include_relative generic/community.md %}` +{% comment %} +{% include_relative generic/community.md %} +{% endcomment %} -`{% include_relative generic/globalVariables.md %}` +{% comment %} +{% include_relative generic/globalVariables.md %} +{% endcomment %} ```bash PHP_ETC_BASE=/etc/php/7.2 @@ -30,9 +34,13 @@ Assuming you created the subdomanin misp.yourserver.tld to where MISP will be in - OpenSSH server - This guide assumes a user name of 'misp' with sudo working -`{% include_relative generic/sudo_etckeeper.md %}` +{% comment %} +{% include_relative generic/sudo_etckeeper.md %} +{% endcomment %} -`{% include_relative generic/ethX.md %}` +{% comment %} +{% include_relative generic/ethX.md %} +{% endcomment %} #### Make sure your system is up2date ```bash @@ -431,11 +439,17 @@ sudo systemctl status rc-local.service # ${PATH_TO_MISP}/app/tmp/logs/resque-2015-01-01.log // where the actual date is the current date ``` -`{% include_relative generic/INSTALL.done.md %}` +{% comment %} +{% include_relative generic/INSTALL.done.md %} +{% endcomment %} -`{% include_relative generic/recommended.actions.md %}` +{% comment %} +{% include_relative generic/recommended.actions.md %} +{% endcomment %} -`{% include_relative generic/hardening.md %}` +{% comment %} +{% include_relative generic/hardening.md %} +{% endcomment %} ### Optional features -----------------