crappyrules/mistborn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '116-cockpit' into 'master'

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

Closes #116

See merge request cyber5k/mistborn!60
This commit is contained in:
Steven Foerster
2021-01-18 15:14:44 +00:00
parent 434472d2fe 78c3ccf9de
commit 6f9bada0dd
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base.yml
+10 -10
View File
@@ -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
scripts/subinstallers/cockpit.sh
+3 -1
View File
@@ -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
+1 -1
View File
@@ -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}