From 0a5c1f5c7a44ad945e6ce7fc6571d1fd152a88ed Mon Sep 17 00:00:00 2001
From: David Schmitz <schmitz@lrz.de>
Date: Thu, 27 Jul 2023 09:22:51 +0000
Subject: [PATCH] install-*.sh docker-compose: update
---
docker-compose/fod_setup_environment.sh | 2 +-
install-centos.sh | 2 +-
install-debian.sh | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docker-compose/fod_setup_environment.sh b/docker-compose/fod_setup_environment.sh
index b2a590f8..404d12bc 100755
--- a/docker-compose/fod_setup_environment.sh
+++ b/docker-compose/fod_setup_environment.sh
@@ -11,6 +11,6 @@ else
--setup_admin_user --setup_admin_user5 admin ${ADMIN_PASS} ${ADMIN_EMAIL} ${FOD_ORG} ${FOD_ORG_NET} \
--setup_test_rule --setup_test_rule5 testrtr1 10.1.10.11/32 10.2.10.12/32 1 admin \
--exabgp ${FOD_EXABGP_LOCAL_ID} ${FOD_EXABGP_LOCAL_IP} ${FOD_EXABGP_LOCAL_AS} ${FOD_EXABGP_REMOTE_ID} ${FOD_EXABGP_REMOTE_IP} ${FOD_EXABGP_REMOTE_AS}
- /opt/FOD/venv/bin/python -m pip install exabgp
+ /opt/FOD/../venv/bin/python -m pip install exabgp
touch /opt/setup_ok
fi
diff --git a/install-centos.sh b/install-centos.sh
index f65582ba..4167658b 100755
--- a/install-centos.sh
+++ b/install-centos.sh
@@ -845,7 +845,7 @@ if [ "$install_fodproper" = 1 ]; then
(
set +e # for now ignore potential errors, especially in case user already exists
- source ./venv/bin/activate
+ source "$venv_dir/bin/activate"
[ ! -f "fodenv.sh" ] || source "./fodenv.sh"
{ cat /dev/fd/5 | ./manage.py shell; } 5<<EOF
diff --git a/install-debian.sh b/install-debian.sh
index cf480c2c..615142e7 100755
--- a/install-debian.sh
+++ b/install-debian.sh
@@ -972,7 +972,7 @@ if [ "$install_fodproper" = 1 ]; then
(
set +e # for now ignore potential errors, especially in case user already exists
- source ./venv/bin/activate
+ source "$venv_dir/bin/activate"
echo "from flowspec.init_setup import init_admin_user; init_admin_user('$setup_adminuser__username', '$setup_adminuser__pwd', '$setup_adminuser__email', '$setup_adminuser__peer_name', '$setup_adminuser__peer_ip_prefix1')" | DJANGO_SETTINGS_MODULE="flowspy.settings" ./manage.py shell
true
)
@@ -986,7 +986,7 @@ if [ "$install_fodproper" = 1 ]; then
(
set +e # for now ignore potential errors, especially in case user already exists
- source ./venv/bin/activate
+ source "$venv_dir/bin/activate"
[ ! -f "fodenv.sh" ] || source "./fodenv.sh"
{ cat /dev/fd/5 | ./manage.py shell; } 5<<EOF
--
GitLab