From 5ab77bcf77a89835e137362517297826447b0f85 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 20 Mar 2025 09:31:19 -0400 Subject: [PATCH 1/8] Modifications to Ghost container. --- docker-compose.yml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1e5b87c6..da687c2b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1337,21 +1337,6 @@ services: condition: service_started required: true restart: true - environment: - database__client: mysql - database__connection__host: mariadb - database__connection__port: 3306 - database__connection__user: ${GHOST_DB_USER} - database__connection__password: ${GHOST_DB_PASSWORD} - database__connection__database: ghost_db - mail__transport: SMTP - mail__options__host: postal-smtp - mail__options__port: 25 - mail__options__secure: false - mail__options__auth__user: ${POSTAL_SMTP_AUTH_USER} - mail__options__auth__pass: ${POSTAL_SMTP_AUTH_PASSWORD} - mail__from: "noreply@trez.wtf" - url: https://blog.${MY_TLD} image: ghost:latest labels: homepage.group: Lifestyle @@ -1370,6 +1355,8 @@ services: networks: default: null restart: always + volumes: + - ${DOCKER_VOLUME_CONFIG}/ghost:/home/ghost gitea: container_name: gitea depends_on: From 9cdc60d58088412c21d3f1b497f13648afea4397 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 20 Mar 2025 09:31:19 -0400 Subject: [PATCH 2/8] Adding config for Ghost. --- .../ghost_config.production.json.j2 | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 ansible/app-configs/ghost_config.production.json.j2 diff --git a/ansible/app-configs/ghost_config.production.json.j2 b/ansible/app-configs/ghost_config.production.json.j2 new file mode 100644 index 00000000..9f2c1139 --- /dev/null +++ b/ansible/app-configs/ghost_config.production.json.j2 @@ -0,0 +1,41 @@ +{% set vault_addr = 'https://vault.trez.wtf' %} +{% set secrets_path = 'rinoa-docker/env' %} + +{ + "url": "blog.{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['MY_TLD'] }}", + "database": { + "client": "mysql", + "connection": { + "host" : "mariadb", + "user" : "ghost", + "password" : "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['GHOST_DB_PASSWORD'] }}", + "database" : "ghost" + } + }, + "mail": { + "from": "'Ghost @ Rinoa' " + "transport": "SMTP", + "options": { + "host": "postal-smtp", + "port": 25, + "secure": false, + "auth": { + "user": "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['POSTAL_SMTP_AUTH_USER'] }}", + "pass": "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['POSTAL_SMTP_AUTH_PASSWORD'] }}" + } + } + }, + "paths": { + "contentPath": "content/" + }, + "privacy": { + "useGravatar": true + } + "logging": { + "level": "info", + "rotation": { + "enabled": true + }, + "transports": ["file"] + } +} \ No newline at end of file From 6752abdaccca7b305e1b551018db9e1684797ee9 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 20 Mar 2025 09:34:08 -0400 Subject: [PATCH 3/8] Modifications to Ghost container. --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index da687c2b..725a02ac 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1352,8 +1352,8 @@ services: swag.uptime-kuma.monitor.url: https://blog.${MY_TLD} links: - mariadb - networks: - default: null + ports: + - 2368:2368 restart: always volumes: - ${DOCKER_VOLUME_CONFIG}/ghost:/home/ghost From 105e71f5a85bb8cf8128c02572f07847a09e5be7 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 20 Mar 2025 20:43:36 -0400 Subject: [PATCH 4/8] Updating HC Vault token. --- ansible/group_vars/all.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 3bf03244..6b1e3b0d 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -1,14 +1,14 @@ vault_addr: "https://vault.trez.wtf" vault_token: !vault | $ANSIBLE_VAULT;1.1;AES256 - 30623330336664656231653066343930303830343530323930613666643863623837633738346639 - 3734386663383333386635623931343361343363396434660a633637666539626264653437636134 - 36616334386264383330323164333432623538366234326563323664353338646331353233396161 - 3030623162373232320a386432393337613431303432613065626163326363316365613937623031 - 39316566343238363934383833376136323461336666663762383663633531303138616132333938 - 30316334363436333164303035643835316238313038663761636338313433303766626238656234 - 34373436396430646339326361366634363735346637303865373164363663663263646661366663 - 36336334393535386332646461313262646131383932353534363936623961613761333762376561 - 31366662626231346638346339626565653831613865646436643233653066366534 + 33353530663733396437386433393332393130333638616264633261393066336234313962653566 + 3133643738373662656433363030643063333461313564650a393066356262616661623862633230 + 33393561353562343037396436373734623333663361653262646166333934343733376439643936 + 3361383866373531340a666538616538316265663732353363323832353965653464356232626563 + 61336331626631623465313566323462343963666264626663386233386530666163653962633736 + 30653139393532643333396330343031626231326332643266336163613265646137613335383061 + 31313734653665613963636534653032313738653632353861383533653631633133376665343266 + 64653632393630623961373936326465333436393765663262636637316539313830623231633737 + 3038 vault_token_cleaned: "{{ vault_token | regex_replace('\\n', '') }}" secrets_path: "rinoa-docker/env" From e562ec9ec86c2bce29839bc292fe87f044798d4c Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 20 Mar 2025 20:44:52 -0400 Subject: [PATCH 5/8] Updating HC Vault token. --- ansible/app-configs/ghost_config.production.json.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/app-configs/ghost_config.production.json.j2 b/ansible/app-configs/ghost_config.production.json.j2 index 9f2c1139..ad3488fd 100644 --- a/ansible/app-configs/ghost_config.production.json.j2 +++ b/ansible/app-configs/ghost_config.production.json.j2 @@ -2,7 +2,7 @@ {% set secrets_path = 'rinoa-docker/env' %} { - "url": "blog.{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['MY_TLD'] }}", + "url": "blog.trez.wtf", "database": { "client": "mysql", "connection": { From 8774039a97047f3d2a4c2fe3c31846c01f2f964f Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 20 Mar 2025 21:41:16 -0400 Subject: [PATCH 6/8] Updating HC Vault token. --- .../ghost_config.production.json.j2 | 2 +- ansible/group_vars/all.yml | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ansible/app-configs/ghost_config.production.json.j2 b/ansible/app-configs/ghost_config.production.json.j2 index 9f2c1139..ad3488fd 100644 --- a/ansible/app-configs/ghost_config.production.json.j2 +++ b/ansible/app-configs/ghost_config.production.json.j2 @@ -2,7 +2,7 @@ {% set secrets_path = 'rinoa-docker/env' %} { - "url": "blog.{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['MY_TLD'] }}", + "url": "blog.trez.wtf", "database": { "client": "mysql", "connection": { diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 3bf03244..823f276a 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -1,14 +1,14 @@ vault_addr: "https://vault.trez.wtf" vault_token: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 30623330336664656231653066343930303830343530323930613666643863623837633738346639 - 3734386663383333386635623931343361343363396434660a633637666539626264653437636134 - 36616334386264383330323164333432623538366234326563323664353338646331353233396161 - 3030623162373232320a386432393337613431303432613065626163326363316365613937623031 - 39316566343238363934383833376136323461336666663762383663633531303138616132333938 - 30316334363436333164303035643835316238313038663761636338313433303766626238656234 - 34373436396430646339326361366634363735346637303865373164363663663263646661366663 - 36336334393535386332646461313262646131383932353534363936623961613761333762376561 - 31366662626231346638346339626565653831613865646436643233653066366534 + $ANSIBLE_VAULT;1.1;AES256 + 62363031303333393333323538306461363235396336393730623163646461306430353262356264 + 3731623932346561616238303733366130333236303531310a383130653532386131386235376366 + 35343461303164316334303731396639316231323639346133396335336335393737636631363165 + 3632656266373561390a356636333137626334383761366339366564643866636264393430306531 + 37653230616130643365646665613765656638663934613361383938316635623661333738613636 + 30616339366530656135646339303233656131306132633937313137656264653133386238323936 + 62633534623431666132373563663963616466386135666134663939393166656630386365346533 + 35666237343562336163653834653232323166613232616561366335363337303531306163633736 + 35623737313631306530313331643331343565353836333566383734393634613333 vault_token_cleaned: "{{ vault_token | regex_replace('\\n', '') }}" secrets_path: "rinoa-docker/env" From 498d3b10c268a31d618488fc659fdaeccad8bf35 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 20 Mar 2025 21:55:40 -0400 Subject: [PATCH 7/8] Updating HC Vault token. --- ansible/group_vars/all.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 823f276a..3ac5f989 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -1,14 +1,14 @@ vault_addr: "https://vault.trez.wtf" vault_token: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 62363031303333393333323538306461363235396336393730623163646461306430353262356264 - 3731623932346561616238303733366130333236303531310a383130653532386131386235376366 - 35343461303164316334303731396639316231323639346133396335336335393737636631363165 - 3632656266373561390a356636333137626334383761366339366564643866636264393430306531 - 37653230616130643365646665613765656638663934613361383938316635623661333738613636 - 30616339366530656135646339303233656131306132633937313137656264653133386238323936 - 62633534623431666132373563663963616466386135666134663939393166656630386365346533 - 35666237343562336163653834653232323166613232616561366335363337303531306163633736 - 35623737313631306530313331643331343565353836333566383734393634613333 + $ANSIBLE_VAULT;1.1;AES256 + 61383638616263666539386332333638356662623166393234383666366265346537353533653833 + 3333313230636166663734356261316132393834613737630a386166376365333862383031343838 + 35346338633530636463643165623432353466363230646239656463333263373738663639313136 + 3966633235393937350a343337613061616238323238386332363635623932333230323037353136 + 66616561613038656462636565656361613065373238613862386235623265396133633034326563 + 32663532343137366334366630356232313865666661326337326263613262306637663434646639 + 61623030383963623332333135396363643036646461303438643233313136346139343232353535 + 39356432623161333661333266333937626364643964333839333934306364373234653761326638 + 33396534396163373034666164393039303639643431353662666265666264353062 vault_token_cleaned: "{{ vault_token | regex_replace('\\n', '') }}" secrets_path: "rinoa-docker/env" From cb10b4073f7a7883e62bdb29f8464a785182129c Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 21 Mar 2025 02:24:40 +0000 Subject: [PATCH 8/8] chore: Update README --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 31d727c0..6b208bd3 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,6 @@ | delugevpn | ghcr.io/binhex/arch-delugevpn:latest | | docker-socket-proxy | ghcr.io/tecnativa/docker-socket-proxy:latest | | docker-volume-backup | offen/docker-volume-backup:v2 | -| docuseal | docuseal/docuseal:latest | | duplicati | lscr.io/linuxserver/duplicati:latest | | fastenhealth | ghcr.io/fastenhealth/fasten-onprem:main | | flaresolverr | ghcr.io/flaresolverr/flaresolverr:latest |