From 7dd8456767b506d6e7b33e5763bf6acbd0f16596 Mon Sep 17 00:00:00 2001 From: whitney Date: Sun, 11 Aug 2024 19:57:44 -0700 Subject: [PATCH] Update grafana and minecraft --- grafana/docker-compose.yml.blanked | 10 ++++---- minecraft/docker-compose.yml.blanked | 1 + nordvpn/.gitignore | 3 --- nordvpn/README.md | 13 ---------- nordvpn/docker-compose.yml.NORDLYNX | 38 ---------------------------- nordvpn/docker-compose.yml.blanked | 33 ------------------------ 6 files changed, 6 insertions(+), 92 deletions(-) delete mode 100644 nordvpn/.gitignore delete mode 100644 nordvpn/README.md delete mode 100644 nordvpn/docker-compose.yml.NORDLYNX delete mode 100644 nordvpn/docker-compose.yml.blanked diff --git a/grafana/docker-compose.yml.blanked b/grafana/docker-compose.yml.blanked index 26cb6ba..b21afa6 100644 --- a/grafana/docker-compose.yml.blanked +++ b/grafana/docker-compose.yml.blanked @@ -1,8 +1,7 @@ -version: "3" - networks: grafana-network: driver: bridge + name: grafana traefik: external: true minecraft: @@ -14,14 +13,14 @@ volumes: services: grafana: image: grafana/grafana - user: "[USER_ID]" + user: "USER:GROUP" container_name: grafana restart: unless-stopped networks: - grafana-network - traefik volumes: - - ./olomana.ini:/etc/grafana/grafana.ini + - ./grafana.ini:/etc/grafana/grafana.ini - /pwspool/software/grafana:/var/lib/grafana labels: - traefik.http.routers.grafana.rule=Host(`SITE_URL`) @@ -35,7 +34,7 @@ services: node_exporter: image: quay.io/prometheus/node-exporter:latest container_name: node_exporter - user: "[USER_ID]:[GROUP_ID]" + user: "USER:GROUP" restart: unless-stopped networks: - grafana-network @@ -62,3 +61,4 @@ services: - "--storage.tsdb.path=/prometheus" - "--web.console.libraries=/usr/share/prometheus/console_libraries" - "--web.console.templates=/usr/share/prometheus/consoles" + diff --git a/minecraft/docker-compose.yml.blanked b/minecraft/docker-compose.yml.blanked index 7d458d3..45a2c5f 100644 --- a/minecraft/docker-compose.yml.blanked +++ b/minecraft/docker-compose.yml.blanked @@ -3,6 +3,7 @@ version: "3" networks: minecraft: driver: bridge + name: minecraft grafana: external: true traefik: diff --git a/nordvpn/.gitignore b/nordvpn/.gitignore deleted file mode 100644 index 17b61bc..0000000 --- a/nordvpn/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -docker-compose.yml -plugins/ - diff --git a/nordvpn/README.md b/nordvpn/README.md deleted file mode 100644 index 92caee5..0000000 --- a/nordvpn/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# NordVPN - -## Instructions - -### Files -Create `nordvpn/token.txt` with NordVPN token which is generated from NordVPN website. - -### Notes -Can use either nordlynx or nordvpn in nordlynx configuration. - -## References -https://github.com/bubuntux/nordvpn -https://github.com/bubuntux/nordlynx diff --git a/nordvpn/docker-compose.yml.NORDLYNX b/nordvpn/docker-compose.yml.NORDLYNX deleted file mode 100644 index b1c5e3a..0000000 --- a/nordvpn/docker-compose.yml.NORDLYNX +++ /dev/null @@ -1,38 +0,0 @@ -version: "3" - -services: - nordlynx: - image: ghcr.io/bubuntux/nordlynx:latest - container_name: nordlynx - restart: unless-stopped - cap_add: - - NET_ADMIN - environment: - - TOKEN=e9f2ab4999032b61f29845afdc0067aa389827546411b4891ff0ec4368ab6cc1 - - PRIVATE_KEY=mDnVa4EMbnlSF8Sg/i657hf+NRyWQxQjKTwkImD/HWE= - - NET_LOCAL=192.168.1.0/24 - - TZ=America/Los_Angeles - - QUERY=filters\[country_id\]=202 - ports: - - "8888:8888" - labels: - - traefik.enable=false - - qb: - image: ghcr.io/linuxserver/qbittorrent:latest - container_name: qb - restart: unless-stopped - network_mode: service:nordlynx - environment: - - PUID=1000 - - PGID=1000 - - WEBUI_PORT=8888 - volumes: - - /data/write/qb/appdata/config:/config - - /data/write/qb/downloads:/downloads - - ./plugins:/plugins - depends_on: - - nordlynx - labels: - - traefik.enable=false - diff --git a/nordvpn/docker-compose.yml.blanked b/nordvpn/docker-compose.yml.blanked deleted file mode 100644 index d5854b8..0000000 --- a/nordvpn/docker-compose.yml.blanked +++ /dev/null @@ -1,33 +0,0 @@ -version: "3" - -services: - nordlynx: - image: ghcr.io/bubuntux/nordlynx - container_name: nordlynx - restart: unless-stopped - cap_add: - - NET_ADMIN - environment: - - PRIVATE_KEY=[PRIVATE_KEY] - - NET_LOCAL=192.168.1.0/24 - - TZ=America/Los_Angeles - - QUERY=filters\[country_id\]=202 - ports: - - "[HOST_URL]:8888" - labels: - - traefik.enable=false - - qb: - image: ghcr.io/linuxserver/qbittorrent:latest - container_name: qb - restart: unless-stopped - network_mode: service:nordlynx - environment: - - WEBUI_PORT=[HOST_URL] - volumes: - - /data/write/qb/appdata/config:/config - - /data/write/qb/downloads:/downloads - depends_on: - - nordlynx - labels: - - traefik.enable=false