changed some ports to prevent pod port conflicts; added a container for opengist

This commit is contained in:
2026-07-06 12:58:05 -04:00
parent 7e08866339
commit 24f561f030

View File

@@ -23,6 +23,8 @@ secrets:
file: ~/.podsecrets/email.pass file: ~/.podsecrets/email.pass
redis.pass: redis.pass:
file: ~/.podsecrets/redis.pass file: ~/.podsecrets/redis.pass
# opengist.secret:
# file: ~/.podsecrets/opengist.secret
services: services:
# @NOTE https://oneuptime.com/blog/post/2026-03-18-use-podman-containers-wireguard-vpn/view # @NOTE https://oneuptime.com/blog/post/2026-03-18-use-podman-containers-wireguard-vpn/view
@@ -36,6 +38,7 @@ services:
# - NET_RAW # - NET_RAW
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro
- ~/.wg/containerized:/config/wg-confs:Z - ~/.wg/containerized:/config/wg-confs:Z
@@ -69,6 +72,7 @@ services:
devices: devices:
- /dev/net/tun:/dev/net/tun - /dev/net/tun:/dev/net/tun
volumes: volumes:
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro
- "tailscale-lib:/var/lib/tailscale" - "tailscale-lib:/var/lib/tailscale"
@@ -104,13 +108,16 @@ services:
- 443 - 443
- 443/udp - 443/udp
volumes: volumes:
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- ~/.config/caddy:/etc/caddy:Z - ~/.config/caddy:/etc/caddy:Z
- ~/srv/${SERVER_FQDN}:/srv/${SERVER_FQDN}:z - ~/srv/${SERVER_FQDN}:/srv/${SERVER_FQDN}:z
- ~/srv/acme.${SERVER_FQDN}:/srv/acme.${SERVER_FQDN}:ro,z - ~/srv/certbot.${SERVER_FQDN}:/srv/certbot.${SERVER_FQDN}:ro,z
- ~/srv/notes.${SERVER_FQDN}:/srv/notes.${SERVER_FQDN}:z - ~/srv/notes.${SERVER_FQDN}:/srv/notes.${SERVER_FQDN}:z
- ~/srv/blog.${SERVER_FQDN}:/srv/blog.${SERVER_FQDN}:z - ~/srv/blog.${SERVER_FQDN}:/srv/blog.${SERVER_FQDN}:z
- ~/srv/${NEXTCLOUD_SUBDOMAIN}.${SERVER_FQDN}:/srv/${NEXTCLOUD_SUBDOMAIN}.${SERVER_FQDN}:ro,z - ~/srv/${NEXTCLOUD_SUBDOMAIN}.${SERVER_FQDN}:/srv/${NEXTCLOUD_SUBDOMAIN}.${SERVER_FQDN}:ro,z
# - ~/srv/${GITEA_SUBDOMAIN}.${SERVER_FQDN}:/srv/${GITEA_SUBDOMAIN}.${SERVER_FQDN}:ro,z
# - ~/srv/${OG_SUBDOMAIN}.${SERVER_FQDN}:/srv/${OG_SUBDOMAIN}.${SERVER_FQDN}:ro,z
- "caddy-share:/usr/share/caddy" - "caddy-share:/usr/share/caddy"
- "caddy-data:/data:z" - "caddy-data:/data:z"
- ~/.caddy:/config:Z - ~/.caddy:/config:Z
@@ -120,7 +127,6 @@ services:
- wgclient - wgclient
env_file: env_file:
- ~/.all.env - ~/.all.env
- ~/.nextcloud.env
labels: labels:
glance.name: Caddy glance.name: Caddy
glance.id: caddy glance.id: caddy
@@ -134,10 +140,11 @@ services:
container_name: sslcerts container_name: sslcerts
restart: on-failure restart: on-failure
volumes: volumes:
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- ~/.config/letsencrypt:/etc/letsencrypt:z - ~/.config/letsencrypt:/etc/letsencrypt:z
- "certbot-lib:/var/lib/letsencrypt" - "certbot-lib:/var/lib/letsencrypt"
- ~/srv/acme.${SERVER_FQDN}:/srv/acme.${SERVER_FQDN}:z - ~/srv/certbot.${SERVER_FQDN}:/srv/certbot.${SERVER_FQDN}:z
networks: networks:
- "container:wgclient" - "container:wgclient"
depends_on: depends_on:
@@ -162,6 +169,7 @@ services:
expose: expose:
- 6379 - 6379
volumes: volumes:
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- "redis-data:/data:z" - "redis-data:/data:z"
- ~/.config/redis:/etc/redis:Z - ~/.config/redis:/etc/redis:Z
@@ -186,6 +194,7 @@ services:
expose: expose:
- 3306 - 3306
volumes: volumes:
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
# @TODO use Ansible to adjust/edit configuration below # @TODO use Ansible to adjust/edit configuration below
# @NOTE https://dev.mysql.com/doc/refman/8.0/en/using-encrypted-connections.html # @NOTE https://dev.mysql.com/doc/refman/8.0/en/using-encrypted-connections.html
@@ -222,6 +231,7 @@ services:
expose: expose:
- 9000 - 9000
volumes: volumes:
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- ~/srv/${NEXTCLOUD_SUBDOMAIN}.${SERVER_FQDN}:/var/www/html:z - ~/srv/${NEXTCLOUD_SUBDOMAIN}.${SERVER_FQDN}:/var/www/html:z
networks: networks:
@@ -283,7 +293,7 @@ services:
- ~/.config/gitea:/data:z - ~/.config/gitea:/data:z
expose: expose:
- 3000 - 3000
- ${GITEA_SSH_PORT:-2222} - ${GITEA_SSH_PORT:-2323}
networks: networks:
- "container:wgclient" - "container:wgclient"
depends_on: depends_on:
@@ -301,7 +311,7 @@ services:
GITEA_server_PROTOCOL: http GITEA_server_PROTOCOL: http
GITEA_server_DOMAIN: ${GITEA_SUBDOMAIN}.${SERVER_FQDN} GITEA_server_DOMAIN: ${GITEA_SUBDOMAIN}.${SERVER_FQDN}
# @NOTE https://gist.github.com/erik-toth/087262f19941da9bf4c2ce449fe98a47 # @NOTE https://gist.github.com/erik-toth/087262f19941da9bf4c2ce449fe98a47
GITEA_server_SSH_PORT: ${GITEA_SSH_PORT:-2222} GITEA_server_SSH_PORT: ${GITEA_SSH_PORT:-2323}
GITEA_server_SSH_EXPOSE_ANONYMOUS: "false" GITEA_server_SSH_EXPOSE_ANONYMOUS: "false"
GITEA_server_START_SSH_SERVER: "false" GITEA_server_START_SSH_SERVER: "false"
GITEA_server_LANDING_PAGE: ${GITEA_LANDING:-explore} GITEA_server_LANDING_PAGE: ${GITEA_LANDING:-explore}
@@ -328,7 +338,7 @@ services:
GITEA_database_HOST: "${MYSQL_DB_HOST:?Enter the container name, hostname or public FQDN of your DBMS}:3306" GITEA_database_HOST: "${MYSQL_DB_HOST:?Enter the container name, hostname or public FQDN of your DBMS}:3306"
GITEA_database_NAME: ${GITEA_DB_NAME:-gitea} GITEA_database_NAME: ${GITEA_DB_NAME:-gitea}
GITEA_database_USER: ${MYSQL_DB_USER:-admin} GITEA_database_USER: ${MYSQL_DB_USER:-admin}
GITEA_database_PASSWD_FILE: /run/secrets/user-mysql.pass GITEA_database_PASSWD_FILE: /run/secrets/user-mysql.pass
GITEA_repository_DEFAULT_BRANCH: main GITEA_repository_DEFAULT_BRANCH: main
GITEA_repository_DEFAULT_PRIVATE: private GITEA_repository_DEFAULT_PRIVATE: private
GITEA_repository_ORG_MAX_CREATION_LIMIT: 75 GITEA_repository_ORG_MAX_CREATION_LIMIT: 75
@@ -346,6 +356,37 @@ services:
glance.url: "${SERVER_FQDN_SCHEME}://${GITEA_SUBDOMAIN}.${SERVER_FQDN}" glance.url: "${SERVER_FQDN_SCHEME}://${GITEA_SUBDOMAIN}.${SERVER_FQDN}"
glance.description: Git version control forge server glance.description: Git version control forge server
gist:
image: ghcr.io/thomiceli/opengist:1
container_name: gist
restart: unless-stopped
volumes:
- /etc/localtime:/etc/localtime:ro
- ~/.config/opengist:/opengist:z
expose:
- 6157
- 2222
networks:
- "container:wgclient"
depends_on:
- revproxy0
- wgclient
env_file:
- ~/.all.env
- ~/.mysql.env
environment:
OG_DB_PASSWD_FILE: /run/secrets/user-mysql.pass
OG_DB_URI: ${OG_DB_TYPE}://${MYSQL_DB_USER:-admin}:${OG_DB_PASSWD}@${MYSQL_DB_HOST:?Enter the container name, hostname or public FQDN of your DBMS}:3306/${OG_DB_NAME:-opengist}
secrets:
- "user-mysql.pass"
# - opengist.secret
labels:
glance.name: OpenGist
glance.id: opengist
glance.icon: "si:opengist"
glance.url: "${SERVER_FQDN_SCHEME}://${OG_SUBDOMAIN}.${SERVER_FQDN}"
glance.description: Pastebin server
glance: glance:
image: glanceapp/glance image: glanceapp/glance
container_name: glance container_name: glance