Remove monica and restrict logging

This commit is contained in:
Chris
2022-10-05 22:47:24 +00:00
parent 0027c24306
commit 49d4606e8e
2 changed files with 182 additions and 161 deletions

View File

@@ -5,10 +5,18 @@ x-certs: &certs
volumes:
- /opt/ssl:/certs
x-logging: &logging
logging:
driver: "local"
options:
max-size: "5m"
max-file: "2"
version: "3.4"
services:
dashboard:
<<: *logging
image: rmountjoy/dashmachine:latest
volumes:
- dashboard:/dashmachine/dashmachine/user_data
@@ -17,6 +25,7 @@ services:
- nginx
foundry:
<<: *logging
image: felddy/foundryvtt:release
volumes:
- foundry:/data
@@ -35,30 +44,32 @@ services:
networks:
- nginx
monica:
build: ./monica
image: monica
env_file: ./monica/.env
environment:
- APP_URL=https://personel.${DOMAIN}
- DB_PASSWORD=${DB_PASSWORD}
- DB_USERNAME=${DB_USER}
- MAIL_FROM_ADDRESS=${MAIL_FROM}
- MAIL_HOST=${MAIL_HOST}
- MAIL_PORT=${MAIL_PORT}
- MAIL_USERNAME=${MAIL_USER}
- MAIL_PASSWORD=${MAIL_PASSWORD}
volumes:
- monica-data:/var/www/html/storage
- monica-public:/var/www/html/public
restart: always
depends_on:
- db
networks:
- db
- nginx
# monica:
# <<: *logging
# build: ./monica
# image: monica
# env_file: ./monica/.env
# environment:
# - APP_URL=https://personel.${DOMAIN}
# - DB_PASSWORD=${DB_PASSWORD}
# - DB_USERNAME=${DB_USER}
# - MAIL_FROM_ADDRESS=${MAIL_FROM}
# - MAIL_HOST=${MAIL_HOST}
# - MAIL_PORT=${MAIL_PORT}
# - MAIL_USERNAME=${MAIL_USER}
# - MAIL_PASSWORD=${MAIL_PASSWORD}
# volumes:
# - monica-data:/var/www/html/storage
# - monica-public:/var/www/html/public
# restart: always
# depends_on:
# - db
# networks:
# - db
# - nginx
nextcloud:
<<: *logging
build: ./nextcloud
image: nextcloud
restart: always
@@ -90,13 +101,14 @@ services:
- "office.scarif.space:${LOCAL_IP}"
collabora:
<<: *logging
image: collabora/code
restart: always
cap_add:
- MKNOD
volumes:
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
# volumes:
# - /etc/timezone:/etc/timezone:ro
# - /etc/localtime:/etc/localtime:ro
environment:
- DONT_GEN_SSL_CERT="True"
- domain=tower.${DOMAIN}
@@ -113,6 +125,7 @@ services:
- "office.scarif.space:${LOCAL_IP}"
pinry:
<<: *logging
image: 'getpinry/pinry'
volumes:
- pinry:/data
@@ -124,6 +137,7 @@ services:
- db
gitea:
<<: *logging
image: gitea/gitea:1
environment:
- "APP_NAME=Labs: Where the good stuff happens"
@@ -153,6 +167,7 @@ services:
- db
jitsi:
<<: *logging
image: jitsi/web:latest
restart: always
volumes:
@@ -251,6 +266,7 @@ services:
# XMPP server
prosody:
<<: *logging
image: jitsi/prosody:latest
restart: always
expose:
@@ -320,6 +336,7 @@ services:
# Focus component
jicofo:
<<: *logging
image: jitsi/jicofo:latest
restart: always
volumes:
@@ -349,6 +366,7 @@ services:
# Video bridge
jvb:
<<: *logging
image: jitsi/jvb:latest
restart: always
ports:
@@ -383,6 +401,7 @@ services:
db:
<<: *logging
image: mariadb
command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --skip-innodb-read-only-compressed
environment:
@@ -403,6 +422,7 @@ services:
- redis
nginx:
<<: *logging
image: nginx:alpine
restart: always
volumes:
@@ -416,7 +436,7 @@ services:
- DOMAIN=${DOMAIN}
depends_on:
- dashboard
- monica
# - monica
- nextcloud
- gitea
- collabora
@@ -451,3 +471,4 @@ networks:
nginx:
redis:
meet.jitsi: