From d7a7b5450f0af4f20d68f90b5b71e92ccd73154d Mon Sep 17 00:00:00 2001 From: srosset81 Date: Thu, 7 May 2020 12:48:56 +0200 Subject: [PATCH] Use fuseki.semapps.org instead of jena.semapps.org --- .env | 2 +- deploy/nginx/app.conf | 8 ++--- docker-compose.yaml | 74 +++++++++++++++++++++---------------------- init-letsencrypt.sh | 2 +- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/.env b/.env index 636c2d985..08e290976 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ # Default env variables for docker-compose files MIDDLEWARE=runner -FRONTEND=playground +FRONTEND=dms diff --git a/deploy/nginx/app.conf b/deploy/nginx/app.conf index 5ee02ef1c..db95581fb 100644 --- a/deploy/nginx/app.conf +++ b/deploy/nginx/app.conf @@ -64,7 +64,7 @@ server { server { listen 80; - server_name jena.semapps.org; + server_name fuseki.semapps.org; server_tokens off; location /.well-known/acme-challenge/ { @@ -78,11 +78,11 @@ server { server { listen 443 ssl; - server_name jena.semapps.org; + server_name fuseki.semapps.org; server_tokens off; - ssl_certificate /etc/letsencrypt/live/jena.semapps.org/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/jena.semapps.org/privkey.pem; + ssl_certificate /etc/letsencrypt/live/fuseki.semapps.org/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/fuseki.semapps.org/privkey.pem; include /etc/letsencrypt/options-ssl-nginx.conf; ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; diff --git a/docker-compose.yaml b/docker-compose.yaml index 79c1438ed..efa7270ae 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -18,44 +18,44 @@ services: environment: ADMIN_PASSWORD: "admin" - middleware: - build: - context: ./src/middleware - dockerfile: Dockerfile - container_name: middleware - restart: always - depends_on: - - fuseki - volumes: - - ./src/middleware:/main/ - networks: - - semapps - ports: - - "3000:3000" - expose: - - "3000" - command: ./boilerplates/${MIDDLEWARE}/entrypoint.sh +# middleware: +# build: +# context: ./src/middleware +# dockerfile: Dockerfile +# container_name: middleware +# restart: always +# depends_on: +# - fuseki +# volumes: +# - ./src/middleware:/main/ +# networks: +# - semapps +# ports: +# - "3000:3000" +# expose: +# - "3000" +# command: ./boilerplates/${MIDDLEWARE}/entrypoint.sh - frontend: - build: - context: ./src/frontend - dockerfile: Dockerfile.dev - args: - - FRONTEND - container_name: frontend - restart: always - depends_on: - - middleware - environment: - - PORT=5000 - volumes: - - ./src/frontend/${FRONTEND}:/app - networks: - - semapps - ports: - - "5000:5000" - expose: - - "5000" +# frontend: +# build: +# context: ./src/frontend +# dockerfile: Dockerfile.dev +# args: +# - FRONTEND +# container_name: frontend +# restart: always +## depends_on: +## - middleware +# environment: +# - PORT=5000 +# volumes: +# - ./src/frontend/${FRONTEND}:/app +# networks: +# - semapps +# ports: +# - "5000:5000" +# expose: +# - "5000" volumes: rdf_data: diff --git a/init-letsencrypt.sh b/init-letsencrypt.sh index f11f391a0..d4442119b 100755 --- a/init-letsencrypt.sh +++ b/init-letsencrypt.sh @@ -5,7 +5,7 @@ if ! [ -x "$(command -v docker-compose)" ]; then exit 1 fi -domains=(playground.semapps.org middleware.semapps.org jena.semapps.org) +domains=(playground.semapps.org middleware.semapps.org fuseki.semapps.org) rsa_key_size=4096 data_path="./deploy/certbot" email="info@parlepeuple.fr" # Adding a valid address is strongly recommended