Merge branch 'master' into 'master'

v2: start

Closes #34, #59, and #62

See merge request oxyta.net/docker-atelier!10

cloud/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 
 networks:
-  proxytanet:
+  web:
     external: true
 
 services:
@@ -32,9 +32,7 @@ services:
       - ${CHATONS_ROOT_DIR:-/srv/chatons}/nextcloud/app:/var/www/html:ro
     labels:
       traefik.enable: "true"
-      traefik.backend: "nextcloud"
-      traefik.frontend.rule: "Host: cloud.${CHATONS_DOMAIN:-local}, www.cloud.${CHATONS_DOMAIN:-local}"
-      traefik.docker.network: "proxytanet"
+      traefik.frontend.rule: "Host: cloud.${CHATONS_DOMAIN:-localhost}, www.cloud.${CHATONS_DOMAIN:-localhost}"
     networks:
-      - proxytanet
+      - web
       - default

homepage/Dockerfile

@@ -2,7 +2,7 @@ FROM node:alpine as build
 
 RUN apk add --no-cache curl
 RUN mkdir /front-chatons
-RUN curl -sSL https://framagit.org/altermediatic/front-chatons/repository/master/archive.tar.gz | tar --directory /front-chatons -xz --strip 1
+RUN curl -sSL https://framagit.org/oxyta.net/front-chatons/repository/master/archive.tar.gz | tar --directory /front-chatons -xz --strip 1
 WORKDIR /front-chatons
 RUN npm set progress=false && npm i
 

homepage/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 
 networks:
-  proxytanet:
+  web:
     external: true
 
 services:
@@ -10,7 +10,6 @@ services:
     restart: unless-stopped
     labels:
       traefik.enable: "true"
-      traefik.backend: "homepage"
-      traefik.frontend.rule: "Host: ${CHATONS_DOMAIN:-local}, www.${CHATONS_DOMAIN:-local}"
+      traefik.frontend.rule: "Host: ${CHATONS_DOMAIN:-localhost}, www.${CHATONS_DOMAIN:-localhost}"
     networks:
-      - proxytanet
+      - web

install.md

@@ -28,13 +28,13 @@ systemctl enable docker
 ## Add this repo
 ```
 cd
-git clone --recursive https://framagit.org/altermediatic/docker-atelier.git
+git clone --recursive https://framagit.org/oxyta.net/docker-atelier.git
 cd docker-atelier
 ```
 
 ## Deploy the proxy
 ```
-docker network create proxytanet
+docker network create web
 ```
 
 And then you can go in the `proxy/` folder and in the environment you want:

matrix/README.md

@@ -4,7 +4,8 @@ https://matrix.org & https://riot.im
 
 ## DNS
 
-For this project, you need to setup both `matrix` & `riot` subdomains of `$CHATONS_DOMAIN` (which defaults to `local`)
+For this project, you need to setup both `matrix` & `riot` subdomains of `$CHATONS_DOMAIN` (which defaults to
+`localhost`)
 
 ## Configure
 

matrix/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3"
 
 networks:
-  proxytanet:
+  web:
     external: true
 
 services:
@@ -11,13 +11,12 @@ services:
     env_file:
       - .env
     environment:
-      - SYNAPSE_SERVER_NAME=matrix.${CHATONS_DOMAIN:-local}
+      - SYNAPSE_SERVER_NAME=matrix.${CHATONS_DOMAIN:-localhost}
     labels:
       traefik.enable: "true"
-      traefik.frontend.rule: "Host: matrix.${CHATONS_DOMAIN:-local}, www.matrix.${CHATONS_DOMAIN:-local}"
-      traefik.docker.network: "proxytanet"
+      traefik.frontend.rule: "Host: matrix.${CHATONS_DOMAIN:-localhost}, www.matrix.${CHATONS_DOMAIN:-localhost}"
     networks:
-      - proxytanet
+      - web
       - default
     volumes:
       - ${CHATONS_ROOT_DIR:-/srv/chatons}/matrix/data:/data
@@ -39,10 +38,10 @@ services:
     build:
       context: .
       args:
-        SYNAPSE_SERVER_NAME: matrix.${CHATONS_DOMAIN:-local}
+        SYNAPSE_SERVER_NAME: matrix.${CHATONS_DOMAIN:-localhost}
         RIOT_VERSION: v0.16.6
     labels:
       traefik.enable: "true"
