From: Alviro Iskandar Setiawan <[email protected]>
To: Ammar Faizi <[email protected]>,
Michael William Jonathan <[email protected]>
Cc: Alviro Iskandar Setiawan <[email protected]>,
GNU/Weeb Mailing List <[email protected]>
Subject: [PATCH server-haj002 v1 4/6] mastodon: Move data directory inside the git project
Date: Thu, 13 Jul 2023 17:28:48 +0200 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
Move data directory inside the git project to allow the docker-comose.yml
file to use relative path. Then sync the docker-compose file with the
prod file (add hostname entry and DNS related changes).
Signed-off-by: Alviro Iskandar Setiawan <[email protected]>
---
.gitmodules | 3 +++
mastodon/.gitignore | 3 ++-
mastodon/docker-compose.example.yml | 16 ++++++++++------
mastodon/docker-mastodon | 1 +
4 files changed, 16 insertions(+), 7 deletions(-)
create mode 100644 .gitmodules
create mode 160000 mastodon/docker-mastodon
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..aeb163f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "mastodon/docker-mastodon"]
+ path = mastodon/docker-mastodon
+ url = https://github.com/alviroiskandar/docker-mastodon.git
diff --git a/mastodon/.gitignore b/mastodon/.gitignore
index 2f0cdc6..a38d3b2 100644
--- a/mastodon/.gitignore
+++ b/mastodon/.gitignore
@@ -1 +1,2 @@
-/docker-compose.yml
\ No newline at end of file
+/docker-compose.yml
+/data/mastodon/
diff --git a/mastodon/docker-compose.example.yml b/mastodon/docker-compose.example.yml
index 769800f..b1fc36d 100644
--- a/mastodon/docker-compose.example.yml
+++ b/mastodon/docker-compose.example.yml
@@ -26,7 +26,7 @@ services:
environment:
- ALLOW_EMPTY_PASSWORD=yes
volumes:
- - /opt/mastodon/redis:/bitnami/redis/data
+ - ./data/mastodon/redis:/bitnami/redis/data
postgres:
networks:
@@ -42,7 +42,7 @@ services:
- POSTGRES_DB=mastodon
- PGDATA=/var/lib/postgresql/data
volumes:
- - /opt/mastodon/postgres:/var/lib/postgresql/data
+ - ./data/mastodon/postgres:/var/lib/postgresql/data
mastodon:
networks:
@@ -52,9 +52,11 @@ services:
depends_on:
- postgres
- redis
- image: lscr.io/linuxserver/mastodon:latest
+ image: mastodon-gw
+ build: ./docker-mastodon
restart: unless-stopped
container_name: mastodon
+ hostname: social.gnuweeb.org
environment:
- PUID=1000
- PGID=1000
@@ -90,9 +92,11 @@ services:
- SIDEKIQ_ONLY=false #optional
- SIDEKIQ_QUEUE= #optional
- SIDEKIQ_DEFAULT=false #optional
- - SIDEKIQ_THREADS=5 #optional
- - DB_POOL=5 #optional
+ - SIDEKIQ_THREADS=32 #optional
+ - DB_POOL=32 #optional
+ - HCAPTCHA_SECRET_KEY= #optional
+ - HCAPTCHA_SITE_KEY=
volumes:
- - /opt/mastodon/mastodon/config:/config
+ - ./data/mastodon/mastodon/config:/config
- ./resolv.conf:/etc/resolv.conf
- ./hosts:/etc/hosts
diff --git a/mastodon/docker-mastodon b/mastodon/docker-mastodon
new file mode 160000
index 0000000..962c135
--- /dev/null
+++ b/mastodon/docker-mastodon
@@ -0,0 +1 @@
+Subproject commit 962c135c5f31d9051057c92594449369522c674f
--
Alviro Iskandar Setiawan
next prev parent reply other threads:[~2023-07-13 15:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-13 15:28 [PATCH server-haj002 v1 0/6] Server update and new service elk.gnuweeb.org Alviro Iskandar Setiawan
2023-07-13 15:28 ` [PATCH server-haj002 v1 1/6] init_net: Allow trusted traffic from/to local addresses Alviro Iskandar Setiawan
2023-07-13 15:28 ` [PATCH server-haj002 v1 2/6] mastodon: Enable IPv6 for the masto-net network Alviro Iskandar Setiawan
2023-07-13 15:28 ` [PATCH server-haj002 v1 3/6] mastodon: Fix DNS resolution error Alviro Iskandar Setiawan
2023-07-13 15:28 ` Alviro Iskandar Setiawan [this message]
2023-07-13 15:28 ` [PATCH server-haj002 v1 5/6] Add elk server using docker Alviro Iskandar Setiawan
2023-07-13 15:28 ` [PATCH server-haj002 v1 6/6] setup.txt: Add elk setup instructions Alviro Iskandar Setiawan
2023-07-13 15:42 ` [PATCH server-haj002 v1 0/6] Server update and new service elk.gnuweeb.org Ammar Faizi
2023-07-13 16:47 ` Alviro Iskandar Setiawan
2023-07-13 16:54 ` Ammar Faizi
2023-07-14 2:25 ` Michael William Jonathan
2023-07-14 10:32 ` Alviro Iskandar Setiawan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox