3 Commits 7615adc553 ... f13046e274

Author SHA1 Message Date
  Guilhem Saurel f13046e274 matrix: update versions 6 years ago
  Guilhem Saurel ab74103cec matrix: need protocol 6 years ago
  Guilhem Saurel 6be5ca1598 dolibarr: restart nginx 6 years ago
4 changed files with 6 additions and 2 deletions
  1. 1 0
      dolibarr/docker-compose.yml
  2. 2 1
      matrix/Dockerfile
  3. 1 0
      matrix/README.md
  4. 2 1
      matrix/docker-compose.yml

+ 1 - 0
dolibarr/docker-compose.yml

@@ -32,6 +32,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.nginx
+    restart: unless-stopped
     depends_on:
       - app
     labels:

+ 2 - 1
matrix/Dockerfile

@@ -8,4 +8,5 @@ RUN curl -sSL https://github.com/vector-im/riot-web/releases/download/$RIOT_VERS
   | tar -xz --strip-components=1
 
 ARG SYNAPSE_FULL_URL
-RUN sed "/default_hs_url/s=https://matrix.org=https://$SYNAPSE_FULL_URL=" config.sample.json > config.json
+ARG PROTOCOL
+RUN sed "/default_hs_url/s=https://matrix.org=${PROTOCOL}://${SYNAPSE_FULL_URL}=" config.sample.json > config.json

+ 1 - 0
matrix/README.md

@@ -18,6 +18,7 @@ echo SYNAPSE_SMTP_HOST=mail.gandi.net >> .env
 echo SYNAPSE_SMTP_USER=dev@oxyta.net >> .env
 echo SYNAPSE_SMTP_PASSWORD=changeme >> .env
 echo SYNAPSE_SERVER_NAME=matrix.localhost >> .env
+echo PROTOCOL=http >> .env  # or https for production
 ```
 
 If you setup your DNS with `_matrix._tcp           3600 IN  SRV    10 0 8448 $CHATONS_SERVICE.$CHATONS_DOMAIN.`, you

+ 2 - 1
matrix/docker-compose.yml

@@ -41,7 +41,8 @@ services:
       context: .
       args:
         SYNAPSE_FULL_URL: ${CHATONS_SERVICE:-matrix}.${CHATONS_DOMAIN:-localhost}
-        RIOT_VERSION: v1.0.1
+        RIOT_VERSION: v1.0.3
+        PROTOCOL: ${PROTOCOL:-http}
     restart: unless-stopped
     labels:
       traefik.enable: "true"