chg: [update doc] update doc install + logo + fix updater

This commit is contained in:
Terrtia 2020-04-20 17:50:40 +02:00
parent b6dc8e92b2
commit 596dec3f62
No known key found for this signature in database
GPG key ID: 1E1B1F50D84613D0
9 changed files with 16 additions and 18 deletions

View file

@ -81,7 +81,7 @@ Installation
Type these command lines for a fully automated installation and start AIL framework: Type these command lines for a fully automated installation and start AIL framework:
```bash ```bash
git clone https://github.com/CIRCL/AIL-framework.git git clone https://github.com/ail-project/ail-framework.git
cd AIL-framework cd AIL-framework
./installing_deps.sh ./installing_deps.sh
@ -220,11 +220,11 @@ License
``` ```
Copyright (C) 2014 Jules Debra Copyright (C) 2014 Jules Debra
Copyright (C) 2014-2019 CIRCL - Computer Incident Response Center Luxembourg (c/o smile, security made in Lëtzebuerg, Groupement d'Intérêt Economique) Copyright (C) 2014-2020 CIRCL - Computer Incident Response Center Luxembourg (c/o smile, security made in Lëtzebuerg, Groupement d'Intérêt Economique)
Copyright (c) 2014-2019 Raphaël Vinot Copyright (c) 2014-2020 Raphaël Vinot
Copyright (c) 2014-2019 Alexandre Dulaunoy Copyright (c) 2014-2020 Alexandre Dulaunoy
Copyright (c) 2016-2019 Sami Mokaddem Copyright (c) 2016-2020 Sami Mokaddem
Copyright (c) 2018-2019 Thirion Aurélien Copyright (c) 2018-2020 Thirion Aurélien
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by it under the terms of the GNU Affero General Public License as published by

View file

