Merge branch '116-cockpit' into 'master'

Resolve "E: Package 'cockpit-docker' has no installation candidate"

Closes #116

See merge request cyber5k/mistborn!60

base.yml

@@ -145,16 +145,16 @@ services:
     restart: unless-stopped
     
 
-  flower:
+  #flower:
-    image: "cyber5k/mistborn:${MISTBORN_TAG}"
+  #  image: "cyber5k/mistborn:${MISTBORN_TAG}"
-    container_name: mistborn_production_flower
+  #  container_name: mistborn_production_flower
-    env_file:
+  #  env_file:
-      - ./.envs/.production/.django
+  #    - ./.envs/.production/.django
-      - ./.envs/.production/.postgres
+  #    - ./.envs/.production/.postgres
-    ports:
+  #  ports:
-      - "5555:5555/tcp"
+  #    - "5555:5555/tcp"
-    command: /start-flower
+  #  command: /start-flower
-    restart: unless-stopped
+  #  restart: unless-stopped
   
   pihole:
    container_name: mistborn_production_pihole

scripts/subinstallers/cockpit.sh

@@ -16,9 +16,11 @@ fi
     
 sudo -E apt-get install -y cockpit
 
-if $(sudo apt-cache show cockpit-docker > /dev/null 2>&1) ; then
+if [ $(sudo apt-cache show cockpit-docker > /dev/null 2>&1) ]; then
     # no longer supported upstream in Ubuntu 20.04
     sudo -E apt-get install -y cockpit-docker
+elif [ $(sudo apt-cache show cockpit-podman > /dev/null 2>&1) ]; then
+    sudo -E apt-get install -y cockpit-podman
 fi
 
 sudo cp ./scripts/conf/cockpit.conf /etc/cockpit/cockpit.conf

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}