AIL/ail-framework
7
0
Fork 0
mirror of https://github.com/ail-project/ail-framework.git synced 2024-11-30 01:37:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

Browse source
This commit is contained in:
terrtia 2024-02-02 11:33:09 +01:00
commit e6d63e3b8f
No known key found for this signature in database
GPG key ID: 1E1B1F50D84613D0
5 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
bin/LAUNCH.sh
View file

@ -31,15 +31,19 @@ export PATH=$AIL_KVROCKS:$PATH
export PATH=$AIL_BIN:$PATH export PATH=$AIL_BIN:$PATH
export PATH=$AIL_FLASK:$PATH export PATH=$AIL_FLASK:$PATH
isredis=`screen -ls | egrep '[0-9]+.Redis_AIL' | cut -d. -f1` function isup {
isardb=`screen -ls | egrep '[0-9]+.ARDB_AIL' | cut -d. -f1` isredis=`screen -ls | egrep '[0-9]+.Redis_AIL' | cut -d. -f1`
iskvrocks=`screen -ls | egrep '[0-9]+.KVROCKS_AIL' | cut -d. -f1` isardb=`screen -ls | egrep '[0-9]+.ARDB_AIL' | cut -d. -f1`
islogged=`screen -ls | egrep '[0-9]+.Logging_AIL' | cut -d. -f1` iskvrocks=`screen -ls | egrep '[0-9]+.KVROCKS_AIL' | cut -d. -f1`
is_ail_core=`screen -ls | egrep '[0-9]+.Core_AIL' | cut -d. -f1` islogged=`screen -ls | egrep '[0-9]+.Logging_AIL' | cut -d. -f1`
is_ail_2_ail=`screen -ls | egrep '[0-9]+.AIL_2_AIL' | cut -d. -f1` is_ail_core=`screen -ls | egrep '[0-9]+.Core_AIL' | cut -d. -f1`
isscripted=`screen -ls | egrep '[0-9]+.Script_AIL' | cut -d. -f1` is_ail_2_ail=`screen -ls | egrep '[0-9]+.AIL_2_AIL' | cut -d. -f1`
isflasked=`screen -ls | egrep '[0-9]+.Flask_AIL' | cut -d. -f1` isscripted=`screen -ls | egrep '[0-9]+.Script_AIL' | cut -d. -f1`
isfeeded=`screen -ls | egrep '[0-9]+.Feeder_Pystemon' | cut -d. -f1` isflasked=`screen -ls | egrep '[0-9]+.Flask_AIL' | cut -d. -f1`
isfeeded=`screen -ls | egrep '[0-9]+.Feeder_Pystemon' | cut -d. -f1`
}
isup
function helptext { function helptext {
echo -e $YELLOW" echo -e $YELLOW"
@ -69,6 +73,7 @@ function helptext {
LAUNCH.sh LAUNCH.sh
[-l | --launchAuto] LAUNCH DB + Scripts [-l | --launchAuto] LAUNCH DB + Scripts
[-k | --killAll] Kill DB + Scripts [-k | --killAll] Kill DB + Scripts
[-kl | --killLaunch] Kill All & launchAuto
[-ks | --killscript] Scripts [-ks | --killscript] Scripts
[-u | --update] Update AIL [-u | --update] Update AIL
[-ut | --thirdpartyUpdate] Update UI/Frontend [-ut | --thirdpartyUpdate] Update UI/Frontend
@ -692,6 +697,10 @@ while [ "$1" != "" ]; do
;; ;;
-k | --killAll ) killall; -k | --killAll ) killall;
;; ;;
-kl | --killLaunch ) killall;
isup;
launch_all "automatic";
;;
-ks | --killscript ) killscript; -ks | --killscript ) killscript;
;; ;;
-m | --menu ) menu_display; -m | --menu ) menu_display;

2
other_installers/ansible/roles/ail-host/tasks/main.yml
View file

@ -64,7 +64,7 @@
- name: Clone the AIL repository - name: Clone the AIL repository
git: git:
repo: 'https://github.com/CIRCL/AIL-framework.git' repo: 'https://github.com/ail-project/AIL-framework.git'
dest: /opt/AIL-framework dest: /opt/AIL-framework
update: yes update: yes

2
other_installers/docker/README.md
View file

