diff --git a/extra/scirius.yml b/extra/scirius.yml index c2cae28..f319907 100644 --- a/extra/scirius.yml +++ b/extra/scirius.yml @@ -6,6 +6,8 @@ services: image: "cyber5k/scirius:${MISTBORN_TAG}" #environment: # - SECRET_KEY: + env_file: + - ../.envs/.production/.scirius volumes: - ../../mistborn_volumes/extra/scirius/data:/data - ../../mistborn_volumes/extra/scirius/logs:/logs diff --git a/scripts/env/suricata_init.sh b/scripts/env/suricata_init.sh index 4e79514..b3123f5 100755 --- a/scripts/env/suricata_init.sh +++ b/scripts/env/suricata_init.sh @@ -2,6 +2,8 @@ set -e +source /opt/mistborn/scripts/subinstallers/platform.sh + # minimal dependencies sudo -E apt-get -y install libpcre3 libpcre3-dbg libpcre3-dev build-essential libpcap-dev \ libyaml-0-2 libyaml-dev pkg-config zlib1g zlib1g-dev \ diff --git a/scripts/services/Mistborn-suricata.service b/scripts/services/Mistborn-suricata.service index e7d0c7b..9ba475e 100644 --- a/scripts/services/Mistborn-suricata.service +++ b/scripts/services/Mistborn-suricata.service @@ -9,7 +9,7 @@ Restart=always User=root Group=docker PermissionsStartOnly=true -#EnvironmentFile=/opt/mistborn/.envs/.production/.scirius +EnvironmentFile=/opt/mistborn/.env ExecStartPre=/opt/mistborn/scripts/env/suricata_init.sh # Shutdown container (if running) when unit is stopped ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/extra/scirius.yml down diff --git a/scripts/subinstallers/gen_prod_env.sh b/scripts/subinstallers/gen_prod_env.sh index bc06297..a6ee7d5 100755 --- a/scripts/subinstallers/gen_prod_env.sh +++ b/scripts/subinstallers/gen_prod_env.sh @@ -89,4 +89,9 @@ echo "POSTGRES_DB=guacamole_db" >> $GUAC_PROD_FILE echo "POSTGRES_DATABASE=guacamole_db" >> $GUAC_PROD_FILE echo "POSTGRES_USER=guac_user" >> $GUAC_PROD_FILE echo "POSTGRES_PASSWORD=$GUAC_PASSWORD" >> $GUAC_PROD_FILE -echo "MISTBORN_DEFAULT_PASSWORD=$MISTBORN_DEFAULT_PASSWORD" >> $GUAC_PROD_FILE \ No newline at end of file +echo "MISTBORN_DEFAULT_PASSWORD=$MISTBORN_DEFAULT_PASSWORD" >> $GUAC_PROD_FILE + +# Scirius +SCIRIUS_PROD_FILE="./.envs/.production/.scirius" +SCIRIUS_SECRET_KEY=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(50)]))") +echo "SECRET_KEY=$SCIRIUS_SECRET_KEY" > $SCIRIUS_PROD_FILE \ No newline at end of file