diff --git a/src/Handler.php b/src/Handler.php index 128760e447a8c17c97d3984bd2448b75bfe9bd62..0be678b75563a897a438c53fb0f5aeaeb587f900 100644 --- a/src/Handler.php +++ b/src/Handler.php @@ -203,6 +203,7 @@ class Handler extends BaseHandler { ], 'unlighthouse' => [ 'enable' => $this->env->receiveGlobal('UNLIGHTHOUSE', 'Unlighthouse', '0'), + 'urlprefix' => '', ], ]; } diff --git a/templates/docker-compose.yml.twig b/templates/docker-compose.yml.twig index d02410e808ee1fe01afc97e7be5e5814785698c3..635e43fb88090d4e4a0af28d1ebec62ded58430c 100644 --- a/templates/docker-compose.yml.twig +++ b/templates/docker-compose.yml.twig @@ -589,7 +589,7 @@ services: traefik.enable: 'true' traefik.docker.network: traefik-public traefik.http.services.{{ projectname }}_unlighthouse.loadbalancer.server.port: 5678 - traefik.http.routers.unlighthouse-{{ projectname }}.rule: Host(`{{ projectdomain }}`) + traefik.http.routers.unlighthouse-{{ projectname }}.rule: Host(`unlighthouse-{{ projectdomain }}`) {% if drupal.live|default(0) or traefik.usessl %} traefik.http.routers.unlighthouse-{{ projectname }}.tls: 'true' traefik.http.routers.unlighthouse-{{ projectname }}.tls.certresolver: lakedrops diff --git a/templates/tests/unlighthouse.config.ts b/templates/tests/unlighthouse.config.ts deleted file mode 100644 index 4b83077255cbd956df8d3f8e42a0e3c613551651..0000000000000000000000000000000000000000 --- a/templates/tests/unlighthouse.config.ts +++ /dev/null @@ -1,13 +0,0 @@ -export default { - puppeteerOptions: { - args: ["--no-sandbox"], - }, - server: { - open: false, - }, - site: "{{ projectprotocol }}://{{ projectdomain }}", - serverUrl: "{{ projectprotocol }}:/unlighthouse-{{ projectdomain }}/", - clientUrl: "{{ projectprotocol }}://unlighthouse-{{ projectdomain }}/", - apiUrl: "{{ projectprotocol }}://unlighthouse-{{ projectdomain }}/api", - websocketUrl: "{{ socketprotocol }}://unlighthouse-{{ projectdomain }}/api/ws", -} diff --git a/templates/tests/unlighthouse.config.ts.twig b/templates/tests/unlighthouse.config.ts.twig new file mode 100644 index 0000000000000000000000000000000000000000..60dbbe69140aed9c40c0d7ff3c2aa322cd58d4df --- /dev/null +++ b/templates/tests/unlighthouse.config.ts.twig @@ -0,0 +1,19 @@ +export default { + puppeteerOptions: { + args: ["--no-sandbox"], + }, + server: { + open: false, + }, + site: "{{ projectprotocol }}://{{ projectdomain }}{{ unlighthouse.urlprefix|default('') }}", +{% if basicauth.enable %} + auth: { + username: "{{ basicauth.user }}", + password: "{{ basicauth.pass }}", + }, +{% endif %} + serverUrl: "{{ projectprotocol }}://unlighthouse-{{ projectdomain }}/", + clientUrl: "{{ projectprotocol }}://unlighthouse-{{ projectdomain }}/", + apiUrl: "{{ projectprotocol }}://unlighthouse-{{ projectdomain }}/api", + websocketUrl: "{{ socketprotocol }}://unlighthouse-{{ projectdomain }}/api/ws", +}