Merge pull request #5 from kemboi22/main

Testing with HTTP LINKS
geniusdynamics · Feb 3, 2024 · 30b42f4 · 30b42f4
2 parents 9fc7721 + 3a3dd68
commit 30b42f4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/imageroot/actions/configure-module/10configure_environment_vars b/imageroot/actions/configure-module/10configure_environment_vars
@@ -31,7 +31,7 @@ data = json.load(sys.stdin)
 host = data.get("host", "")
 port = data.get("TCP_PORT", "")
 url = host+":"+port
-APP_BASE_URL = "https://"+url #"https://"+host
+APP_BASE_URL = "http://"+url #"https://"+host
 APP_PORT=port = data.get("TCP_PORT", "")
 
 # DB Config

diff --git a/imageroot/systemd/user/joplin-server.service b/imageroot/systemd/user/joplin-server.service
@@ -34,12 +34,6 @@ ExecStart=/usr/bin/podman run \
  --env=JOPLIN_DBUSER=${POSTGRES_USER} \
  --env=JOPLIN_DBPASS=${POSTGRES_PASSWORD} \
  --env=APP_BASE_URL=${APP_BASE_URL} \
- --label=traefik.http.routers.joplin-app-secure.rule=Host(${APP_BASE_URL}) \
- --label=traefik.http.routers.joplin-app-secure.entrypoints=https \
- --label=traefik.http.middlewares.joplin-app-https-redirect.redirectscheme.scheme=https \
- --label=traefik.http.routers.joplin-app.entrypoints=http \
- --label=traefik.http.routers.joplin-app.rule=Host(${APP_BASE_URL}) \
- --label=traefik.http.middlewares.joplin-app-https-header.headers.customrequestheaders.X-Forwarded-Proto=http \
  ${SERVER_IMAGE}
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/joplin-server.ctr-id -t 10
 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/joplin-server.ctr-id