merge master

.gitlab-ci.yml

@@ -17,7 +17,8 @@ include:
 docker_build:
   stage: test
   script:
+    - apk add bash
     - apk add docker-compose
-    - scripts/subinstallers/gen_prod_env.sh "$MISTBORN_DEFAULT_PASSWORD"
+    - bash scripts/subinstallers/gen_prod_env.sh "$MISTBORN_DEFAULT_PASSWORD"
     - docker-compose -f base.yml build
 

base.yml

@@ -145,7 +145,6 @@ services:
     command: /start-celerybeat
     restart: unless-stopped
     
-
   # flower:
   #   image: "cyber5k/mistborn:${MISTBORN_TAG}"
   #   container_name: mistborn_production_flower

scripts/subinstallers/gen_prod_env.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 figlet "Mistborn: Container Credentials"
 

scripts/subinstallers/openssl.sh

@@ -17,7 +17,7 @@ sudo -E mkdir -p $KEY_FOLDER
 sudo -E rm -f ${KEY_FOLDER}/*
 
 # generate crt and key
-sudo -E openssl req -x509 -sha256 -nodes -days 397 -newkey rsa:4096 -keyout $KEY_PATH -out $CRT_PATH -addext "subjectAltName = DNS:*.mistborn" -addext extendedKeyUsage=serverAuth -subj "/C=US/ST=New York/L=New York/O=cyber5k/OU=mistborn/CN=*.mistborn/emailAddress=mistborn@localhost"
+sudo -E openssl req -x509 -sha256 -nodes -days 397 -newkey rsa:4096 -keyout $KEY_PATH -out $CRT_PATH -addext "subjectAltName=DNS:*.mistborn,DNS:home.mistborn,DNS:jitsi.mistborn,DNS:bitwarden.mistborn,DNS:chat.mistborn,DNS:homeassistant.mistborn,DNS:jellyfin.mistborn,DNS:syncthing.mistborn,DNS:nextcloud.mistborn,DNS:onlyoffice.mistborn" -addext extendedKeyUsage=serverAuth -subj "/C=US/ST=New York/L=New York/O=cyber5k/OU=mistborn/CN=*.mistborn/emailAddress=mistborn@localhost"
 
 # set permissions
 sudo -E chown -R mistborn:mistborn ${KEY_FOLDER}