diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml index 4c14b36..c0c45c5 100644 --- a/monitoring/docker-compose.yaml +++ b/monitoring/docker-compose.yaml @@ -92,20 +92,9 @@ services: labels: - "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 of local host + # here starts data collection telegraf_host: image: telegraf:${TELEGRAF_VERSION} diff --git a/monitoring/prometheus.yml b/monitoring/prometheus.yml index fdaaa7b..5f0575b 100644 --- a/monitoring/prometheus.yml +++ b/monitoring/prometheus.yml @@ -35,8 +35,3 @@ scrape_configs: - job_name: "grafana" static_configs: - targets: ["grafana:3000"] - - - job_name: 'nextcloud' - scrape_interval: 60s - static_configs: - - targets: ['nextcloud-exporter:9205'] diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml index 8a50b11..90aaf18 100644 --- a/nextcloud/docker-compose.yaml +++ b/nextcloud/docker-compose.yaml @@ -33,7 +33,7 @@ services: app: image: nextcloud:${NC_MAIN_VERSION}-fpm-own - build: + build: context: ./ args: - NC_MAIN_VERSION=${NC_MAIN_VERSION} @@ -58,7 +58,7 @@ services: - redis labels: - "docker.group=netxtcloud" - + cron: image: nextcloud:${NC_MAIN_VERSION}-fpm-own @@ -131,10 +131,10 @@ services: - nextcloud - mariadb healthcheck: - test: ["CMD", "mysqladmin" ,"--user" ,"$MYSQL_USER" ,"--password=$MYSQL_PASSWORD" ,"ping" ,"-h" ,"localhost"] + test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] interval: 20s timeout: 3s - labels: + labels: - "docker.group=netxtcloud" @@ -173,7 +173,7 @@ services: test: ["CMD", "redis-cli", "ping"] interval: 5s timeout: 3s - labels: + labels: - "docker.group=netxtcloud" @@ -182,7 +182,7 @@ services: networks: - nextcloud - web - volumes: + volumes: - /etc/timezone:/etc/timezone - /etc/localtime:/etc/localtime cap_add: @@ -212,7 +212,7 @@ services: networks: - nextcloud volumes: - - ${VOLUMES_PATH}/nextcloud/fonts:/usr/share/fonts/drawio + - ${VOLUMES_PATH}/nextcloud/fonts:/usr/share/fonts/drawio restart: unless-stopped labels: - "docker.group=netxtcloud" diff --git a/nextcloud/update-nc.sh b/nextcloud/update-nc.sh deleted file mode 100755 index 2886d18..0000000 --- a/nextcloud/update-nc.sh +++ /dev/null @@ -1,11 +0,0 @@ -#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 diff --git a/rustdesk/docker-compose.yml b/rustdesk/docker-compose.yml index 959ae77..f086ece 100644 --- a/rustdesk/docker-compose.yml +++ b/rustdesk/docker-compose.yml @@ -6,7 +6,7 @@ services: - 21116:21116 - 21116:21116/udp - 21118:21118 - image: rustdesk/rustdesk-server:${RUSTDESK_VERSION} + image: rustdesk/rustdesk-server:latest command: hbbs -r ${DOMAIN}:21117 -k _ volumes: - ${VOLUMES_PATH}/rustdesk:/root @@ -15,7 +15,7 @@ services: depends_on: - hbbr restart: unless-stopped - labels: + labels: - "docker.group=rustdesk" hbbr: