mirror of
https://github.com/netbirdio/netbird.git
synced 2024-10-05 01:32:05 +02:00
Add log config and removed domain (#2194)
removed domainname for coturn service as it is needed only for SSL configs Added log configuration for each service with a rotation and max size ensure ZITADEL_DATABASE=postgres works
This commit is contained in:
parent
17874771cc
commit
43a8ba97e3
@ -28,7 +28,11 @@ services:
|
|||||||
- LETSENCRYPT_EMAIL=$NETBIRD_LETSENCRYPT_EMAIL
|
- LETSENCRYPT_EMAIL=$NETBIRD_LETSENCRYPT_EMAIL
|
||||||
volumes:
|
volumes:
|
||||||
- $LETSENCRYPT_VOLUMENAME:/etc/letsencrypt/
|
- $LETSENCRYPT_VOLUMENAME:/etc/letsencrypt/
|
||||||
|
logging:
|
||||||
|
driver: "json-file"
|
||||||
|
options:
|
||||||
|
max-size: "500m"
|
||||||
|
max-file: "2"
|
||||||
# Signal
|
# Signal
|
||||||
signal:
|
signal:
|
||||||
image: netbirdio/signal:$NETBIRD_SIGNAL_TAG
|
image: netbirdio/signal:$NETBIRD_SIGNAL_TAG
|
||||||
@ -40,6 +44,11 @@ services:
|
|||||||
# # port and command for Let's Encrypt validation
|
# # port and command for Let's Encrypt validation
|
||||||
# - 443:443
|
# - 443:443
|
||||||
# command: ["--letsencrypt-domain", "$NETBIRD_LETSENCRYPT_DOMAIN", "--log-file", "console"]
|
# command: ["--letsencrypt-domain", "$NETBIRD_LETSENCRYPT_DOMAIN", "--log-file", "console"]
|
||||||
|
logging:
|
||||||
|
driver: "json-file"
|
||||||
|
options:
|
||||||
|
max-size: "500m"
|
||||||
|
max-file: "2"
|
||||||
|
|
||||||
# Management
|
# Management
|
||||||
management:
|
management:
|
||||||
@ -63,12 +72,16 @@ services:
|
|||||||
"--single-account-mode-domain=$NETBIRD_MGMT_SINGLE_ACCOUNT_MODE_DOMAIN",
|
"--single-account-mode-domain=$NETBIRD_MGMT_SINGLE_ACCOUNT_MODE_DOMAIN",
|
||||||
"--dns-domain=$NETBIRD_MGMT_DNS_DOMAIN"
|
"--dns-domain=$NETBIRD_MGMT_DNS_DOMAIN"
|
||||||
]
|
]
|
||||||
|
logging:
|
||||||
|
driver: "json-file"
|
||||||
|
options:
|
||||||
|
max-size: "500m"
|
||||||
|
max-file: "2"
|
||||||
# Coturn
|
# Coturn
|
||||||
coturn:
|
coturn:
|
||||||
image: coturn/coturn:$COTURN_TAG
|
image: coturn/coturn:$COTURN_TAG
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
domainname: $TURN_DOMAIN
|
#domainname: $TURN_DOMAIN # only needed when TLS is enabled
|
||||||
volumes:
|
volumes:
|
||||||
- ./turnserver.conf:/etc/turnserver.conf:ro
|
- ./turnserver.conf:/etc/turnserver.conf:ro
|
||||||
# - ./privkey.pem:/etc/coturn/private/privkey.pem:ro
|
# - ./privkey.pem:/etc/coturn/private/privkey.pem:ro
|
||||||
@ -76,7 +89,11 @@ services:
|
|||||||
network_mode: host
|
network_mode: host
|
||||||
command:
|
command:
|
||||||
- -c /etc/turnserver.conf
|
- -c /etc/turnserver.conf
|
||||||
|
logging:
|
||||||
|
driver: "json-file"
|
||||||
|
options:
|
||||||
|
max-size: "500m"
|
||||||
|
max-file: "2"
|
||||||
volumes:
|
volumes:
|
||||||
$MGMT_VOLUMENAME:
|
$MGMT_VOLUMENAME:
|
||||||
$SIGNAL_VOLUMENAME:
|
$SIGNAL_VOLUMENAME:
|
||||||
|
@ -463,7 +463,11 @@ initEnvironment() {
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $ZITADEL_DATABASE == "" ]]; then
|
if [[ $ZITADEL_DATABASE == "cockroach" ]]; then
|
||||||
|
echo "Use CockroachDB as Zitadel database."
|
||||||
|
ZDB=$(renderDockerComposeCockroachDB)
|
||||||
|
ZITADEL_DB_ENV=$(renderZitadelCockroachDBEnv)
|
||||||
|
else
|
||||||
echo "Use Postgres as default Zitadel database."
|
echo "Use Postgres as default Zitadel database."
|
||||||
echo "For using CockroachDB please the environment variable 'export ZITADEL_DATABASE=cockroach'."
|
echo "For using CockroachDB please the environment variable 'export ZITADEL_DATABASE=cockroach'."
|
||||||
POSTGRES_ROOT_PASSWORD="$(openssl rand -base64 32 | sed 's/=//g')@"
|
POSTGRES_ROOT_PASSWORD="$(openssl rand -base64 32 | sed 's/=//g')@"
|
||||||
@ -471,10 +475,6 @@ initEnvironment() {
|
|||||||
ZDB=$(renderDockerComposePostgres)
|
ZDB=$(renderDockerComposePostgres)
|
||||||
ZITADEL_DB_ENV=$(renderZitadelPostgresEnv)
|
ZITADEL_DB_ENV=$(renderZitadelPostgresEnv)
|
||||||
renderPostgresEnv > zdb.env
|
renderPostgresEnv > zdb.env
|
||||||
elif [[ $ZITADEL_DATABASE == "cockroach" ]]; then
|
|
||||||
echo "Use CockroachDB as Zitadel database."
|
|
||||||
ZDB=$(renderDockerComposeCockroachDB)
|
|
||||||
ZITADEL_DB_ENV=$(renderZitadelCockroachDBEnv)
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo Rendering initial files...
|
echo Rendering initial files...
|
||||||
@ -767,11 +767,21 @@ services:
|
|||||||
networks: [netbird]
|
networks: [netbird]
|
||||||
env_file:
|
env_file:
|
||||||
- ./dashboard.env
|
- ./dashboard.env
|
||||||
|
logging:
|
||||||
|
driver: "json-file"
|
||||||
|
options:
|
||||||
|
max-size: "500m"
|
||||||
|
max-file: "2"
|
||||||
# Signal
|
# Signal
|
||||||
signal:
|
signal:
|
||||||
image: netbirdio/signal:latest
|
image: netbirdio/signal:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks: [netbird]
|
networks: [netbird]
|
||||||
|
logging:
|
||||||
|
driver: "json-file"
|
||||||
|
options:
|
||||||
|
max-size: "500m"
|
||||||
|
max-file: "2"
|
||||||
# Management
|
# Management
|
||||||
management:
|
management:
|
||||||
image: netbirdio/management:latest
|
image: netbirdio/management:latest
|
||||||
@ -789,16 +799,26 @@ services:
|
|||||||
"--dns-domain=netbird.selfhosted",
|
"--dns-domain=netbird.selfhosted",
|
||||||
"--idp-sign-key-refresh-enabled",
|
"--idp-sign-key-refresh-enabled",
|
||||||
]
|
]
|
||||||
|
logging:
|
||||||
|
driver: "json-file"
|
||||||
|
options:
|
||||||
|
max-size: "500m"
|
||||||
|
max-file: "2"
|
||||||
# Coturn, AKA relay server
|
# Coturn, AKA relay server
|
||||||
coturn:
|
coturn:
|
||||||
image: coturn/coturn
|
image: coturn/coturn
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
domainname: netbird.relay.selfhosted
|
#domainname: netbird.relay.selfhosted
|
||||||
volumes:
|
volumes:
|
||||||
- ./turnserver.conf:/etc/turnserver.conf:ro
|
- ./turnserver.conf:/etc/turnserver.conf:ro
|
||||||
network_mode: host
|
network_mode: host
|
||||||
command:
|
command:
|
||||||
- -c /etc/turnserver.conf
|
- -c /etc/turnserver.conf
|
||||||
|
logging:
|
||||||
|
driver: "json-file"
|
||||||
|
options:
|
||||||
|
max-size: "500m"
|
||||||
|
max-file: "2"
|
||||||
# Zitadel - identity provider
|
# Zitadel - identity provider
|
||||||
zitadel:
|
zitadel:
|
||||||
restart: 'always'
|
restart: 'always'
|
||||||
@ -813,6 +833,11 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ./machinekey:/machinekey
|
- ./machinekey:/machinekey
|
||||||
- netbird_zitadel_certs:/zdb-certs:ro
|
- netbird_zitadel_certs:/zdb-certs:ro
|
||||||
|
logging:
|
||||||
|
driver: "json-file"
|
||||||
|
options:
|
||||||
|
max-size: "500m"
|
||||||
|
max-file: "2"
|
||||||
$ZDB
|
$ZDB
|
||||||
netbird_zdb_data:
|
netbird_zdb_data:
|
||||||
netbird_management:
|
netbird_management:
|
||||||
@ -842,6 +867,11 @@ renderDockerComposeCockroachDB() {
|
|||||||
timeout: '30s'
|
timeout: '30s'
|
||||||
retries: 5
|
retries: 5
|
||||||
start_period: '20s'
|
start_period: '20s'
|
||||||
|
logging:
|
||||||
|
driver: "json-file"
|
||||||
|
options:
|
||||||
|
max-size: "500m"
|
||||||
|
max-file: "2"
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
netbird_zdb_certs:
|
netbird_zdb_certs:
|
||||||
@ -865,7 +895,11 @@ renderDockerComposePostgres() {
|
|||||||
timeout: 60s
|
timeout: 60s
|
||||||
retries: 10
|
retries: 10
|
||||||
start_period: 5s
|
start_period: 5s
|
||||||
|
logging:
|
||||||
|
driver: "json-file"
|
||||||
|
options:
|
||||||
|
max-size: "500m"
|
||||||
|
max-file: "2"
|
||||||
volumes:
|
volumes:
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user