fix merge conflict

.env

@@ -3,13 +3,15 @@ GID=1000
 DIR=/srv/docker
 DOMAIN=milvert.com
 
-MYSQL_ROOT_PASSWORD=bajsa
-MYSQL_USER=simon
-MYSQL_PASSWORD=bajsa
 
+MYSQL_USERNAME=root
+MYSQL_PASSWORD=qwerty
 
-DB_NAME=wp
-DB_USER=wp
-DB_PASSWORD=bajsa
-DB_ROOT_PASSWORD=password
-WP_USER=WP
+POSTGRES_USER=root
+POSTGRES_PASSWORD=qwerty
+PGADMIN_DEFAULT_EMAIL=kalle@asd.com
+PGADMIN_DEFAULT_PASSWORD=bajsa
+
+PUID=1000
+PGID=1000
+TZ=Europe/Stockholm

data_handling/docker-compose.yml

@@ -0,0 +1,57 @@
+
+version: '3'
+
+services:
+  grafana:
+    image: grafana/grafana
+    container_name: grafana
+    networks:
+      - backend
+    volumes:
+      # Data persistency
+      # sudo mkdir -p /srv/docker/grafana/data; chown 472:472 /srv/docker/grafana/data
+      - "${DIR}/grafana:/var/lib/grafana"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.grafana.rule=Host(`grafana.${DOMAIN}`)"
+      - "traefik.http.routers.grafana.entrypoints=web"
+      - "traefik.http.services.grafana-service.loadbalancer.server.port=3000"
+
+  influx:
+    image: quay.io/influxdb/influxdb:2.0.0-beta
+    container_name: influxdb
+    networks:
+      - backend
+    ports:
+      - 9999:9999
+    labels:
+      - "traefik.http.routers.influx.entryPoints=port8086"
+      - "traefik.http.routers.influx.rule=host(`influx.${DOMAIN}`)"
+      - "traefik.http.services.influx-service.loadBalancer.server.port=8086"
+    restart: always
+    environment:
+      - INFLUX_TOKEN=-I2TAAlmXdJ06yMw9wf-Mztf83ZzYZUdE8Ov2hMrnYabvXUnxL2cZfDzNHR6LTbW7ND5rE95CdvV2-Cy8IMHZQ==
+
+  telegraf:
+    container_name: telegraf
+    image: 'telegraf'
+    restart: always
+    networks:
+      - backend
+    ports:
+      - 8081:8081
+    environment:
+      - INFLUX_TOKEN=-I2TAAlmXdJ06yMw9wf-Mztf83ZzYZUdE8Ov2hMrnYabvXUnxL2cZfDzNHR6LTbW7ND5rE95CdvV2-Cy8IMHZQ==
+    volumes:
+      - ./telegraf.conf:/etc/telegraf/telegraf.conf
+      - /var/run/docker.sock:/var/run/docker.sock
+
+
+
+
+networks:
+  frontend:
+    external: true
+  backend:
+    external: false
+

data_handling/telegraf.conf

@@ -0,0 +1,35 @@
+[agent]
+  interval = "5s"
+  round_interval = true
+  metric_batch_size = 1000
+  metric_buffer_limit = 10000
+  collection_jitter = "0s"
+  flush_interval = "5s"
+  flush_jitter = "0s"
+  precision = ""
+  debug = false
+  quiet = false
+  logfile = ""
+  hostname = "$HOSTNAME"
+  omit_hostname = false
+
+[[inputs.docker]]
+  endpoint = "unix:///var/run/docker.sock"
+
+[[outputs.influxdb_v2]]
+  urls = ["http://influxdb:9999"]
+  organization = "milvert"
+  bucket = "home"
+  token = "-I2TAAlmXdJ06yMw9wf-Mztf83ZzYZUdE8Ov2hMrnYabvXUnxL2cZfDzNHR6LTbW7ND5rE95CdvV2-Cy8IMHZQ"
+
+[[inputs.http_listener_v2]]
+  ## Address and port to host HTTP listener on
+  service_address = ":8081"
+
+  ## Path to listen to.
+   path = "/write"
+
+  ## HTTP methods to accept.
+   methods = ["POST", "PUT"]
+
+  data_format = "influx"

nextcloud/.env

@@ -0,0 +1 @@
+../.env

nextcloud/docker-compose.yml

@@ -0,0 +1,26 @@
+version: '3'
+
+services:
+
+  nextcloud:
+    image: linuxserver/nextcloud
+    container_name: nextcloud
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=${TZ}
+    volumes:
+      - ${DIR}/nextcloud/config:/config
+      - ${DIR}/data:/data
+    networks:
+      - backend
+    ports:
+      - 443:443
+    restart: unless-stopped
+
+networks:
+  frontend:
+    external: true
+  backend:
+    external: false
+

wordpress/docker-compose.yml

@@ -0,0 +1,43 @@
+version: '3'
+
+services:
+  postgres:
+    container_name: postgres
+    image: postgres
+    restart: always
+    networks:
+      - backend
+    environment:
+      - TZ=${TZ}
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+    volumes:
+      - ${DIR}/postgres/data:/var/lib/postgresql/data
+      - ${DIR}/shared:/shared
+
+  pgadmin4:
+    container_name: pgadmin4
+    image: dpage/pgadmin4
+    restart: always
+    ports:
+      - "8003:80"
+    networks:
+      - backend
+    environment:
+      - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL}
+      - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD}
+        #- PUID=${PUID}
+        #- PGID=${PGID}
+      - TZ=${TZ}
+    volumes:
+      - ${DIR}/pgadmin4:/root/.pgadmin
+        #- ${DIR}/pgadmin4:/var/lib/pgadmin
+
+
+
+networks:
+  frontend:
+    external: true
+  backend:
+    external: false
+