From eb56ed55262e2f046ea14ac8cbc8db848e8d969c Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Mon, 18 Jan 2021 09:59:07 -0500
Subject: [PATCH] tweaks

---
 base.yml                         | 20 ++++++++++----------
 scripts/subinstallers/openssl.sh |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/base.yml b/base.yml
index bfc6acc..60dcc5b 100644
--- a/base.yml
+++ b/base.yml
@@ -145,16 +145,16 @@ services:
     restart: unless-stopped
     
 
-  flower:
-    image: "cyber5k/mistborn:${MISTBORN_TAG}"
-    container_name: mistborn_production_flower
-    env_file:
-      - ./.envs/.production/.django
-      - ./.envs/.production/.postgres
-    ports:
-      - "5555:5555/tcp"
-    command: /start-flower
-    restart: unless-stopped
+  #flower:
+  #  image: "cyber5k/mistborn:${MISTBORN_TAG}"
+  #  container_name: mistborn_production_flower
+  #  env_file:
+  #    - ./.envs/.production/.django
+  #    - ./.envs/.production/.postgres
+  #  ports:
+  #    - "5555:5555/tcp"
+  #  command: /start-flower
+  #  restart: unless-stopped
   
   pihole:
    container_name: mistborn_production_pihole
diff --git a/scripts/subinstallers/openssl.sh b/scripts/subinstallers/openssl.sh
index 86fd52e..76e2dbe 100755
--- a/scripts/subinstallers/openssl.sh
+++ b/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,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"
+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}