-      traefik.frontend.rule: "Host: riot.${CHATONS_DOMAIN:-local}, www.riot.${CHATONS_DOMAIN:-local}"
+      traefik.frontend.rule: "Host: riot.${CHATONS_DOMAIN:-localhost}, www.riot.${CHATONS_DOMAIN:-localhost}"
     networks:
-      - proxytanet
+      - web

pad/Dockerfile

@@ -2,7 +2,7 @@ FROM node:9-alpine as build
 
 RUN apk add --no-cache curl
 RUN mkdir /front-pad
-RUN curl -sSL https://framagit.org/altermediatic/front-pad/repository/master/archive.tar.gz | tar --directory /front-pad -xz --strip 1
+RUN curl -sSL https://framagit.org/oxyta.net/front-pad/repository/master/archive.tar.gz | tar --directory /front-pad -xz --strip 1
 WORKDIR /front-pad
 RUN npm set progress=false && npm i && npm run css
 

pad/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 
 networks:
-  proxytanet:
+  web:
     external: true
 
 services:
@@ -20,11 +20,9 @@ services:
       - .env
     labels:
       traefik.enable: "true"
-      traefik.backend: "etherpad"
-      traefik.frontend.rule: "Host: pad.${CHATONS_DOMAIN:-local}, www.pad.${CHATONS_DOMAIN:-local}"
-      traefik.docker.network: "proxytanet"
+      traefik.frontend.rule: "Host: pad.${CHATONS_DOMAIN:-localhost}, www.pad.${CHATONS_DOMAIN:-localhost}"
     networks:
       - default
-      - proxytanet
+      - web
     volumes:
       - ${CHATONS_ROOT_DIR:-/srv/chatons}/etherpad/app:/opt/etherpad-lite/var

peertube/README.md

@@ -21,9 +21,9 @@ echo PEERTUBE_SMTP_PASSWORD=null >> .env
 echo PEERTUBE_SMTP_HOSTNAME=null >> .env
 echo PEERTUBE_SMTP_PORT=465 >> .env
 echo PEERTUBE_SMTP_TLS=true >> .env
-echo PEERTUBE_SMTP_USERNAME=peertube@${CHATONS_DOMAIN:-local} >> .env
-echo PEERTUBE_SMTP_FROM=peertube@${CHATONS_DOMAIN:-local} >> .env
-echo PEERTUBE_ADMIN_EMAIL=peertube@${CHATONS_DOMAIN:-local} >> .env
+echo PEERTUBE_SMTP_USERNAME=peertube@${CHATONS_DOMAIN:-localhost} >> .env
+echo PEERTUBE_SMTP_FROM=peertube@${CHATONS_DOMAIN:-localhost} >> .env
+echo PEERTUBE_ADMIN_EMAIL=peertube@${CHATONS_DOMAIN:-localhost} >> .env
 ```
 
 ## Deploy

peertube/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3"
 
 networks:
-  proxytanet:
+  web:
     external: true
 
 services:
@@ -11,13 +11,12 @@ services:
     env_file:
       - .env
     environment:
-      - PEERTUBE_WEBSERVER_HOSTNAME=peertube.${CHATONS_DOMAIN:-local}
+      - PEERTUBE_WEBSERVER_HOSTNAME=peertube.${CHATONS_DOMAIN:-localhost}
     labels:
       traefik.enable: "true"
-      traefik.frontend.rule: "Host: peertube.${CHATONS_DOMAIN:-local}, www.peertube.${CHATONS_DOMAIN:-local}"
-      traefik.docker.network: "proxytanet"
+      traefik.frontend.rule: "Host: peertube.${CHATONS_DOMAIN:-localhost}, www.peertube.${CHATONS_DOMAIN:-localhost}"
     networks:
-      - proxytanet
+      - web
       - default
     volumes:
       - ${CHATONS_ROOT_DIR:-/srv/chatons}/peertube/data:/data

proxy

@@ -1 +1 @@
-Subproject commit d43badd84e02b5bb1fd5aa47ac3eee96579b53ff
+Subproject commit f47bd4363b42faae8fdfdc106c75fcac2b5a6f6d