Browse Source

updates

master
root 3 years ago
parent
commit
9347e740e4
  1. 3
      .gitmodules
  2. 5
      apps/freshrss/docker-compose.yml
  3. 7
      apps/funkwhale/docker-compose.yml
  4. 23
      apps/monitor/docker-compose.yml
  5. 1
      apps/pixelfed/src
  6. 2
      apps/pleroma/Dockerfile
  7. 51
      apps/pleroma/config/prod.secret.exs
  8. 6
      apps/pleroma/docker-compose.yml
  9. BIN
      apps/pleroma/pleroma.pgdump
  10. 5
      apps/pleroma/secret.example.exs
  11. 39
      apps/site/docker-compose.yml

3
.gitmodules

@ -1,3 +1,6 @@
[submodule "apps/blog"]
path = apps/blog
url = https://forge.goe.land/eorn/blog
[submodule "apps/pixelfed/src"]
path = apps/pixelfed/src
url = https://github.com/pixelfed/pixelfed

5
apps/freshrss/docker-compose.yml

@ -12,7 +12,7 @@ services:
- .env
freshrss:
image: freshrss/freshrss:1.15.0
image: freshrss/freshrss:1.15.3
restart: unless-stopped
depends_on:
- dbfreshrss
@ -27,7 +27,8 @@ services:
- "traefik.http.routers.freshrsstls.rule=Host(`rss.goe.land`)"
- "traefik.http.routers.freshrsstls.entrypoints=websecure"
- "traefik.http.routers.freshrsstls.tls=true"
- "traefik.http.routers.freshrsstls.tls.certresolver=sample"
- "traefik.http.routers.freshrsstls.tls.certresolver=letsencrypt"
- "traefik.http.routers.freshrsstls.tls.domains[0].main=*.goe.land"
- "traefik.docker.network=myweb"
environment:
- CRON_MIN=*/10

7
apps/funkwhale/docker-compose.yml

@ -20,7 +20,7 @@ services:
celeryworker:
image: funkwhale/funkwhale:0.20.0
image: funkwhale/funkwhale:0.20.1
restart: unless-stopped
networks:
- myweb
@ -47,7 +47,7 @@ services:
# command: celery -A funkwhale_api.taskapp beat -l INFO
#
apifunkwhale:
image: funkwhale/funkwhale:0.20.0
image: funkwhale/funkwhale:0.20.1
restart: unless-stopped
networks:
- myweb
@ -94,7 +94,8 @@ services:
- "traefik.http.routers.funkwhaletls.rule=Host(`zik.goe.land`)"
- "traefik.http.routers.funkwhaletls.entrypoints=websecure"
- "traefik.http.routers.funkwhaletls.tls=true"
- "traefik.http.routers.funkwhaletls.tls.certresolver=sample"
- "traefik.http.routers.funkwhaletls.tls.certresolver=letsencrypt"
- "traefik.http.routers.funkwhaletls.tls.domains[0].sans=*.goe.land"
- "traefik.docker.network=myweb"
networks:

23
apps/monitor/docker-compose.yml

@ -20,7 +20,8 @@ services:
- "traefik.http.routers.surveillancetls.rule=Host(`surveillance.goe.land`)"
- "traefik.http.routers.surveillancetls.entrypoints=websecure"
- "traefik.http.routers.surveillancetls.tls=true"
- "traefik.http.routers.surveillancetls.tls.certresolver=sample"
- "traefik.http.routers.surveillancetls.tls.certresolver=letsencrypt"
- "traefik.http.routers.surveillancetls.tls.domains[0].main=*.goe.land"
- "traefik.docker.network=myweb"
- "traefik.http.services.surveillance.loadbalancer.server.port=3000"
@ -71,16 +72,16 @@ services:
- '--web.console.libraries=/usr/share/prometheus/console_libraries'
- '--web.console.templates=/usr/share/prometheus/consoles'
env_file: .env
labels:
- "traefik.enable=true"
- "traefik.http.routers.prometheus.rule=Host(`prometheus.goe.land`)"
- "traefik.http.routers.prometheus.entrypoints=web"
- "traefik.http.routers.prometheustls.rule=Host(`prometheus.goe.land`)"
- "traefik.http.routers.prometheustls.entrypoints=websecure"
- "traefik.http.routers.prometheustls.tls=true"
- "traefik.http.routers.prometheustls.tls.certresolver=sample"
- "traefik.docker.network=myweb"
- "traefik.http.services.prometheus.loadbalancer.server.port=9090"
#labels:
# - "traefik.enable=true"
# - "traefik.http.routers.prometheus.rule=Host(`prometheus.goe.land`)"
# - "traefik.http.routers.prometheus.entrypoints=web"
# - "traefik.http.routers.prometheustls.rule=Host(`prometheus.goe.land`)"
# - "traefik.http.routers.prometheustls.entrypoints=websecure"
# - "traefik.http.routers.prometheustls.tls=true"
# - "traefik.http.routers.prometheustls.tls.certresolver=sample"
# - "traefik.docker.network=myweb"
# - "traefik.http.services.prometheus.loadbalancer.server.port=9090"
cadvisor:

1
apps/pixelfed/src

@ -0,0 +1 @@
Subproject commit f1e15baca918cf0fd4452aafa2de3264d684d0e5

2
apps/pleroma/Dockerfile

@ -3,7 +3,7 @@ FROM elixir:1.8-alpine
ENV UID=911 GID=911 \
MIX_ENV=prod
ARG PLEROMA_VER=v1.1.6
ARG PLEROMA_VER=v1.1.8
RUN apk -U upgrade \
&& apk add --no-cache \

51
apps/pleroma/config/prod.secret.exs

@ -0,0 +1,51 @@
use Mix.Config
config :pleroma, Pleroma.Web.Endpoint,
http: [ ip: {0, 0, 0, 0}, ],
url: [host: "kayii.goe.land", scheme: "https", port: 443],
secret_key_base: "XbevA5UTSRYpWxSLRSgdqyEGJ4yTDX0dTZTNzpiTlsFnuLRI3PPNDkYXEAWNHCjt"
config :pleroma, :instance,
name: "Pleroma",
email: "eorn@goe.land",
limit: 5000,
registrations_open: true,
description: "Une instance hyperlocale, avec un amour fou pour les goélands. Mais pas que.",
allow_relay: true
config :pleroma, :media_proxy,
enabled: false,
redirect_on_failure: true,
base_url: "https://cache.domain.tld"
# Configure your database
config :pleroma, Pleroma.Repo,
adapter: Ecto.Adapters.Postgres,
username: "pleroma",
password: "eniuadtevniduletinruaetlpdéadteidruetinudaec",
database: "pleroma",
hostname: "dbpleroma",
pool_size: 10
# Logger
config :logger, :console,
ident: "pleroma",
format: "$metadata[$level] $message",
metadata: [:request_id]
config :web_push_encryption, :vapid_details,
subject: "mailto:eorn@goe.land",
public_key: "BMRYEAIyof7hw_IHcFQlBxd2EggS__x_p6zvmNAakO2dIUZ_7tDOoKzjSoK9j2sG2WqlUNAX87BZfzG9ROGwALo",
private_key: "ED7FFh5aFpDHanR02ipRMEgAXnqMt9oQ_8cUuQIzrPc"
config :pleroma, Pleroma.Emails.Mailer,
adapter: Swoosh.Adapters.SMTP,
relay: "mail.goe.land",
username: "noreply@goe.land",
password: "nauirsetnausietauniedrtiunrestauirst",
port: 465,
ssl: true,
tls: :always,
auth: :always,
enabled: true

6
apps/pleroma/docker-compose.yml

@ -10,13 +10,16 @@ services:
- .env
volumes:
- ./db:/var/lib/postgresql/data
- /etc/localtime:/etc/localtime:ro
pleroma:
build: .
image: pleroma
restart: unless-stopped
volumes:
- /etc/localtime:/etc/localtime:ro
- ./uploads:/pleroma/uploads
- ./data/emoji:/pleroma/instance/static/emoji
depends_on:
- dbpleroma
networks:
@ -28,9 +31,10 @@ services:
- "traefik.http.routers.pleromatls.rule=Host(`kayii.goe.land`)"
- "traefik.http.routers.pleromatls.entrypoints=websecure"
- "traefik.http.routers.pleromatls.tls=true"
- "traefik.http.routers.pleromatls.tls.certresolver=sample"
- "traefik.http.services.pleroma.loadbalancer.server.port=4000"
- "traefik.docker.network=myweb"
- "traefik.http.routers.pleromatls.tls.certresolver=letsencrypt"
- "traefik.http.routers.pleromatls.tls.domains[0].main=*.goe.land"
networks:
myweb:

BIN
apps/pleroma/pleroma.pgdump

Binary file not shown.

5
apps/pleroma/secret.example.exs

@ -9,7 +9,10 @@ config :pleroma, :instance,
name: "Pleroma",
email: "eorn@goe.land",
limit: 5000,
registrations_open: true
registrations_open: true,
description: "Une instance hyperlocale, avec un amour fou pour les goélands. Mais pas que.",
allow_relay: true
config :pleroma, :media_proxy,
enabled: false,

39
apps/site/docker-compose.yml

@ -0,0 +1,39 @@
version: '3'
services:
# nginxwiki:
# #image: nginx:1.17.4
# build: .
# restart: unless-stopped
# networks:
# - myweb
# # env_file: .env
# volumes:
# - ./data/html:/usr/share/nginx/html
# - ./data/nginx:/etc/nginx/conf.d
# - ./data/log:/var/log/nginx
site:
image: php:7.3-apache
restart: unless-stopped
networks:
- myweb
volumes:
- ./data/html:/var/www/html
- /etc/localtime:/etc/localtime:ro
labels:
- "traefik.enable=true"
- "traefik.http.routers.www.rule=Host(`goe.land`, `www.goe.land`)"
- "traefik.http.routers.www.entrypoints=web"
- "traefik.http.routers.wwwtls.rule=Host(`goe.land`, `www.goe.land`)"
- "traefik.http.routers.wwwtls.entrypoints=websecure"
- "traefik.http.routers.wwwtls.tls=true"
- "traefik.http.routers.wwwtls.tls.certresolver=letsencrypt"
- "traefik.http.routers.wwwtls.tls.domains[0].main=*.goe.land"
- "traefik.docker.network=myweb"
networks:
myweb:
external: true
Loading…
Cancel
Save