Skip to content

Commit

Permalink
Use fuseki.semapps.org instead of jena.semapps.org
Browse files Browse the repository at this point in the history
  • Loading branch information
srosset81 committed May 7, 2020
1 parent 93f3121 commit d7a7b54
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .env
@@ -1,3 +1,3 @@
# Default env variables for docker-compose files
MIDDLEWARE=runner
FRONTEND=playground
FRONTEND=dms
8 changes: 4 additions & 4 deletions deploy/nginx/app.conf
Expand Up @@ -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/ {
Expand All @@ -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;

Expand Down
74 changes: 37 additions & 37 deletions docker-compose.yaml
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion init-letsencrypt.sh
Expand Up @@ -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
Expand Down

0 comments on commit d7a7b54

Please sign in to comment.