Compare commits

...

3 commits

5 changed files with 37 additions and 10 deletions

View file

@ -92,9 +92,20 @@ services:
labels: labels:
- "docker.group=monitoring" - "docker.group=monitoring"
# https://github.com/xperimental/nextcloud-exporter
nextcloud-exporter:
image: ghcr.io/xperimental/nextcloud-exporter
networks:
- monitoring
environment:
- NEXTCLOUD_SERVER=${NEXTCLOUD_URL}
- NEXTCLOUD_AUTH_TOKEN=${NEXTCLOUD_MONITORING_AUTH_TOKEN}
- NEXTCLOUD_LISTEN_ADDRESS=:9205
labels:
- "docker.group=monitoring"
################################################################## ##################################################################
# here starts data collection # here starts data collection of local host
telegraf_host: telegraf_host:
image: telegraf:${TELEGRAF_VERSION} image: telegraf:${TELEGRAF_VERSION}

View file

@ -35,3 +35,8 @@ scrape_configs:
- job_name: "grafana" - job_name: "grafana"
static_configs: static_configs:
- targets: ["grafana:3000"] - targets: ["grafana:3000"]
- job_name: 'nextcloud'
scrape_interval: 60s
static_configs:
- targets: ['nextcloud-exporter:9205']

View file

@ -33,7 +33,7 @@ services:
app: app:
image: nextcloud:${NC_MAIN_VERSION}-fpm-own image: nextcloud:${NC_MAIN_VERSION}-fpm-own
build: build:
context: ./ context: ./
args: args:
- NC_MAIN_VERSION=${NC_MAIN_VERSION} - NC_MAIN_VERSION=${NC_MAIN_VERSION}
@ -58,7 +58,7 @@ services:
- redis - redis
labels: labels:
- "docker.group=netxtcloud" - "docker.group=netxtcloud"
cron: cron:
image: nextcloud:${NC_MAIN_VERSION}-fpm-own image: nextcloud:${NC_MAIN_VERSION}-fpm-own
@ -131,10 +131,10 @@ services:
- nextcloud - nextcloud
- mariadb - mariadb
healthcheck: healthcheck:
test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] test: ["CMD", "mysqladmin" ,"--user" ,"$MYSQL_USER" ,"--password=$MYSQL_PASSWORD" ,"ping" ,"-h" ,"localhost"]
interval: 20s interval: 20s
timeout: 3s timeout: 3s
labels: labels:
- "docker.group=netxtcloud" - "docker.group=netxtcloud"
@ -173,7 +173,7 @@ services:
test: ["CMD", "redis-cli", "ping"] test: ["CMD", "redis-cli", "ping"]
interval: 5s interval: 5s
timeout: 3s timeout: 3s
labels: labels:
- "docker.group=netxtcloud" - "docker.group=netxtcloud"
@ -182,7 +182,7 @@ services:
networks: networks:
- nextcloud - nextcloud
- web - web
volumes: volumes:
- /etc/timezone:/etc/timezone - /etc/timezone:/etc/timezone
- /etc/localtime:/etc/localtime - /etc/localtime:/etc/localtime
cap_add: cap_add:
@ -212,7 +212,7 @@ services:
networks: networks:
- nextcloud - nextcloud
volumes: volumes:
- ${VOLUMES_PATH}/nextcloud/fonts:/usr/share/fonts/drawio - ${VOLUMES_PATH}/nextcloud/fonts:/usr/share/fonts/drawio
restart: unless-stopped restart: unless-stopped
labels: labels:
- "docker.group=netxtcloud" - "docker.group=netxtcloud"

11
nextcloud/update-nc.sh Executable file
View file

@ -0,0 +1,11 @@
#docker compose build --pull
#docker compose pull --ignore-buildable
#docker compose --project-directory /home/flz/git/selfhost/nextcloud exec --user www-data app php occ status
#docker compose up -d
#watch docker compose ps
docker compose --project-directory /home/flz/git/selfhost/nextcloud exec --user www-data app php occ upgrade
docker compose --project-directory /home/flz/git/selfhost/nextcloud exec --user www-data app php occ maintenance:repair
docker compose --project-directory /home/flz/git/selfhost/nextcloud exec --user www-data app php occ db:add-missing-indices
docker compose --project-directory /home/flz/git/selfhost/nextcloud exec --user www-data app php occ db:add-missing-columns
docker compose --project-directory /home/flz/git/selfhost/nextcloud exec --user www-data app php occ db:add-missing-primary-keys
docker compose --project-directory /home/flz/git/selfhost/nextcloud exec --user www-data app php occ status

View file

@ -6,7 +6,7 @@ services:
- 21116:21116 - 21116:21116
- 21116:21116/udp - 21116:21116/udp
- 21118:21118 - 21118:21118
image: rustdesk/rustdesk-server:latest image: rustdesk/rustdesk-server:${RUSTDESK_VERSION}
command: hbbs -r ${DOMAIN}:21117 -k _ command: hbbs -r ${DOMAIN}:21117 -k _
volumes: volumes:
- ${VOLUMES_PATH}/rustdesk:/root - ${VOLUMES_PATH}/rustdesk:/root
@ -15,7 +15,7 @@ services:
depends_on: depends_on:
- hbbr - hbbr
restart: unless-stopped restart: unless-stopped
labels: labels:
- "docker.group=rustdesk" - "docker.group=rustdesk"
hbbr: hbbr: