From 8087e46da4084548c2fa55b604946dae9aabe1bb Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Thu, 18 Jan 2024 10:54:18 +0100 Subject: [PATCH 1/5] fix: [repo] Point to the correct ail-project repo --- other_installers/ansible/roles/ail-host/tasks/main.yml | 2 +- other_installers/docker/README.md | 2 +- var/www/modules/settings/templates/settings_index.html | 4 ++-- var/www/templates/settings/settings_index.html | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/other_installers/ansible/roles/ail-host/tasks/main.yml b/other_installers/ansible/roles/ail-host/tasks/main.yml index af520fe4..47ada451 100644 --- a/other_installers/ansible/roles/ail-host/tasks/main.yml +++ b/other_installers/ansible/roles/ail-host/tasks/main.yml @@ -64,7 +64,7 @@ - name: Clone the AIL repository git: - repo: 'https://github.com/CIRCL/AIL-framework.git' + repo: 'https://github.com/ail-project/AIL-framework.git' dest: /opt/AIL-framework update: yes diff --git a/other_installers/docker/README.md b/other_installers/docker/README.md index 070f791c..c931bb65 100644 --- a/other_installers/docker/README.md +++ b/other_installers/docker/README.md @@ -15,7 +15,7 @@ curl https://get.docker.com | /bin/bash 2. Type these commands to build the Docker image: ```bash -git clone https://github.com/CIRCL/AIL-framework.git +git clone https://github.com/ail-project/AIL-framework.git cd AIL-framework cp -r ./other_installers/docker/Dockerfile ./other_installers/docker/docker_start.sh ./other_installers/docker/pystemon ./ cp ./configs/update.cfg.sample ./configs/update.cfg diff --git a/var/www/modules/settings/templates/settings_index.html b/var/www/modules/settings/templates/settings_index.html index fd608a64..b6a3fdf7 100644 --- a/var/www/modules/settings/templates/settings_index.html +++ b/var/www/modules/settings/templates/settings_index.html @@ -121,7 +121,7 @@

New Version Available!

A new version is available, new version: {{git_metadata['last_remote_tag']}}

- Check last release note. + Check last release note. {%endif%} @@ -130,7 +130,7 @@

New Update Available!

A new update is available, new commit ID: {{git_metadata['last_remote_commit']}}

- Check last commit content. + Check last commit content. {%endif%} diff --git a/var/www/templates/settings/settings_index.html b/var/www/templates/settings/settings_index.html index 59d3fed5..dbdd6843 100644 --- a/var/www/templates/settings/settings_index.html +++ b/var/www/templates/settings/settings_index.html @@ -121,7 +121,7 @@

New Version Available!

A new version is available, new version: {{git_metadata['last_remote_tag']}}

- Check last release note. + Check last release note. {%endif%} @@ -130,7 +130,7 @@

New Update Available!

A new update is available, new commit ID: {{git_metadata['last_remote_commit']}}

