From 9de4e2ac93653f9b5d036d55e0e6a48437d7a1cb Mon Sep 17 00:00:00 2001 From: Netshade Date: Tue, 13 Aug 2024 11:55:49 +0200 Subject: [PATCH] Just some minor tweaks --- compose/matrix/docker-compose.yml | 4 ++-- compose/media/docker-compose.yml | 2 ++ swarm/postgresql/.docker-compose.yml.swp | Bin 12288 -> 0 bytes swarm/postgresql/docker-compose.yml | 17 ++++++++--------- 4 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 swarm/postgresql/.docker-compose.yml.swp diff --git a/compose/matrix/docker-compose.yml b/compose/matrix/docker-compose.yml index 92344df..740be48 100644 --- a/compose/matrix/docker-compose.yml +++ b/compose/matrix/docker-compose.yml @@ -25,9 +25,9 @@ services: - Matrix hostname: syncv3 ports: - - "8009:8009" + - 8009:8009 environment: - - "SYNCV3_SERVER=https://syncv3.niefelheim.com" + - "SYNCV3_SERVER=http://synapse:8008" - "SYNCV3_SECRET=14b82584030154fc47f23fc8177fabf9c795ea3b4a6e11d32f452b353809cbe8" - "SYNCV3_BINDADDR=:8009" - "SYNCV3_DB=user=syncv3 dbname=syncv3 sslmode=disable host=192.168.1.161 password='SyncoptIcon'" diff --git a/compose/media/docker-compose.yml b/compose/media/docker-compose.yml index 9d24bf6..83cdbfb 100644 --- a/compose/media/docker-compose.yml +++ b/compose/media/docker-compose.yml @@ -29,6 +29,8 @@ services: - PLEX_CLAIM=claim-kV1j1aMNtz1idHqAjffW volumes: - plex:/config + - /data/backup/plex:/backup + - /etc/ssl/technitium:/etc/ssl/private:ro - /data/media/tv:/tv - /data/media/movies:/movies - /data/media/music:/music diff --git a/swarm/postgresql/.docker-compose.yml.swp b/swarm/postgresql/.docker-compose.yml.swp deleted file mode 100644 index df94e45e573ff63f4b5dd9f722103cfd98190c52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2%WD%s9LGly#P{nWh&t+_7k85wr8Tf%Y=ag|Q}gyJ;m90 z(TfO*;K7Uj1uEiEPYPaCyoh+S9>lBP*=*8>t)(6W^*8V#$!~r;kI(!zp>zk*M|+EW zubyFOYZ=?}>dIjE#>Y#pFW$_g??);;U-N7+D4bzoySnAOb7!agAWGGJYedLYIA%&W z75HH^Bt>|}N#Ys?Kv3x8t~2*Q)I$cyz`_hPqCu@|70d3*q}7Exwr}Gb)*o5e7?e#0 z$N(8217v^EV&V$1s12%zg%NctKo`SpJCb$gFg45s>D1t7q7EHjyC-5G;1Fyj|@CZBv z_rW!A9@yY0=myGP0Z=0YWPl8i0Wv@a{yhU6O`MH{^h_tmBiRs)^VVaGHTA?~FqT8; zS6P7>hGV|0&zmQ0*OcQq779y>D9kZ6*N`Sf;MkU_jrxun0+FDZ*^D6Ea78oQ_6DVy zW1fgG;Rs?_Skg4^`E{X7-x1s}xat>@wR$;E`WNcq`BDEfTeQPP^xAd;9#jzHKrd^d~vbV zQ!tX!X~gr@PeGSLm+xmij6N9vkFwQ-j5Gq#`$nW5OG? zrSDB1xpF&~^LG3v&yzhjL%D-KCvlYs}d2ht!J^gqz{-2aL=filA k-ZNd?936=R^(~sbRX-qd)VAW^gi#?w+xL)|)w3P!2dvmn=l}o! diff --git a/swarm/postgresql/docker-compose.yml b/swarm/postgresql/docker-compose.yml index 68a1637..a2d3f12 100644 --- a/swarm/postgresql/docker-compose.yml +++ b/swarm/postgresql/docker-compose.yml @@ -3,11 +3,11 @@ version: '3.3' services: primary: hostname: 'primary' - image: crunchydata/crunchy-postgres:centos7-10.3-1.8.2 + image: crunchydata/crunchy-postgres:ubi8-15.2-0 secrets: - - postgres_primary - - postgres_password - - postgres_rootpw + - postgres_primary + - postgres_password + - postgres_rootpw environment: - PGHOST=/tmp - MAX_CONNECTIONS=10 @@ -25,14 +25,14 @@ services: ports: - '5432' networks: - - infra + - postgres deploy: placement: constraints: - node.labels.type == primary - node.role == worker replica: - image: crunchydata/crunchy-postgres:centos7-10.3-1.8.2 + image: crunchydata/crunchy-postgres:ubi8-15.2-0 secrets: - postgres_primary - postgres_password @@ -55,15 +55,14 @@ services: ports: - '5432' networks: - - infra + - postgres deploy: placement: constraints: - node.labels.type != primary - node.role == worker networks: - infra: - + postgres: volumes: pg-primary-vol: pg-replica-vol: