Feature/simple custom proxy domain by marcomc · Pull Request #189 · my127/workspace

marcomc · 2026-06-17T14:52:35Z

Summary

Make the Global Proxy domain configurable while keeping support limited to one domain at a time.

The default remains my127.site, but it can now be replaced via a normal global Workspace config file:

# ~/.config/my127/workspace/proxy.yml
attribute('global.service.proxy.domain'): dev.example.test
attribute('global.service.proxy.https.crt'): https://example.test/certs/dev.example.test/fullchain.pem
attribute('global.service.proxy.https.key'): https://example.test/certs/dev.example.test/privkey.pem

Changes

Added configurable proxy domain and cert/key filenames.
Updated proxy/mail/logger/tracing Docker labels to use the configured domain.
Generate Traefik tls.yaml at proxy startup instead of hardcoding my127.site cert paths.
Refresh mail/logger containers with docker-compose up -d --build so label changes are applied.
Added docs for custom proxy domain setup, including public GitHub raw URL examples.

Fixes

Fixed Workspace::offsetGet() to return mixed, since attributes can be arrays.
Fixed attribute metadata source ordering so latest same-precedence source wins and numeric precedence sorts correctly.
Added regression tests for both fixes.

…bles

…ion for proxy service

marcomc · 2026-06-17T14:57:13Z

-        run docker-compose -p my127ws-logger start
-    fi
+    run docker-compose -p my127ws-logger up -d --build
+    touch .flag-built


The proxy domain is now part of the Docker Compose labels.

With the previous flow, after the first build enable only ran docker-compose start. That starts the existing container as-is, so label changes are not applied.

If global.service.proxy.domain changes, mail/logger could otherwise keep stale labels such as mail.my127.site or kibana.my127.site.

Using docker-compose up -d --build keeps the command idempotent while allowing Compose to recreate the container when the labels/config changed.

…and update documentation for certificate handling

…bal configuration

…st numeric precedence

…rray attribute access

…t for mail service path

marcomc · 2026-06-17T16:09:22Z

-        run docker-compose -p my127ws-logger start
-    fi
+    MY127WS_PROXY_DOMAIN="$(ws global config get global.service.proxy.domain)"
+    export MY127WS_PROXY_DOMAIN


Docker Compose resolves ${MY127WS_PROXY_DOMAIN:-my127.site} only from the environment of the docker-compose process.

So setting the value only at a higher command-wrapper level is not enough, because services can also be started through direct paths:

ws install
-> Installer.php
-> ws-service mail enable
-> home/service/mail/init.sh
-> docker-compose

custom command
-> ws-service mail enable
-> home/service/mail/init.sh
-> docker-compose

In those paths, the global service command wrapper is bypassed.
Load/export the configured proxy domain inside the affected service init script immediately before docker-compose runs guarantees that the service has the environment set.

That keeps all entry points consistent and avoids relying on callers to remember to provide MY127WS_PROXY_DOMAIN.

marcomc · 2026-06-17T17:14:27Z

    "home/service/mail/.env",
-    "home/service/proxy/.env"
+    "home/service/proxy/.env",
+    "home/service/tracing/.env"


home/service/tracing/.env already exists in the source tree and is required by home/service/tracing/docker-compose.yml because Compose reads TRAEFIK_NETWORK from that file.

The phar packaging explicitly whitelists hidden .env files, but tracing was missing from that list. As a result, an installed ws could create ~/.my127/workspace/service/tracing/ without .env, causing ws global service tracing restart to fail with an empty TRAEFIK_NETWORK.

…pport and update documentation

…names are valid and distinct

…r handling

…ments and project overrides

…alization to use global configuration

…r proxy restart

marcomc · 2026-06-18T12:26:29Z

      sed 's/\[inactive.tracing\]/\[tracing\]/' "${TRAEFIK_CONFIG}.before-tracing-active" > "${TRAEFIK_CONFIG}"
      rm "${TRAEFIK_CONFIG}.before-tracing-active"
-      passthru ws global service proxy restart
+      passthru "${MY127WS_WORKSPACE_BIN:-ws}" global service proxy restart


MY127WS_WORKSPACE_BIN is only guaranteed when the call came from bin/workspace.
home/service/tracing/init.sh can still be reached via

~/.my127/workspace/bin/ws-service tracing restart ~/.my127/workspace/service/tracing/init.sh restart

In those cases MY127WS_WORKSPACE_BIN may be unset. The fallback keeps the old behavior

marcomc · 2026-06-18T12:30:27Z

        install();
    }

+    putenv('MY127WS_WORKSPACE_BIN='.($_SERVER['argv'][0] ?? __FILE__));


This gives internal service wrappers a deterministic way to call back into the same ws executable that launched the current command.

Without it, nested calls inside ws-service / service init scripts would fall back to resolving ws from PATH, which can pick a different installed version. That is especially risky during tests, local branch validation, or when multiple ws binaries exist on the machine.

