From 45ee4c7150b643a634361ac1c4078616e86ee0b8 Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Fri, 9 Apr 2021 09:40:39 -0400 Subject: [PATCH] scirius --- extra/scirius.yml | 6 +++--- ...Mistborn-suricata.service => Mistborn-scirius.service} | 8 ++++---- scripts/services/{suricata => scirius}/init.sh | 0 scripts/subinstallers/extra/{suricata.sh => scirius.sh} | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename scripts/services/{Mistborn-suricata.service => Mistborn-scirius.service} (51%) rename scripts/services/{suricata => scirius}/init.sh (100%) rename scripts/subinstallers/extra/{suricata.sh => scirius.sh} (84%) diff --git a/extra/scirius.yml b/extra/scirius.yml index 16bbc80..2dfde7e 100644 --- a/extra/scirius.yml +++ b/extra/scirius.yml @@ -7,7 +7,7 @@ services: #environment: # - SECRET_KEY: env_file: - - ../.envs/.production/.suricata + - ../.envs/.production/.scirius volumes: - ../../mistborn_volumes/extra/scirius/data:/data - ../../mistborn_volumes/extra/scirius/logs:/logs @@ -16,10 +16,10 @@ services: - /var/run/suricata-command.socket:/var/run/suricata-command.socket labels: - "traefik.enable=true" - - "traefik.http.routers.scirius-http.rule=Host(`suricata.mistborn`)" + - "traefik.http.routers.scirius-http.rule=Host(`scirius.mistborn`)" - "traefik.http.routers.scirius-http.entrypoints=web" - "traefik.http.routers.scirius-http.middlewares=mistborn_auth@file" - - "traefik.http.routers.scirius-https.rule=Host(`suricata.mistborn`)" + - "traefik.http.routers.scirius-https.rule=Host(`scirius.mistborn`)" - "traefik.http.routers.scirius-https.entrypoints=websecure" - "traefik.http.routers.scirius-https.middlewares=mistborn_auth@file" - "traefik.http.routers.scirius-https.tls.certresolver=basic" diff --git a/scripts/services/Mistborn-suricata.service b/scripts/services/Mistborn-scirius.service similarity index 51% rename from scripts/services/Mistborn-suricata.service rename to scripts/services/Mistborn-scirius.service index 48588b6..fc03916 100644 --- a/scripts/services/Mistborn-suricata.service +++ b/scripts/services/Mistborn-scirius.service @@ -1,5 +1,5 @@ [Unit] -Description=Mistborn Suricata +Description=Mistborn Scirius Service Requires=Mistborn-base.service After=Mistborn-base.service PartOf=Mistborn-base.service @@ -11,12 +11,12 @@ User=root Group=docker PermissionsStartOnly=true # Shutdown container (if running) when unit is stopped -ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh suricata docker-compose -f /opt/mistborn/extra/scirius.yml down +ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh scirius docker-compose -f /opt/mistborn/extra/scirius.yml down # Start container when unit is started -ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh suricata docker-compose -f /opt/mistborn/extra/scirius.yml up --build +ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh scirius docker-compose -f /opt/mistborn/extra/scirius.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh suricata docker-compose -f /opt/mistborn/extra/scirius.yml down +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh scirius docker-compose -f /opt/mistborn/extra/scirius.yml down # Post stop [Install] diff --git a/scripts/services/suricata/init.sh b/scripts/services/scirius/init.sh similarity index 100% rename from scripts/services/suricata/init.sh rename to scripts/services/scirius/init.sh diff --git a/scripts/subinstallers/extra/suricata.sh b/scripts/subinstallers/extra/scirius.sh similarity index 84% rename from scripts/subinstallers/extra/suricata.sh rename to scripts/subinstallers/extra/scirius.sh index f538b05..6c51d91 100644 --- a/scripts/subinstallers/extra/suricata.sh +++ b/scripts/subinstallers/extra/scirius.sh @@ -4,6 +4,6 @@ SCIRIUS_PROD_FILE="$1" 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 -echo "ALLOWED_HOSTS=suricata.mistborn" >> $SCIRIUS_PROD_FILE +echo "ALLOWED_HOSTS=scirius.mistborn" >> $SCIRIUS_PROD_FILE echo "DJANGO_SUPERUSER_USERNAME=mistborn" >> $SCIRIUS_PROD_FILE echo "DJANGO_SUPERUSER_EMAIL=mistborn@email.mistborn" >> $SCIRIUS_PROD_FILE \ No newline at end of file