@ -33,7 +33,6 @@ def auto_update_enabled(cfg):
# check if files are modify locally # check if files are modify locally
def check_if_files_modified(): def check_if_files_modified():
return True
process = subprocess.run(['git', 'ls-files' ,'-m'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) process = subprocess.run(['git', 'ls-files' ,'-m'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if process.returncode == 0: if process.returncode == 0:
modified_files = process.stdout modified_files = process.stdout

View file

@ -210,7 +210,7 @@ ation-leaks-analysis-and-gdpr.pdf}}.
\node[simplenode] (pastebin) at (0, 0) {\includegraphics[scale=0.20]{images/pastebin.png}}; \node[simplenode] (pastebin) at (0, 0) {\includegraphics[scale=0.20]{images/pastebin.png}};
\node[simplenode] (leaks) at (4, -2) {Other leaks}; \node[simplenode] (leaks) at (4, -2) {Other leaks};
\node[simplenode] (ail) at (4, 0) {\includegraphics[scale=0.3]{images/circl-small.png}}; \node[simplenode] (ail) at (4, 0) {\includegraphics[scale=0.14]{images/ail-project.png}};
\node[simplenode] (res) at (8, 0) {\includegraphics[scale=0.1]{images/alert.png}}; \node[simplenode] (res) at (8, 0) {\includegraphics[scale=0.1]{images/alert.png}};
\begin{scope} \begin{scope}
@ -412,11 +412,11 @@ response platforms
\begin{frame} \begin{frame}
\frametitle{threat sharing and incident response platforms} \frametitle{threat sharing and incident response platforms}
\centerline{ \centerline{
\includegraphics[scale=0.20]{images/circl-small.png} \includegraphics[scale=0.14]{images/ail-project.png}
\hskip 2em \hskip 2em
$\longrightarrow$ $\longrightarrow$
\hskip 2em \hskip 2em
\includegraphics[scale=0.7]{images/MISP.png} \includegraphics[scale=0.8]{images/MISP.png}
} }
\vskip 2em \vskip 2em
@ -427,11 +427,11 @@ response platforms.
\begin{frame} \begin{frame}
\frametitle{threat sharing and incident response platforms} \frametitle{threat sharing and incident response platforms}
\centerline{ \centerline{
\includegraphics[scale=0.20]{images/circl-small.png} \includegraphics[scale=0.12]{images/ail-project.png}
\hskip 2em \hskip 2em
$\longrightarrow$ $\longrightarrow$
\hskip 2em \hskip 2em
\includegraphics[scale=0.7]{images/MISP.png} \includegraphics[scale=0.8]{images/MISP.png}
} }
\vskip 2em \vskip 2em
@ -736,7 +736,7 @@ response platforms.
\frametitle{Setting up AIL-Framework from source or virtual machine} \frametitle{Setting up AIL-Framework from source or virtual machine}
\begin{tcblisting}{colback=black!85,coltext=green,listing only, \begin{tcblisting}{colback=black!85,coltext=green,listing only,
title=Setting up AIL-Framework from source, fonttitle=\bfseries} title=Setting up AIL-Framework from source, fonttitle=\bfseries}
git clone https://github.com/CIRCL/AIL-framework.git git clone https://github.com/ail-project/ail-framework.git
cd AIL-framework cd AIL-framework
./installing_deps.sh ./installing_deps.sh
\end{tcblisting} \end{tcblisting}
@ -1217,7 +1217,6 @@ if __name__ == '__main__':
\end{itemize} \end{itemize}
\item Crawled items \item Crawled items
\begin{itemize} \begin{itemize}
\item add screenshot correlation
\item duplicate crawled domains \item duplicate crawled domains
\item tor indexer \item tor indexer
\item crawler cookie authentication \item crawler cookie authentication

View file

@ -10,7 +10,7 @@
\frametitle{Useful commands} \frametitle{Useful commands}
\begin{tcblisting}{colback=black!85,coltext=green,listing only, title=Setting up AIL-Framework from source, fonttitle=\bfseries} \begin{tcblisting}{colback=black!85,coltext=green,listing only, title=Setting up AIL-Framework from source, fonttitle=\bfseries}
git clone https://github.com/CIRCL/AIL-framework.git git clone https://github.com/ail-project/ail-framework.git
cd AIL-framework cd AIL-framework
./installing_deps.sh ./installing_deps.sh
cd var/www/ cd var/www/

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

View file

@ -214,7 +214,7 @@ def _handle_client_error(e):
res_dict = {"status": "error", "reason": "Method Not Allowed: The method is not allowed for the requested URL"} res_dict = {"status": "error", "reason": "Method Not Allowed: The method is not allowed for the requested URL"}
anchor_id = request.path[8:] anchor_id = request.path[8:]
anchor_id = anchor_id.replace('/', '_') anchor_id = anchor_id.replace('/', '_')
api_doc_url = 'https://github.com/CIRCL/AIL-framework/tree/master/doc#{}'.format(anchor_id) api_doc_url = 'https://github.com/ail-project/ail-framework/tree/master/doc#{}'.format(anchor_id)
res_dict['documentation'] = api_doc_url res_dict['documentation'] = api_doc_url
return Response(json.dumps(res_dict, indent=2, sort_keys=True), mimetype='application/json'), 405 return Response(json.dumps(res_dict, indent=2, sort_keys=True), mimetype='application/json'), 405
else: else:

View file

@ -100,7 +100,7 @@ UPLOAD_FOLDER = os.path.join(os.environ['AIL_FLASK'], 'submitted')
PASTES_FOLDER = os.path.join(os.environ['AIL_HOME'], config_loader.get_config_str("Directories", "pastes")) + '/' PASTES_FOLDER = os.path.join(os.environ['AIL_HOME'], config_loader.get_config_str("Directories", "pastes")) + '/'
SCREENSHOT_FOLDER = os.path.join(os.environ['AIL_HOME'], config_loader.get_config_str("Directories", "crawled_screenshot"), 'screenshot') SCREENSHOT_FOLDER = os.path.join(os.environ['AIL_HOME'], config_loader.get_config_str("Directories", "crawled_screenshot"), 'screenshot')
REPO_ORIGIN = 'https://github.com/CIRCL/AIL-framework.git' REPO_ORIGIN = 'https://github.com/ail-project/ail-framework.git'
max_dashboard_logs = int(config_loader.get_config_str("Flask", "max_dashboard_logs")) max_dashboard_logs = int(config_loader.get_config_str("Flask", "max_dashboard_logs"))

View file

@ -43,7 +43,7 @@
<tbody> <tbody>
<tr> <tr>
<td>AIL Version</td> <td>AIL Version</td>
<td>{{current_version}}<a target="_blank" href="https://github.com/CIRCL/AIL-framework/releases/tag/{{current_version}}" class="text-info"><small> (release note)</small></a></td> <td>{{current_version}}<a target="_blank" href="https://github.com/ail-project/ail-framework/releases/tag/{{current_version}}" class="text-info"><small> (release note)</small></a></td>
</tr> </tr>
<tr <tr
{%if git_metadata['current_branch'] != 'master'%} {%if git_metadata['current_branch'] != 'master'%}