diff --git a/pica-metrics-bot/Dockerfile b/pica-metrics-bot/Dockerfile index 01e74325edd1d61255e21928740e788332c43797..5c3edba6259663f2eebdf193bfe076a8653b07c5 100644 --- a/pica-metrics-bot/Dockerfile +++ b/pica-metrics-bot/Dockerfile @@ -1,7 +1,7 @@ FROM python:3.8-alpine LABEL maintainer quentinduchemin@tuta.io -ARG METRICS_BOT_VERSION=v1.0 +ARG METRICS_BOT_VERSION=v1.1 # Get release RUN wget -O code.tar.gz https://gitlab.utc.fr/picasoft/projets/picasoft-metrics-bot/-/archive/${METRICS_BOT_VERSION}/picasoft-metrics-bot-${METRICS_BOT_VERSION}.tar.gz \ diff --git a/pica-metrics-bot/docker-compose.yml b/pica-metrics-bot/docker-compose.yml index 2694d2ea022455ba185741e07326b8aea7017688..130bca0e2f45f4354ceb5f1bdf3f65b6fe3a4111 100644 --- a/pica-metrics-bot/docker-compose.yml +++ b/pica-metrics-bot/docker-compose.yml @@ -11,7 +11,7 @@ networks: services: metrics-bot: - image: registry.picasoft.net/pica-metrics-bot:v1.0 + image: registry.picasoft.net/pica-metrics-bot:v1.1 build: . container_name: pica-metrics-services volumes: diff --git a/pica-peertube/README.md b/pica-peertube/README.md new file mode 100644 index 0000000000000000000000000000000000000000..bf19837aaa5a2c08b401c39379db8ebb55fcb8e9 --- /dev/null +++ b/pica-peertube/README.md @@ -0,0 +1,22 @@ +## Peertube + +Ce dossier contient les fichiers nécessaires pour monter une instance de [PeerTube](https://joinpeertube.org), un service d'hébergement de vidéos libre et fédéré. + +## Configuration + +Copier les fichiers de secret en enlevant le `.example` et en mettant à jour les variables dedans avec les bons secrets. + +## Lancement + +Simplement lancer le fichier compose. + +Au premier lancement : +- L'initialisation est automatique. +- Elle échoue si PeerTube n'arrive pas à se connecter au serveur SMTP. +- Le mot de passe root est dans les logs ! + +## Mise à jour + +Pour l'instant (au 12/11/2020), l'image Docker officielle n'a pas de tags de versions à jour. +Le seul tag à jour est un *rolling* tag, `production-buster`. +À suivre ! diff --git a/pica-peertube/docker-compose.yml b/pica-peertube/docker-compose.yml new file mode 100644 index 0000000000000000000000000000000000000000..89e35a407f3d60d1003b83501e718097d65eca51 --- /dev/null +++ b/pica-peertube/docker-compose.yml @@ -0,0 +1,75 @@ +version: "3.3" + +volumes: + peertube_psql: + peertube_data: + driver: local + driver_opts: + type: bind + device: /DATA/docker/peertube + o: bind + peertube_config: + peertube_postfix_keys: + peertube_redis_data: + +networks: + peertube: + ipam: + driver: default + proxy: + external: true + +services: + peertube: + # If you don't want to use the official image and build one from sources + # build: + # context: . + # dockerfile: ./support/docker/production/Dockerfile.buster + image: chocobozzz/peertube:production-buster + container_name: peertube-app + env_file: + - ./secrets/peertube.secrets + - ./secrets/peertube-db.secrets + labels: + traefik.http.routers.peertube-app.entrypoints: websecure + traefik.http.routers.peertube-app.rule: Host(`tube.picasoft.net`) + traefik.http.services.peertube-app.loadbalancer.server.port: "9000" + # Added because it is in their upstream traefik.toml + # (because Peertube permit to view a video hosted by host A on site B) + traefik.http.middlewares.peertube-app.headers.framedeny: false + traefik.enable: "true" + volumes: + - peertube_data:/data + - peertube_config:/config + networks: + - peertube + - proxy + depends_on: + - postgres + - redis + restart: "always" + + postgres: + image: postgres:10-alpine + container_name: peertube-db + env_file: + - ./secrets/peertube-db.secrets + volumes: + - peertube_psql:/var/lib/postgresql/data + networks: + - peertube + restart: "always" + labels: + traefik.enable: "false" + + redis: + image: redis:4-alpine + container_name: peertube-cache + volumes: + - peertube_redis_data:/data + networks: + - peertube + restart: "always" + labels: + traefik.enable: "false" + diff --git a/pica-peertube/secrets/peertube-db.secrets.example b/pica-peertube/secrets/peertube-db.secrets.example new file mode 100644 index 0000000000000000000000000000000000000000..1c3daa03209209507a977c7f2e89fc884e430786 --- /dev/null +++ b/pica-peertube/secrets/peertube-db.secrets.example @@ -0,0 +1,13 @@ +# Database / Postgres service configuration +POSTGRES_USER=peertube +POSTGRES_PASSWORD=peertube +# Postgres database name "peertube" +POSTGRES_DB=peertube +# Editable only with a suffix : +#POSTGRES_DB=peertube_prod +#PEERTUBE_DB_SUFFIX=_prod +PEERTUBE_DB_USERNAME=peertube +PEERTUBE_DB_PASSWORD=peertube +# Default to Postgres service name "postgres" in docker-compose.yml +PEERTUBE_DB_HOSTNAME=postgres + diff --git a/pica-peertube/secrets/peertube.secrets.example b/pica-peertube/secrets/peertube.secrets.example new file mode 100644 index 0000000000000000000000000000000000000000..82e9e4e8705835d5cf58ea2b45ab0664fbbdd2a2 --- /dev/null +++ b/pica-peertube/secrets/peertube.secrets.example @@ -0,0 +1,26 @@ +# Server configuration +PEERTUBE_WEBSERVER_HOSTNAME=peertube.test.picasoft.net +# If you do not use https and a reverse-proxy in docker-compose.yml +#PEERTUBE_WEBSERVER_PORT=80 +#PEERTUBE_WEBSERVER_HTTPS=false +# If you need more than one IP as trust_proxy +# pass them as a comma separated array: +PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16"] + +# E-mail configuration +# If you use a Custom SMTP server +PEERTUBE_SMTP_USERNAME=peertube +PEERTUBE_SMTP_PASSWORD=ChangeMe +# Default to Postfix service name "postfix" in docker-compose.yml +# May be the hostname of your Custom SMTP server +PEERTUBE_SMTP_HOSTNAME=mail.picasoft.net +PEERTUBE_SMTP_PORT=587 +PEERTUBE_SMTP_FROM=peertube@picasoft.net +PEERTUBE_SMTP_TLS=false +PEERTUBE_SMTP_DISABLE_STARTTLS=false +PEERTUBE_ADMIN_EMAIL=peertube@picasoft.net + +# /!\ Prefer to use the PeerTube admin interface to set the following configurations /!\ +#PEERTUBE_SIGNUP_ENABLED=true +#PEERTUBE_TRANSCODING_ENABLED=true +#PEERTUBE_CONTACT_FORM_ENABLED=true