Browse Source

Merge branch '140-updates' into 'master'

updates

Closes #140

See merge request cyber5k/mistborn!67
merge-requests/68/merge
Steven Foerster 5 years ago
parent
commit
65ecd7ae7b
  1. 2
      README.md
  2. 2
      base.yml
  3. 8
      extra/jitsi-meet.yml

2
README.md

@ -344,7 +344,7 @@ But wait, there's more! You can:
| Jitsi Meet | [Jitsi Meet](https://play.google.com/store/apps/details?id=org.jitsi.meet) | [Jitsi Meet](https://apps.apple.com/us/app/jitsi-meet/id1165103905) | | Jitsi Meet | [Jitsi Meet](https://play.google.com/store/apps/details?id=org.jitsi.meet) | [Jitsi Meet](https://apps.apple.com/us/app/jitsi-meet/id1165103905) |
| Bitwarden | [Bitwarden](https://play.google.com/store/apps/details?id=com.x8bit.bitwarden) | [Bitwarden](https://apps.apple.com/us/app/bitwarden-password-manager/id1137397744) | | Bitwarden | [Bitwarden](https://play.google.com/store/apps/details?id=com.x8bit.bitwarden) | [Bitwarden](https://apps.apple.com/us/app/bitwarden-password-manager/id1137397744) |
| Jellyfin | [Jellyfin](https://play.google.com/store/apps/details?id=org.jellyfin.mobile) | [Jellyfin](https://apps.apple.com/us/app/jellyfin-mobile/id1480192618) | | Jellyfin | [Jellyfin](https://play.google.com/store/apps/details?id=org.jellyfin.mobile) | [Jellyfin](https://apps.apple.com/us/app/jellyfin-mobile/id1480192618) |
| Home Assistant | [Home Assistant](https://play.google.com/store/apps/details?id=io.homeassistant.companion.android) | | | Home Assistant | [Home Assistant](https://play.google.com/store/apps/details?id=io.homeassistant.companion.android) | [Home Assistant](https://apps.apple.com/us/app/home-assistant/id1099568401) |
| Rocket.Chat | [Rocket.Chat](https://play.google.com/store/apps/details?id=chat.rocket.android) | [Rocket.Chat](https://apps.apple.com/us/app/rocket-chat/id1148741252) | | Rocket.Chat | [Rocket.Chat](https://play.google.com/store/apps/details?id=chat.rocket.android) | [Rocket.Chat](https://apps.apple.com/us/app/rocket-chat/id1148741252) |
## TLS Certificate ## TLS Certificate

2
base.yml

@ -158,7 +158,7 @@ services:
pihole: pihole:
container_name: mistborn_production_pihole container_name: mistborn_production_pihole
image: pihole/pihole:v5.5.1 image: pihole/pihole:latest
env_file: env_file:
- ./.envs/.production/.pihole - ./.envs/.production/.pihole
ports: ports:

8
extra/jitsi-meet.yml

@ -3,7 +3,7 @@ version: '3'
services: services:
# Frontend # Frontend
jitsi-web: jitsi-web:
image: jitsi/web:stable-5142-3 image: jitsi/web:latest
restart: unless-stopped restart: unless-stopped
#ports: #ports:
#- '${HTTP_PORT}:80' #- '${HTTP_PORT}:80'
@ -111,7 +111,7 @@ services:
# XMPP server # XMPP server
jitsi-prosody: jitsi-prosody:
image: jitsi/prosody:stable-5142-3 image: jitsi/prosody:latest
restart: unless-stopped restart: unless-stopped
expose: expose:
- '5222' - '5222'
@ -182,7 +182,7 @@ services:
# Focus component # Focus component
jitsi-jicofo: jitsi-jicofo:
image: jitsi/jicofo:stable-5142-3 image: jitsi/jicofo:latest
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ${CONFIG}/jicofo:/config:Z - ${CONFIG}/jicofo:/config:Z
@ -213,7 +213,7 @@ services:
# Video bridge # Video bridge
jitsi-jvb: jitsi-jvb:
image: jitsi/jvb:stable-5142-3 image: jitsi/jvb:latest
restart: unless-stopped restart: unless-stopped
ports: ports:
- '${JVB_PORT}:${JVB_PORT}/udp' - '${JVB_PORT}:${JVB_PORT}/udp'

Loading…
Cancel
Save