Added postgres

diff --git a/dns-server/docker-compose.yaml b/dns-server/docker-compose.yaml
index 1a91725690b0b221ac3750fd8ebd42445fb41ba5..3f3ea5e6f1a6cb120b05bc924e3f6b0a9f478284 100644 (file)
--- a/dns-server/docker-compose.yaml
+++ b/dns-server/docker-compose.yaml
@@ -47,18 +47,20 @@ services:
       - "traefik.enable=true"
       # Router: HTTP
       - "traefik.http.routers.dns-server.entrypoints=http"
-      - "traefik.http.routers.dns-server.rule=Host(`network.giorgioravera.it`) && PathPrefix(`/dns-server`)"
-      - "traefik.http.routers.dns-server.middlewares=dns-server-stripprefix"
+      - "traefik.http.routers.dns-server.rule=Host(`dns-server.giorgioravera.it`)"
+      #- "traefik.http.routers.dns-server.rule=Host(`network.giorgioravera.it`) && PathPrefix(`/dns-server`)"
+      #- "traefik.http.routers.dns-server.middlewares=dns-server-stripprefix"
       - "traefik.http.routers.dns-server.middlewares=dns-server-https-redirect"
       # Router: HTTPS
       - "traefik.http.routers.dns-server-secure.entrypoints=https"
-      - "traefik.http.routers.dns-server-secure.rule=Host(`network.giorgioravera.it`) && PathPrefix(`/dns-server`)"
+      - "traefik.http.routers.dns-server-secure.rule=Host(`dns-server.giorgioravera.it`)"
+      #- "traefik.http.routers.dns-server-secure.rule=Host(`network.giorgioravera.it`) && PathPrefix(`/dns-server`)"
       - "traefik.http.routers.dns-server-secure.tls=true"
       - "traefik.http.routers.dns-server-secure.service=dns-server"
-      - "traefik.http.routers.dns-server-secure.middlewares=dns-server-stripprefix"
+      #- "traefik.http.routers.dns-server-secure.middlewares=dns-server-stripprefix"
       # Middlewares: Redirect http to https
       - "traefik.http.middlewares.dns-server-https-redirect.redirectscheme.scheme=https"
       # Middlewares: Prefix
-      - "traefik.http.middlewares.dns-server-stripprefix.stripprefix.prefixes=/dns-server"
+      #- "traefik.http.middlewares.dns-server-stripprefix.stripprefix.prefixes=/dns-server"
       # Services: Loadbalancer
       - "traefik.http.services.dns-server.loadbalancer.server.port=5380"

diff --git a/postgres/docker-compose.yaml b/postgres/docker-compose.yaml
new file mode 100644 (file)
index 0000000..986be8e
--- /dev/null
+++ b/postgres/docker-compose.yaml
@@ -0,0 +1,34 @@
+services:
+  postgres:
+    container_name: postgres
+    image: postgres:alpine
+    restart: always
+    ports:
+      - 5432:5432
+    environment:
+      - TZ=${DOCKER_TZ}
+      - POSTGRES_DB_FILE=/run/secrets/postgres_db
+      - POSTGRES_USER_FILE=/run/secrets/postgres_user
+      - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+    secrets:
+      - postgres_user
+      - postgres_password
+      - postgres_db
+    volumes:
+      - ${DOCKER_CFG_DIR}/postgres:/var/lib/postgresql/data
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=false"
+
+networks:
+  proxy:
+    external: true
+
+secrets:
+  postgres_user:
+    file: ./secrets/postgres_user
+  postgres_password:
+    file: ./secrets/postgres_password
+  postgres_db:
+    file: ./secrets/postgres_db