feat(siteops): support extra trusted site directories#11
Merged
digimaun merged 1 commit intoAzure:mainfrom Apr 20, 2026
Merged
Conversation
Add `extra_trusted_sites_dirs` to the orchestrator and expose it via `--extra-sites-dir` (repeatable) and the `SITEOPS_EXTRA_SITES_DIRS` env var (platform-separated: `;` on Windows, `:` on Unix). Files in these directories are treated like the workspace's `sites/` folder: discoverable by `siteops sites` and allowed to declare `inherits`. Merge order: inherits target -> sites/ -> extra trusted dirs -> sites.local/. A site still has exactly one inheritance chain; the first trusted directory containing the file establishes the base, and all later files (other trusted dirs or sites.local/) have `inherits` stripped. The sites.local/ security invariant is preserved. Collisions with the workspace's own sites/ or sites.local/ are rejected at construction; the sites.local/ case is refused specifically to prevent overlays from being elevated to a trusted source of inheritance. Enables use cases like CI/E2E sites kept out of production config, cross-repo site libraries, and shared blueprint catalogs.
shkalavala
approved these changes
Apr 18, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add
extra_trusted_sites_dirsto the orchestrator and expose it via--extra-sites-dir(repeatable) and theSITEOPS_EXTRA_SITES_DIRSenv var (platform-separated:;on Windows,:on Unix). Files in these directories are treated like the workspace'ssites/folder: discoverable bysiteops sitesand allowed to declareinherits.Merge order: inherits target -> sites/ -> extra trusted dirs ->
sites.local/. A site still has exactly one inheritance chain; the first trusted directory containing the file establishes the base, and all later files (other trusted dirs or sites.local/) have
inheritsstripped. The sites.local/ security invariant is preserved.Collisions with the workspace's own sites/ or sites.local/ are rejected at construction; the sites.local/ case is refused specifically to prevent overlays from being elevated to a trusted source of inheritance.
Enables use cases like CI/E2E sites kept out of production config, cross-repo site libraries, and shared blueprint catalogs.