@ -15,7 +15,7 @@ curl https://get.docker.com | /bin/bash
2. Type these commands to build the Docker image: 2. Type these commands to build the Docker image:
```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
cp -r ./other_installers/docker/Dockerfile ./other_installers/docker/docker_start.sh ./other_installers/docker/pystemon ./ cp -r ./other_installers/docker/Dockerfile ./other_installers/docker/docker_start.sh ./other_installers/docker/pystemon ./
cp ./configs/update.cfg.sample ./configs/update.cfg cp ./configs/update.cfg.sample ./configs/update.cfg

10
var/www/modules/settings/templates/settings_index.html
View file

@ -43,7 +43,11 @@
<tbody> <tbody>
<tr> <tr>
<td>AIL Version</td> <td>AIL Version</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> {%if ail_version is not none %}
<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>
{%else%}
<td>{{git_metadata['current_branch']}}</td>
{%endif%}
</tr> </tr>
<tr <tr
{%if git_metadata['current_branch'] != 'master'%} {%if git_metadata['current_branch'] != 'master'%}
@ -121,7 +125,7 @@
<h4 class="alert-heading">New Version Available!</h4> <h4 class="alert-heading">New Version Available!</h4>
<hr class="my-0"> <hr class="my-0">
<p>A new version is available, new version: <strong>{{git_metadata['last_remote_tag']}}</strong></p> <p>A new version is available, new version: <strong>{{git_metadata['last_remote_tag']}}</strong></p>
<a target="_blank" href="https://github.com/CIRCL/AIL-framework/releases/tag/{{git_metadata['last_remote_tag']}}"> Check last release note.</a> <a target="_blank" href="https://github.com/ail-project/AIL-framework/releases/tag/{{git_metadata['last_remote_tag']}}"> Check last release note.</a>
</div> </div>
{%endif%} {%endif%}
@ -130,7 +134,7 @@
<h4 class="alert-heading">New Update Available!</h4> <h4 class="alert-heading">New Update Available!</h4>
<hr class="my-0"> <hr class="my-0">
<p>A new update is available, new commit ID: <strong>{{git_metadata['last_remote_commit']}}</strong></p> <p>A new update is available, new commit ID: <strong>{{git_metadata['last_remote_commit']}}</strong></p>
<a target="_blank" href="https://github.com/CIRCL/AIL-framework/commit/{{git_metadata['last_remote_commit']}}"> Check last commit content.</a> <a target="_blank" href="https://github.com/ail-project/AIL-framework/commit/{{git_metadata['last_remote_commit']}}"> Check last commit content.</a>
</div> </div>
{%endif%} {%endif%}

10
var/www/templates/settings/settings_index.html
View file

@ -43,7 +43,11 @@
<tbody> <tbody>
<tr> <tr>
<td>AIL Version</td> <td>AIL Version</td>
<td>{{ail_version}}<a target="_blank" href="https://github.com/ail-project/ail-framework/releases/tag/{{ail_version}}" class="text-info"><small> (release note)</small></a></td> {%if ail_version is not none %}
<td>{{ail_version}}<a target="_blank" href="https://github.com/ail-project/ail-framework/releases/tag/{{ail_version}}" class="text-info"><small> (release note)</small></a></td>
{%else%}
<td>{{git_metadata['current_branch']}}</td>
{%endif%}
</tr> </tr>
<tr <tr
{%if git_metadata['current_branch'] != 'master'%} {%if git_metadata['current_branch'] != 'master'%}
@ -121,7 +125,7 @@
<h4 class="alert-heading">New Version Available!</h4> <h4 class="alert-heading">New Version Available!</h4>
<hr class="my-0"> <hr class="my-0">
<p>A new version is available, new version: <strong>{{git_metadata['last_remote_tag']}}</strong></p> <p>A new version is available, new version: <strong>{{git_metadata['last_remote_tag']}}</strong></p>
<a target="_blank" href="https://github.com/CIRCL/AIL-framework/releases/tag/{{git_metadata['last_remote_tag']}}"> Check last release note.</a> <a target="_blank" href="https://github.com/ail-project/AIL-framework/releases/tag/{{git_metadata['last_remote_tag']}}"> Check last release note.</a>
</div> </div>
{%endif%} {%endif%}
@ -130,7 +134,7 @@
<h4 class="alert-heading">New Update Available!</h4> <h4 class="alert-heading">New Update Available!</h4>
<hr class="my-0"> <hr class="my-0">
<p>A new update is available, new commit ID: <strong>{{git_metadata['last_remote_commit']}}</strong></p> <p>A new update is available, new commit ID: <strong>{{git_metadata['last_remote_commit']}}</strong></p>
<a target="_blank" href="https://github.com/CIRCL/AIL-framework/commit/{{git_metadata['last_remote_commit']}}"> Check last commit content.</a> <a target="_blank" href="https://github.com/ail-project/AIL-framework/commit/{{git_metadata['last_remote_commit']}}"> Check last commit content.</a>
</div> </div>
{%endif%} {%endif%}