…vironment population

marcomc · 2026-06-18T13:42:28Z


+    $workspaceBin = $_SERVER['argv'][0] ?? __FILE__;
+    $workspaceBin = realpath($workspaceBin) ?: $workspaceBin;
+    putenv('MY127WS_WORKSPACE_BIN='.$workspaceBin);


This keeps nested service calls using the same Workspace executable that launched the top-level command.

ws-service changes into the installed global Workspace directory before resolving global proxy config.

marcomc · 2026-06-18T16:20:42Z

    shift

+    cd "$DIR"
+    populate_proxy_environment "$service"


That preserves the original behaviour: config lookup happens from ~/.my127/workspace

marcomc · 2026-06-30T12:25:55Z

@andytson-inviqa is this PR close to what you were suggesting on the other PR?

marcomc · 2026-07-08T00:40:43Z

@andytson-inviqa did you have time to have a look at this PR by any chance?

marcomc added 5 commits June 17, 2026 15:26

feat: add TLS configuration for proxy service in workspace.yml

1859682

feat: update proxy service configurations to use dynamic domain varia…

c660f3d

…bles

feat: simplify enable function in init scripts and add TLS configurat…

830868e

…ion for proxy service

feat: add tests for global proxy domain configuration and overrides

f82d195

feat: add documentation for custom global proxy domain configuration

ee3ff1a

marcomc commented Jun 17, 2026

View reviewed changes

marcomc added 6 commits June 17, 2026 16:59

feat: remove unused environment variables from proxy service command …

17dd727

…and update documentation for certificate handling

feat: add descriptions for logger and tracing service commands in glo…

f3fa4b4

…bal configuration

feat: enhance create command with description and exec block formatting

bd2ecb2

feat: update attribute source handling to use latest source and highe…

29bcfa4

…st numeric precedence

feat: update offsetGet method to return mixed type and add test for a…

97804ec

…rray attribute access

feat: add MY127WS_PROXY_DOMAIN export in service init scripts and tes…

6582f60

…t for mail service path

marcomc commented Jun 17, 2026

View reviewed changes

feat: add tracing service environment file to files-bin in box.json

0241a4e

marcomc commented Jun 17, 2026

View reviewed changes

marcomc added 6 commits June 17, 2026 19:54

feat: enhance global proxy configuration with environment variable su…

e13be5a

…pport and update documentation

feat: add TLS validation functions to ensure certificate and key file…

9a4bf43

…names are valid and distinct

feat: enhance global proxy service tests with TLS validation and erro…

cac212c

…r handling

feat: update documentation for proxy configuration with HTTPS require…

3c7ac04

…ments and project overrides

feat: implement proxy environment population and update service initi…

283b292

…alization to use global configuration

feat: update init script to use dynamic workspace binary reference fo…

adeb1b3

…r proxy restart

marcomc commented Jun 18, 2026

View reviewed changes

feat: enhance workspace binary reference handling and update proxy en…

1b9e48b

…vironment population

marcomc commented Jun 18, 2026

View reviewed changes

marcomc requested review from andytson-inviqa and kierenevans June 25, 2026 13:14

marcomc marked this pull request as ready for review June 25, 2026 13:15

marcomc added the enhancement New feature or request label Jun 25, 2026

marcomc requested a review from coledave June 25, 2026 13:15

Navigation Menu

Uh oh!

Feature/simple custom proxy domain - #189

Feature/simple custom proxy domain#189
marcomc wants to merge 19 commits into
0.5.xfrom
feature/simple-custom-proxy-domain

marcomc commented Jun 17, 2026 •

edited

Loading

Uh oh!

marcomc Jun 17, 2026

Uh oh!

marcomc Jun 17, 2026

Uh oh!

marcomc Jun 17, 2026

Uh oh!

marcomc Jun 18, 2026

Uh oh!

marcomc Jun 18, 2026

Uh oh!

marcomc Jun 18, 2026

Uh oh!

marcomc Jun 18, 2026

Uh oh!

marcomc commented Jun 30, 2026

Uh oh!

marcomc commented Jul 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

Conversation

marcomc commented Jun 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Changes

Fixes

Uh oh!

marcomc Jun 17, 2026

Choose a reason for hiding this comment

Uh oh!

marcomc Jun 17, 2026

Choose a reason for hiding this comment

Uh oh!

marcomc Jun 17, 2026

Choose a reason for hiding this comment

Uh oh!

marcomc Jun 18, 2026

Choose a reason for hiding this comment

Uh oh!

marcomc Jun 18, 2026

Choose a reason for hiding this comment

Uh oh!

marcomc Jun 18, 2026

Choose a reason for hiding this comment

Uh oh!

marcomc Jun 18, 2026

Choose a reason for hiding this comment

Uh oh!

marcomc commented Jun 30, 2026

Uh oh!

marcomc commented Jul 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

marcomc commented Jun 17, 2026 •

edited

Loading