- Check last commit content. + Check last commit content. {%endif%} From 0449cc8d25faf8bcf52fdfc2b1907db07a0db76b Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Thu, 18 Jan 2024 11:19:40 +0100 Subject: [PATCH 2/5] chg: [UI] If version None do not show release note link --- var/www/modules/settings/templates/settings_index.html | 2 ++ var/www/templates/settings/settings_index.html | 2 ++ 2 files changed, 4 insertions(+) diff --git a/var/www/modules/settings/templates/settings_index.html b/var/www/modules/settings/templates/settings_index.html index b6a3fdf7..2db88d81 100644 --- a/var/www/modules/settings/templates/settings_index.html +++ b/var/www/modules/settings/templates/settings_index.html @@ -43,7 +43,9 @@ AIL Version + {%if ail_version != 'None'%} {{current_version}} (release note) + {%endif%} AIL Version + {%if ail_version != 'None'%} {{ail_version}} (release note) + {%endif%} Date: Thu, 18 Jan 2024 11:42:37 +0100 Subject: [PATCH 3/5] chg: [LAUNCH] Addded a "restart" option, killAll + launchAuto --- bin/LAUNCH.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/LAUNCH.sh b/bin/LAUNCH.sh index 68c20ac7..05540d3c 100755 --- a/bin/LAUNCH.sh +++ b/bin/LAUNCH.sh @@ -69,6 +69,7 @@ function helptext { LAUNCH.sh [-l | --launchAuto] LAUNCH DB + Scripts [-k | --killAll] Kill DB + Scripts + [-kl | --killLaunch] Kill All & launchAuto [-ks | --killscript] Scripts [-u | --update] Update AIL [-ut | --thirdpartyUpdate] Update UI/Frontend @@ -695,6 +696,9 @@ while [ "$1" != "" ]; do ;; -k | --killAll ) killall; ;; + -kl | --killLaunch ) killall; + launch_all "automatic"; + ;; -ks | --killscript ) killscript; ;; -m | --menu ) menu_display; From 9cfd2306611d1d6b6a9d9c34af9bb75a864b5705 Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Thu, 18 Jan 2024 11:53:13 +0100 Subject: [PATCH 4/5] chg: [LAUNCH] make sure reload works --- bin/LAUNCH.sh | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/bin/LAUNCH.sh b/bin/LAUNCH.sh index 05540d3c..58c17d87 100755 --- a/bin/LAUNCH.sh +++ b/bin/LAUNCH.sh @@ -31,15 +31,19 @@ export PATH=$AIL_KVROCKS:$PATH export PATH=$AIL_BIN:$PATH export PATH=$AIL_FLASK:$PATH -isredis=`screen -ls | egrep '[0-9]+.Redis_AIL' | cut -d. -f1` -isardb=`screen -ls | egrep '[0-9]+.ARDB_AIL' | cut -d. -f1` -iskvrocks=`screen -ls | egrep '[0-9]+.KVROCKS_AIL' | cut -d. -f1` -islogged=`screen -ls | egrep '[0-9]+.Logging_AIL' | cut -d. -f1` -is_ail_core=`screen -ls | egrep '[0-9]+.Core_AIL' | cut -d. -f1` -is_ail_2_ail=`screen -ls | egrep '[0-9]+.AIL_2_AIL' | cut -d. -f1` -isscripted=`screen -ls | egrep '[0-9]+.Script_AIL' | 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` +function isup { + isredis=`screen -ls | egrep '[0-9]+.Redis_AIL' | cut -d. -f1` + isardb=`screen -ls | egrep '[0-9]+.ARDB_AIL' | cut -d. -f1` + iskvrocks=`screen -ls | egrep '[0-9]+.KVROCKS_AIL' | cut -d. -f1` + islogged=`screen -ls | egrep '[0-9]+.Logging_AIL' | cut -d. -f1` + is_ail_core=`screen -ls | egrep '[0-9]+.Core_AIL' | cut -d. -f1` + is_ail_2_ail=`screen -ls | egrep '[0-9]+.AIL_2_AIL' | cut -d. -f1` + isscripted=`screen -ls | egrep '[0-9]+.Script_AIL' | 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 { echo -e $YELLOW" @@ -69,7 +73,7 @@ function helptext { LAUNCH.sh [-l | --launchAuto] LAUNCH DB + Scripts [-k | --killAll] Kill DB + Scripts - [-kl | --killLaunch] Kill All & launchAuto + [-kl | --killLaunch] Kill All & launchAuto [-ks | --killscript] Scripts [-u | --update] Update AIL [-ut | --thirdpartyUpdate] Update UI/Frontend @@ -697,6 +701,7 @@ while [ "$1" != "" ]; do -k | --killAll ) killall; ;; -kl | --killLaunch ) killall; + isup; launch_all "automatic"; ;; -ks | --killscript ) killscript; From deb89db8188960ee871ed0fff9c67344ecdb2f58 Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Thu, 1 Feb 2024 09:58:21 +0100 Subject: [PATCH 5/5] fix: [ui] Do not show relNotes link if not on a tag --- var/www/modules/settings/templates/settings_index.html | 4 ++++ var/www/templates/settings/settings_index.html | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/var/www/modules/settings/templates/settings_index.html b/var/www/modules/settings/templates/settings_index.html index b6a3fdf7..4dbdce42 100644 --- a/var/www/modules/settings/templates/settings_index.html +++ b/var/www/modules/settings/templates/settings_index.html @@ -43,7 +43,11 @@ AIL Version + {%if ail_version is not none %} {{current_version}} (release note) + {%else%} + {{git_metadata['current_branch']}} + {%endif%} AIL Version + {%if ail_version is not none %} {{ail_version}} (release note) + {%else%} + {{git_metadata['current_branch']}} + {%endif%}