Skip to content

enable https for http things #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ki-do wants to merge 1 commit into
base: main
Choose a base branch
from
Open

enable https for http things #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions docker-compose-things-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ services:
dockerfile: ./http/express/Dockerfile-simple
labels:
- traefik.http.routers.http-express-calculator-simple.rule=PathPrefix(`/http-express-calculator-simple`)
- traefik.http.routers.http-express-calculator-simple.entrypoints=web
- traefik.http.routers.http-express-calculator-simple-secure.rule=PathPrefix(`/http-express-calculator-simple`)
- traefik.http.routers.http-express-calculator-simple-secure.entrypoints=websecure
- traefik.http.routers.http-express-calculator-simple-secure.tls=true
- traefik.http.services.http-express-calculator-simple.loadbalancer.server.port=${WEB_PORT_OUT}
environment:
- HOSTNAME=${STACK_HOSTNAME}
Expand Down Expand Up @@ -104,8 +108,12 @@ services:
context: .
dockerfile: ./things/advanced-coffee-machine/http/ts/Dockerfile
labels:
- traefik.http.routers.http-advanced-coffee-machine.rule=PathPrefix(`/http-advanced-coffee-machine`)
- traefik.http.services.http-advanced-coffee-machine.loadbalancer.server.port=${WEB_PORT_OUT}
- traefik.http.routers.http-advanced-coffee-machine.rule=PathPrefix(`/http-advanced-coffee-machine`)
- traefik.http.routers.http-advanced-coffee-machine.entrypoints=web
- traefik.http.routers.http-advanced-coffee-machine-secure.rule=PathPrefix(`/http-advanced-coffee-machine`)
- traefik.http.routers.http-advanced-coffee-machine-secure.entrypoints=websecure
- traefik.http.routers.http-advanced-coffee-machine-secure.tls=true
- traefik.http.services.http-advanced-coffee-machine.loadbalancer.server.port=${WEB_PORT_OUT}
environment:
- HOSTNAME=${STACK_HOSTNAME}
- PORT=${WEB_PORT_OUT}
Expand All @@ -118,6 +126,10 @@ services:
dockerfile: ./http/ts/Dockerfile
labels:
- traefik.http.routers.http-data-schema-thing.rule=PathPrefix(`/http-data-schema-thing`)
- traefik.http.routers.http-data-schema-thing.entrypoints=web
- traefik.http.routers.http-data-schema-thing-secure.rule=PathPrefix(`/http-data-schema-thing`)
- traefik.http.routers.http-data-schema-thing-secure.entrypoints=websecure
- traefik.http.routers.http-data-schema-thing-secure.tls=true
- traefik.http.services.http-data-schema-thing.loadbalancer.server.port=${WEB_PORT_OUT}
environment:
- HOSTNAME=${STACK_HOSTNAME}
Expand Down
12 changes: 12 additions & 0 deletions docker-compose-things.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ services:
image: thingweb/test-things-http-express-calculator-simple
labels:
- traefik.http.routers.http-express-calculator-simple.rule=PathPrefix(`/http-express-calculator-simple`)
- traefik.http.routers.http-express-calculator-simple.entrypoints=web
- traefik.http.routers.http-express-calculator-simple-secure.rule=PathPrefix(`/http-express-calculator-simple`)
- traefik.http.routers.http-express-calculator-simple-secure.entrypoints=websecure
- traefik.http.routers.http-express-calculator-simple-secure.tls=true
- traefik.http.services.http-express-calculator-simple.loadbalancer.server.port=${WEB_PORT_OUT}
environment:
- HOSTNAME=${STACK_HOSTNAME}
Expand Down Expand Up @@ -145,6 +149,10 @@ services:
image: thingweb/test-things-http-advanced-coffee-machine
labels:
- traefik.http.routers.http-advanced-coffee-machine.rule=PathPrefix(`/http-advanced-coffee-machine`)
- traefik.http.routers.http-advanced-coffee-machine.entrypoints=web
- traefik.http.routers.http-advanced-coffee-machine-secure.rule=PathPrefix(`/http-advanced-coffee-machine`)
- traefik.http.routers.http-advanced-coffee-machine-secure.entrypoints=websecure
- traefik.http.routers.http-advanced-coffee-machine-secure.tls=true
- traefik.http.services.http-advanced-coffee-machine.loadbalancer.server.port=${WEB_PORT_OUT}
environment:
- HOSTNAME=${STACK_HOSTNAME}
Expand All @@ -164,6 +172,10 @@ services:
image: thingweb/test-things-http-data-schema-thing
labels:
- traefik.http.routers.http-data-schema-thing.rule=PathPrefix(`/http-data-schema-thing`)
- traefik.http.routers.http-data-schema-thing.entrypoints=web
- traefik.http.routers.http-data-schema-thing-secure.rule=PathPrefix(`/http-data-schema-thing`)
- traefik.http.routers.http-data-schema-thing-secure.entrypoints=websecure
- traefik.http.routers.http-data-schema-thing-secure.tls=true
- traefik.http.services.http-data-schema-thing.loadbalancer.server.port=${WEB_PORT_OUT}
environment:
- HOSTNAME=${STACK_HOSTNAME}
Expand Down
4 changes: 2 additions & 2 deletions things/advanced-coffee-machine/http/ts/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ if (tmPath != null && tmPath !== "") {

const placeholderReplacer = new JsonPlaceholderReplacer();
placeholderReplacer.addVariableMap({
PROTOCOL: "http",
PROTOCOL: "https",
THING_NAME: thingName,
HOSTNAME: hostname,
PORT_NUMBER: portNumber,
Expand All @@ -122,7 +122,7 @@ thingDescription = {
const servient = new Servient();
servient.addServer(
new HttpServer({
baseUri: `http://${hostname}:${portNumber}`,
baseUri: `https://${hostname}:${portNumber}`,
port: portNumber,
})
);
Expand Down
4 changes: 2 additions & 2 deletions things/data-schema-thing/http/ts/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ if (tmPath != null && tmPath !== "") {

const placeholderReplacer = new JsonPlaceholderReplacer();
placeholderReplacer.addVariableMap({
PROTOCOL: "http",
PROTOCOL: "https",
THING_NAME: thingName,
HOSTNAME: hostname,
PORT_NUMBER: portNumber,
Expand Down Expand Up @@ -203,7 +203,7 @@ setObject({ id: 123, name: "abc" });
const servient = new Servient();
servient.addServer(
new HttpServer({
baseUri: `http://${hostname}:${portNumber}`,
baseUri: `https://${hostname}:${portNumber}`,
port: portNumber,
})
);
Expand Down
Loading