Skip to content
Snippets Groups Projects
Commit 0a5c1f5c authored by David Schmitz's avatar David Schmitz
Browse files

install-*.sh docker-compose: update

parent 10bb4f54
No related branches found
No related tags found
No related merge requests found
...@@ -11,6 +11,6 @@ else ...@@ -11,6 +11,6 @@ else
--setup_admin_user --setup_admin_user5 admin ${ADMIN_PASS} ${ADMIN_EMAIL} ${FOD_ORG} ${FOD_ORG_NET} \ --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 \ --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} --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 touch /opt/setup_ok
fi fi
...@@ -845,7 +845,7 @@ if [ "$install_fodproper" = 1 ]; then ...@@ -845,7 +845,7 @@ if [ "$install_fodproper" = 1 ]; then
( (
set +e # for now ignore potential errors, especially in case user already exists 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" [ ! -f "fodenv.sh" ] || source "./fodenv.sh"
{ cat /dev/fd/5 | ./manage.py shell; } 5<<EOF { cat /dev/fd/5 | ./manage.py shell; } 5<<EOF
......
...@@ -972,7 +972,7 @@ if [ "$install_fodproper" = 1 ]; then ...@@ -972,7 +972,7 @@ if [ "$install_fodproper" = 1 ]; then
( (
set +e # for now ignore potential errors, especially in case user already exists 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 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 true
) )
...@@ -986,7 +986,7 @@ if [ "$install_fodproper" = 1 ]; then ...@@ -986,7 +986,7 @@ if [ "$install_fodproper" = 1 ]; then
( (
set +e # for now ignore potential errors, especially in case user already exists 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" [ ! -f "fodenv.sh" ] || source "./fodenv.sh"
{ cat /dev/fd/5 | ./manage.py shell; } 5<<EOF { cat /dev/fd/5 | ./manage.py shell; } 5<<EOF
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment