Skip to content

Add default database settting, and env var overrides - #73

Merged
tnull merged 4 commits into
lightningdevkit:mainfrom
tankyleo:default-db-config
Jan 15, 2026
Merged

Add default database settting, and env var overrides#73
tnull merged 4 commits into
lightningdevkit:mainfrom
tankyleo:default-db-config

Conversation

@tankyleo

Copy link
Copy Markdown
Contributor

Based on #72

@ldk-reviews-bot

ldk-reviews-bot commented Dec 6, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@tnull
tnull requested review from tnull and removed request for benthecarman and tnullDecember 8, 2025 08:39
@tnull

tnull commented Dec 8, 2025

Copy link
Copy Markdown
Contributor

Now removed review request as this is currently blocked on #72. @tankyleo please feel free to re-request once #72 lands.

@tankyleotankyleo self-assigned this Dec 11, 2025
@tankyleotankyleo moved this to Goal: Merge in Weekly GoalsDec 11, 2025
@tankyleo
tankyleo requested a review from tnullDecember 18, 2025 03:05
@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 4th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 5th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 6th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 7th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 8th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs a rebase now that #72 landed.

@tankyleotankyleo mentioned this pull request Jan 7, 2026
@tankyleo
tankyleo requested a review from tnullJanuary 10, 2026 00:08
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

This needs a rebase now that #72 landed.

5f38982 was already based on the latest main, but made a quick post-holiday pass and touched up a few nits. Should be good for review now.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally looks good, some minor comments.

Comment threadrust/server/vss-server-config.toml Outdated
host = "localhost"
port = 5432
database = "postgres"
default_database = "postgres"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might make sense to add comment here to specify that this will only be used for the initial connection. Otherwise it could be confusing why the user needs to specify two separate databases.


format!("postgresql://{}:{}@{}:{}", username, password, self.host, self.port)
}
pub(crate) struct Configuration {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So now we have ConfigandConfiguration? That seems rather confusing. Can they be merged, or at least one renamed appropriately to better distinguish their intended use?

Comment threadrust/server/src/util/config.rs Outdated
toml::from_str(&config_file)
.map_err(|e| format!("Failed to parse configuration file: {}", e))?;

macro_rules! read_env {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need macros for this? Maybe we can inline these or make them methods?

@tankyleo
tankyleo requested a review from tnullJanuary 14, 2026 00:40
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

Thanks tnull addressed your comments let me know if I can rebase

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks tnull addressed your comments let me know if I can rebase

Please go ahead and squash & rebase. While you're at it, you might address the one nit below.

Comment threadrust/server/src/util/config.rs Outdated
// environment variable.
#[derive(Deserialize, Default)]
struct Config {
struct TomlConfigTable {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: When you squash, can we drop the Table here?

Allow only a subset of `JwtAuthConfig` fields to be set in config file,
as we allow any members of the configuration tables to not be set in
the file, and instead be set by the corresponding environment variable.
...just like we do for the RSA public key used to authenticate incoming
JWTs.
Also parse the root certificate in `PostgresTlsBackend::new`. This makes
`PostgresTlsBackend` consistent with `JWTAuthorizer`; both structs take
cryptographic objects as `&str`'s and parse them in their constructors.
Not all postgres hosted services use `postgres`
Also rename `database` config parameter to `vss_database`
This allows users to configure VSS-Server entirely through environment
variables, without a configuration file. We hence remove the requirement
that a path to a configuration file always be passed as an
argument.
If a file is passed as an argument, and it does not exist,
we now abort startup.
Also consolidate host and port settings into single socket address
setting.
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

Rebased and squashed with the new TomlConfig change, and the change noted in the last commit message:

If a file is passed as an argument, and it does not exist, we now abort startup.

@tnull
tnull merged commit 5d13e11 into lightningdevkit:mainJan 15, 2026
2 checks passed
@github-project-automationgithub-project-automationBot moved this from Goal: Merge to Done in Weekly GoalsJan 15, 2026
@tankyleo
tankyleo deleted the default-db-config branch January 26, 2026 19:51
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants

@tankyleo@ldk-reviews-bot@tnull
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add default database settting, and env var overrides by tankyleo · Pull Request #73 · lightningdevkit/vss-server · GitHub
Skip to content

Add default database settting, and env var overrides - #73

Merged
tnull merged 4 commits into
lightningdevkit:mainfrom
tankyleo:default-db-config
Jan 15, 2026
Merged

Add default database settting, and env var overrides#73
tnull merged 4 commits into
lightningdevkit:mainfrom
tankyleo:default-db-config

Conversation

@tankyleo

Copy link
Copy Markdown
Contributor

Based on #72

@ldk-reviews-bot

ldk-reviews-bot commented Dec 6, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@tnull
tnull requested review from tnull and removed request for benthecarman and tnullDecember 8, 2025 08:39
@tnull

tnull commented Dec 8, 2025

Copy link
Copy Markdown
Contributor

Now removed review request as this is currently blocked on #72. @tankyleo please feel free to re-request once #72 lands.

@tankyleotankyleo self-assigned this Dec 11, 2025
@tankyleotankyleo moved this to Goal: Merge in Weekly GoalsDec 11, 2025
@tankyleo
tankyleo requested a review from tnullDecember 18, 2025 03:05
@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 4th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 5th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 6th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 7th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 8th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs a rebase now that #72 landed.

@tankyleotankyleo mentioned this pull request Jan 7, 2026
@tankyleo
tankyleo requested a review from tnullJanuary 10, 2026 00:08
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

This needs a rebase now that #72 landed.

5f38982 was already based on the latest main, but made a quick post-holiday pass and touched up a few nits. Should be good for review now.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally looks good, some minor comments.

Comment threadrust/server/vss-server-config.toml Outdated
host = "localhost"
port = 5432
database = "postgres"
default_database = "postgres"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might make sense to add comment here to specify that this will only be used for the initial connection. Otherwise it could be confusing why the user needs to specify two separate databases.


format!("postgresql://{}:{}@{}:{}", username, password, self.host, self.port)
}
pub(crate) struct Configuration {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So now we have ConfigandConfiguration? That seems rather confusing. Can they be merged, or at least one renamed appropriately to better distinguish their intended use?

Comment threadrust/server/src/util/config.rs Outdated
toml::from_str(&config_file)
.map_err(|e| format!("Failed to parse configuration file: {}", e))?;

macro_rules! read_env {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need macros for this? Maybe we can inline these or make them methods?

@tankyleo
tankyleo requested a review from tnullJanuary 14, 2026 00:40
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

Thanks tnull addressed your comments let me know if I can rebase

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks tnull addressed your comments let me know if I can rebase

Please go ahead and squash & rebase. While you're at it, you might address the one nit below.

Comment threadrust/server/src/util/config.rs Outdated
// environment variable.
#[derive(Deserialize, Default)]
struct Config {
struct TomlConfigTable {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: When you squash, can we drop the Table here?

Allow only a subset of `JwtAuthConfig` fields to be set in config file,
as we allow any members of the configuration tables to not be set in
the file, and instead be set by the corresponding environment variable.
...just like we do for the RSA public key used to authenticate incoming
JWTs.
Also parse the root certificate in `PostgresTlsBackend::new`. This makes
`PostgresTlsBackend` consistent with `JWTAuthorizer`; both structs take
cryptographic objects as `&str`'s and parse them in their constructors.
Not all postgres hosted services use `postgres`
Also rename `database` config parameter to `vss_database`
This allows users to configure VSS-Server entirely through environment
variables, without a configuration file. We hence remove the requirement
that a path to a configuration file always be passed as an
argument.
If a file is passed as an argument, and it does not exist,
we now abort startup.
Also consolidate host and port settings into single socket address
setting.
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

Rebased and squashed with the new TomlConfig change, and the change noted in the last commit message:

If a file is passed as an argument, and it does not exist, we now abort startup.

@tnull
tnull merged commit 5d13e11 into lightningdevkit:mainJan 15, 2026
2 checks passed
@github-project-automationgithub-project-automationBot moved this from Goal: Merge to Done in Weekly GoalsJan 15, 2026
@tankyleo
tankyleo deleted the default-db-config branch January 26, 2026 19:51
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants

@tankyleo@ldk-reviews-bot@tnull
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add default database settting, and env var overrides by tankyleo · Pull Request #73 · lightningdevkit/vss-server · GitHub
Skip to content

Add default database settting, and env var overrides - #73

Merged
tnull merged 4 commits into
lightningdevkit:mainfrom
tankyleo:default-db-config
Jan 15, 2026
Merged

Add default database settting, and env var overrides#73
tnull merged 4 commits into
lightningdevkit:mainfrom
tankyleo:default-db-config

Conversation

@tankyleo

Copy link
Copy Markdown
Contributor

Based on #72

@ldk-reviews-bot

ldk-reviews-bot commented Dec 6, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@tnull
tnull requested review from tnull and removed request for benthecarman and tnullDecember 8, 2025 08:39
@tnull

tnull commented Dec 8, 2025

Copy link
Copy Markdown
Contributor

Now removed review request as this is currently blocked on #72. @tankyleo please feel free to re-request once #72 lands.

@tankyleotankyleo self-assigned this Dec 11, 2025
@tankyleotankyleo moved this to Goal: Merge in Weekly GoalsDec 11, 2025
@tankyleo
tankyleo requested a review from tnullDecember 18, 2025 03:05
@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 4th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 5th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 6th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 7th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 8th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs a rebase now that #72 landed.

@tankyleotankyleo mentioned this pull request Jan 7, 2026
@tankyleo
tankyleo requested a review from tnullJanuary 10, 2026 00:08
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

This needs a rebase now that #72 landed.

5f38982 was already based on the latest main, but made a quick post-holiday pass and touched up a few nits. Should be good for review now.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally looks good, some minor comments.

Comment threadrust/server/vss-server-config.toml Outdated
host = "localhost"
port = 5432
database = "postgres"
default_database = "postgres"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might make sense to add comment here to specify that this will only be used for the initial connection. Otherwise it could be confusing why the user needs to specify two separate databases.


format!("postgresql://{}:{}@{}:{}", username, password, self.host, self.port)
}
pub(crate) struct Configuration {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So now we have ConfigandConfiguration? That seems rather confusing. Can they be merged, or at least one renamed appropriately to better distinguish their intended use?

Comment threadrust/server/src/util/config.rs Outdated
toml::from_str(&config_file)
.map_err(|e| format!("Failed to parse configuration file: {}", e))?;

macro_rules! read_env {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need macros for this? Maybe we can inline these or make them methods?

@tankyleo
tankyleo requested a review from tnullJanuary 14, 2026 00:40
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

Thanks tnull addressed your comments let me know if I can rebase

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks tnull addressed your comments let me know if I can rebase

Please go ahead and squash & rebase. While you're at it, you might address the one nit below.

Comment threadrust/server/src/util/config.rs Outdated
// environment variable.
#[derive(Deserialize, Default)]
struct Config {
struct TomlConfigTable {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: When you squash, can we drop the Table here?

Allow only a subset of `JwtAuthConfig` fields to be set in config file,
as we allow any members of the configuration tables to not be set in
the file, and instead be set by the corresponding environment variable.
...just like we do for the RSA public key used to authenticate incoming
JWTs.
Also parse the root certificate in `PostgresTlsBackend::new`. This makes
`PostgresTlsBackend` consistent with `JWTAuthorizer`; both structs take
cryptographic objects as `&str`'s and parse them in their constructors.
Not all postgres hosted services use `postgres`
Also rename `database` config parameter to `vss_database`
This allows users to configure VSS-Server entirely through environment
variables, without a configuration file. We hence remove the requirement
that a path to a configuration file always be passed as an
argument.
If a file is passed as an argument, and it does not exist,
we now abort startup.
Also consolidate host and port settings into single socket address
setting.
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

Rebased and squashed with the new TomlConfig change, and the change noted in the last commit message:

If a file is passed as an argument, and it does not exist, we now abort startup.

@tnull
tnull merged commit 5d13e11 into lightningdevkit:mainJan 15, 2026
2 checks passed
@github-project-automationgithub-project-automationBot moved this from Goal: Merge to Done in Weekly GoalsJan 15, 2026
@tankyleo
tankyleo deleted the default-db-config branch January 26, 2026 19:51
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants

@tankyleo@ldk-reviews-bot@tnull
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add default database settting, and env var overrides by tankyleo · Pull Request #73 · lightningdevkit/vss-server · GitHub
Skip to content

Add default database settting, and env var overrides - #73

Merged
tnull merged 4 commits into
lightningdevkit:mainfrom
tankyleo:default-db-config
Jan 15, 2026
Merged

Add default database settting, and env var overrides#73
tnull merged 4 commits into
lightningdevkit:mainfrom
tankyleo:default-db-config

Conversation

@tankyleo

Copy link
Copy Markdown
Contributor

Based on #72

@ldk-reviews-bot

ldk-reviews-bot commented Dec 6, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@tnull
tnull requested review from tnull and removed request for benthecarman and tnullDecember 8, 2025 08:39
@tnull

tnull commented Dec 8, 2025

Copy link
Copy Markdown
Contributor

Now removed review request as this is currently blocked on #72. @tankyleo please feel free to re-request once #72 lands.

@tankyleotankyleo self-assigned this Dec 11, 2025
@tankyleotankyleo moved this to Goal: Merge in Weekly GoalsDec 11, 2025
@tankyleo
tankyleo requested a review from tnullDecember 18, 2025 03:05
@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 4th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 5th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 6th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 7th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 8th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs a rebase now that #72 landed.

@tankyleotankyleo mentioned this pull request Jan 7, 2026
@tankyleo
tankyleo requested a review from tnullJanuary 10, 2026 00:08
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

This needs a rebase now that #72 landed.

5f38982 was already based on the latest main, but made a quick post-holiday pass and touched up a few nits. Should be good for review now.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally looks good, some minor comments.

Comment threadrust/server/vss-server-config.toml Outdated
host = "localhost"
port = 5432
database = "postgres"
default_database = "postgres"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might make sense to add comment here to specify that this will only be used for the initial connection. Otherwise it could be confusing why the user needs to specify two separate databases.


format!("postgresql://{}:{}@{}:{}", username, password, self.host, self.port)
}
pub(crate) struct Configuration {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So now we have ConfigandConfiguration? That seems rather confusing. Can they be merged, or at least one renamed appropriately to better distinguish their intended use?

Comment threadrust/server/src/util/config.rs Outdated
toml::from_str(&config_file)
.map_err(|e| format!("Failed to parse configuration file: {}", e))?;

macro_rules! read_env {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need macros for this? Maybe we can inline these or make them methods?

@tankyleo
tankyleo requested a review from tnullJanuary 14, 2026 00:40
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

Thanks tnull addressed your comments let me know if I can rebase

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks tnull addressed your comments let me know if I can rebase

Please go ahead and squash & rebase. While you're at it, you might address the one nit below.

Comment threadrust/server/src/util/config.rs Outdated
// environment variable.
#[derive(Deserialize, Default)]
struct Config {
struct TomlConfigTable {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: When you squash, can we drop the Table here?

Allow only a subset of `JwtAuthConfig` fields to be set in config file,
as we allow any members of the configuration tables to not be set in
the file, and instead be set by the corresponding environment variable.
...just like we do for the RSA public key used to authenticate incoming
JWTs.
Also parse the root certificate in `PostgresTlsBackend::new`. This makes
`PostgresTlsBackend` consistent with `JWTAuthorizer`; both structs take
cryptographic objects as `&str`'s and parse them in their constructors.
Not all postgres hosted services use `postgres`
Also rename `database` config parameter to `vss_database`
This allows users to configure VSS-Server entirely through environment
variables, without a configuration file. We hence remove the requirement
that a path to a configuration file always be passed as an
argument.
If a file is passed as an argument, and it does not exist,
we now abort startup.
Also consolidate host and port settings into single socket address
setting.
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

Rebased and squashed with the new TomlConfig change, and the change noted in the last commit message:

If a file is passed as an argument, and it does not exist, we now abort startup.

@tnull
tnull merged commit 5d13e11 into lightningdevkit:mainJan 15, 2026
2 checks passed
@github-project-automationgithub-project-automationBot moved this from Goal: Merge to Done in Weekly GoalsJan 15, 2026
@tankyleo
tankyleo deleted the default-db-config branch January 26, 2026 19:51
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants

@tankyleo@ldk-reviews-bot@tnull
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Add default database settting, and env var overrides by tankyleo · Pull Request #73 · lightningdevkit/vss-server · GitHub
Skip to content

Add default database settting, and env var overrides - #73

Merged
tnull merged 4 commits into
lightningdevkit:mainfrom
tankyleo:default-db-config
Jan 15, 2026
Merged

Add default database settting, and env var overrides#73
tnull merged 4 commits into
lightningdevkit:mainfrom
tankyleo:default-db-config

Conversation

@tankyleo

Copy link
Copy Markdown
Contributor

Based on #72

@ldk-reviews-bot

ldk-reviews-bot commented Dec 6, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@tnull
tnull requested review from tnull and removed request for benthecarman and tnullDecember 8, 2025 08:39
@tnull

tnull commented Dec 8, 2025

Copy link
Copy Markdown
Contributor

Now removed review request as this is currently blocked on #72. @tankyleo please feel free to re-request once #72 lands.

@tankyleotankyleo self-assigned this Dec 11, 2025
@tankyleotankyleo moved this to Goal: Merge in Weekly GoalsDec 11, 2025
@tankyleo
tankyleo requested a review from tnullDecember 18, 2025 03:05
@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 4th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 5th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 6th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 7th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 8th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs a rebase now that #72 landed.

@tankyleotankyleo mentioned this pull request Jan 7, 2026
@tankyleo
tankyleo requested a review from tnullJanuary 10, 2026 00:08
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

This needs a rebase now that #72 landed.

5f38982 was already based on the latest main, but made a quick post-holiday pass and touched up a few nits. Should be good for review now.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally looks good, some minor comments.

Comment threadrust/server/vss-server-config.toml Outdated
host = "localhost"
port = 5432
database = "postgres"
default_database = "postgres"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might make sense to add comment here to specify that this will only be used for the initial connection. Otherwise it could be confusing why the user needs to specify two separate databases.


format!("postgresql://{}:{}@{}:{}", username, password, self.host, self.port)
}
pub(crate) struct Configuration {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So now we have ConfigandConfiguration? That seems rather confusing. Can they be merged, or at least one renamed appropriately to better distinguish their intended use?

Comment threadrust/server/src/util/config.rs Outdated
toml::from_str(&config_file)
.map_err(|e| format!("Failed to parse configuration file: {}", e))?;

macro_rules! read_env {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need macros for this? Maybe we can inline these or make them methods?

@tankyleo
tankyleo requested a review from tnullJanuary 14, 2026 00:40
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

Thanks tnull addressed your comments let me know if I can rebase

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks tnull addressed your comments let me know if I can rebase

Please go ahead and squash & rebase. While you're at it, you might address the one nit below.

Comment threadrust/server/src/util/config.rs Outdated
// environment variable.
#[derive(Deserialize, Default)]
struct Config {
struct TomlConfigTable {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: When you squash, can we drop the Table here?

Allow only a subset of `JwtAuthConfig` fields to be set in config file,
as we allow any members of the configuration tables to not be set in
the file, and instead be set by the corresponding environment variable.
...just like we do for the RSA public key used to authenticate incoming
JWTs.
Also parse the root certificate in `PostgresTlsBackend::new`. This makes
`PostgresTlsBackend` consistent with `JWTAuthorizer`; both structs take
cryptographic objects as `&str`'s and parse them in their constructors.
Not all postgres hosted services use `postgres`
Also rename `database` config parameter to `vss_database`
This allows users to configure VSS-Server entirely through environment
variables, without a configuration file. We hence remove the requirement
that a path to a configuration file always be passed as an
argument.
If a file is passed as an argument, and it does not exist,
we now abort startup.
Also consolidate host and port settings into single socket address
setting.
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

Rebased and squashed with the new TomlConfig change, and the change noted in the last commit message:

If a file is passed as an argument, and it does not exist, we now abort startup.

@tnull
tnull merged commit 5d13e11 into lightningdevkit:mainJan 15, 2026
2 checks passed
@github-project-automationgithub-project-automationBot moved this from Goal: Merge to Done in Weekly GoalsJan 15, 2026
@tankyleo
tankyleo deleted the default-db-config branch January 26, 2026 19:51
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants

@tankyleo@ldk-reviews-bot@tnull
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add default database settting, and env var overrides by tankyleo · Pull Request #73 · lightningdevkit/vss-server · GitHub
Skip to content

Add default database settting, and env var overrides - #73

Merged
tnull merged 4 commits into
lightningdevkit:mainfrom
tankyleo:default-db-config
Jan 15, 2026
Merged

Add default database settting, and env var overrides#73
tnull merged 4 commits into
lightningdevkit:mainfrom
tankyleo:default-db-config

Conversation

@tankyleo

Copy link
Copy Markdown
Contributor

Based on #72

@ldk-reviews-bot

ldk-reviews-bot commented Dec 6, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@tnull
tnull requested review from tnull and removed request for benthecarman and tnullDecember 8, 2025 08:39
@tnull

tnull commented Dec 8, 2025

Copy link
Copy Markdown
Contributor

Now removed review request as this is currently blocked on #72. @tankyleo please feel free to re-request once #72 lands.

@tankyleotankyleo self-assigned this Dec 11, 2025
@tankyleotankyleo moved this to Goal: Merge in Weekly GoalsDec 11, 2025
@tankyleo
tankyleo requested a review from tnullDecember 18, 2025 03:05
@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 4th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 5th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 6th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 7th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 8th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs a rebase now that #72 landed.

@tankyleotankyleo mentioned this pull request Jan 7, 2026
@tankyleo
tankyleo requested a review from tnullJanuary 10, 2026 00:08
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

This needs a rebase now that #72 landed.

5f38982 was already based on the latest main, but made a quick post-holiday pass and touched up a few nits. Should be good for review now.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally looks good, some minor comments.

Comment threadrust/server/vss-server-config.toml Outdated
host = "localhost"
port = 5432
database = "postgres"
default_database = "postgres"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might make sense to add comment here to specify that this will only be used for the initial connection. Otherwise it could be confusing why the user needs to specify two separate databases.


format!("postgresql://{}:{}@{}:{}", username, password, self.host, self.port)
}
pub(crate) struct Configuration {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So now we have ConfigandConfiguration? That seems rather confusing. Can they be merged, or at least one renamed appropriately to better distinguish their intended use?

Comment threadrust/server/src/util/config.rs Outdated
toml::from_str(&config_file)
.map_err(|e| format!("Failed to parse configuration file: {}", e))?;

macro_rules! read_env {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need macros for this? Maybe we can inline these or make them methods?

@tankyleo
tankyleo requested a review from tnullJanuary 14, 2026 00:40
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

Thanks tnull addressed your comments let me know if I can rebase

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks tnull addressed your comments let me know if I can rebase

Please go ahead and squash & rebase. While you're at it, you might address the one nit below.

Comment threadrust/server/src/util/config.rs Outdated
// environment variable.
#[derive(Deserialize, Default)]
struct Config {
struct TomlConfigTable {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: When you squash, can we drop the Table here?

Allow only a subset of `JwtAuthConfig` fields to be set in config file,
as we allow any members of the configuration tables to not be set in
the file, and instead be set by the corresponding environment variable.
...just like we do for the RSA public key used to authenticate incoming
JWTs.
Also parse the root certificate in `PostgresTlsBackend::new`. This makes
`PostgresTlsBackend` consistent with `JWTAuthorizer`; both structs take
cryptographic objects as `&str`'s and parse them in their constructors.
Not all postgres hosted services use `postgres`
Also rename `database` config parameter to `vss_database`
This allows users to configure VSS-Server entirely through environment
variables, without a configuration file. We hence remove the requirement
that a path to a configuration file always be passed as an
argument.
If a file is passed as an argument, and it does not exist,
we now abort startup.
Also consolidate host and port settings into single socket address
setting.
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

Rebased and squashed with the new TomlConfig change, and the change noted in the last commit message:

If a file is passed as an argument, and it does not exist, we now abort startup.

@tnull
tnull merged commit 5d13e11 into lightningdevkit:mainJan 15, 2026
2 checks passed
@github-project-automationgithub-project-automationBot moved this from Goal: Merge to Done in Weekly GoalsJan 15, 2026
@tankyleo
tankyleo deleted the default-db-config branch January 26, 2026 19:51
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants

@tankyleo@ldk-reviews-bot@tnull
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add default database settting, and env var overrides by tankyleo · Pull Request #73 · lightningdevkit/vss-server · GitHub
Skip to content

Add default database settting, and env var overrides - #73

Merged
tnull merged 4 commits into
lightningdevkit:mainfrom
tankyleo:default-db-config
Jan 15, 2026
Merged

Add default database settting, and env var overrides#73
tnull merged 4 commits into
lightningdevkit:mainfrom
tankyleo:default-db-config

Conversation

@tankyleo

Copy link
Copy Markdown
Contributor

Based on #72

@ldk-reviews-bot

ldk-reviews-bot commented Dec 6, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@tnull
tnull requested review from tnull and removed request for benthecarman and tnullDecember 8, 2025 08:39
@tnull

tnull commented Dec 8, 2025

Copy link
Copy Markdown
Contributor

Now removed review request as this is currently blocked on #72. @tankyleo please feel free to re-request once #72 lands.

@tankyleotankyleo self-assigned this Dec 11, 2025
@tankyleotankyleo moved this to Goal: Merge in Weekly GoalsDec 11, 2025
@tankyleo
tankyleo requested a review from tnullDecember 18, 2025 03:05
@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 4th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 5th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 6th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 7th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 8th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs a rebase now that #72 landed.

@tankyleotankyleo mentioned this pull request Jan 7, 2026
@tankyleo
tankyleo requested a review from tnullJanuary 10, 2026 00:08
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

This needs a rebase now that #72 landed.

5f38982 was already based on the latest main, but made a quick post-holiday pass and touched up a few nits. Should be good for review now.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally looks good, some minor comments.

Comment threadrust/server/vss-server-config.toml Outdated
host = "localhost"
port = 5432
database = "postgres"
default_database = "postgres"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might make sense to add comment here to specify that this will only be used for the initial connection. Otherwise it could be confusing why the user needs to specify two separate databases.


format!("postgresql://{}:{}@{}:{}", username, password, self.host, self.port)
}
pub(crate) struct Configuration {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So now we have ConfigandConfiguration? That seems rather confusing. Can they be merged, or at least one renamed appropriately to better distinguish their intended use?

Comment threadrust/server/src/util/config.rs Outdated
toml::from_str(&config_file)
.map_err(|e| format!("Failed to parse configuration file: {}", e))?;

macro_rules! read_env {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need macros for this? Maybe we can inline these or make them methods?

@tankyleo
tankyleo requested a review from tnullJanuary 14, 2026 00:40
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

Thanks tnull addressed your comments let me know if I can rebase

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks tnull addressed your comments let me know if I can rebase

Please go ahead and squash & rebase. While you're at it, you might address the one nit below.

Comment threadrust/server/src/util/config.rs Outdated
// environment variable.
#[derive(Deserialize, Default)]
struct Config {
struct TomlConfigTable {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: When you squash, can we drop the Table here?

Allow only a subset of `JwtAuthConfig` fields to be set in config file,
as we allow any members of the configuration tables to not be set in
the file, and instead be set by the corresponding environment variable.
...just like we do for the RSA public key used to authenticate incoming
JWTs.
Also parse the root certificate in `PostgresTlsBackend::new`. This makes
`PostgresTlsBackend` consistent with `JWTAuthorizer`; both structs take
cryptographic objects as `&str`'s and parse them in their constructors.
Not all postgres hosted services use `postgres`
Also rename `database` config parameter to `vss_database`
This allows users to configure VSS-Server entirely through environment
variables, without a configuration file. We hence remove the requirement
that a path to a configuration file always be passed as an
argument.
If a file is passed as an argument, and it does not exist,
we now abort startup.
Also consolidate host and port settings into single socket address
setting.
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

Rebased and squashed with the new TomlConfig change, and the change noted in the last commit message:

If a file is passed as an argument, and it does not exist, we now abort startup.

@tnull
tnull merged commit 5d13e11 into lightningdevkit:mainJan 15, 2026
2 checks passed
@github-project-automationgithub-project-automationBot moved this from Goal: Merge to Done in Weekly GoalsJan 15, 2026
@tankyleo
tankyleo deleted the default-db-config branch January 26, 2026 19:51
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants

@tankyleo@ldk-reviews-bot@tnull
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Add default database settting, and env var overrides by tankyleo · Pull Request #73 · lightningdevkit/vss-server · GitHub
Skip to content

Add default database settting, and env var overrides - #73

Merged
tnull merged 4 commits into
lightningdevkit:mainfrom
tankyleo:default-db-config
Jan 15, 2026
Merged

Add default database settting, and env var overrides#73
tnull merged 4 commits into
lightningdevkit:mainfrom
tankyleo:default-db-config

Conversation

@tankyleo

Copy link
Copy Markdown
Contributor

Based on #72

@ldk-reviews-bot

ldk-reviews-bot commented Dec 6, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@tnull
tnull requested review from tnull and removed request for benthecarman and tnullDecember 8, 2025 08:39
@tnull

tnull commented Dec 8, 2025

Copy link
Copy Markdown
Contributor

Now removed review request as this is currently blocked on #72. @tankyleo please feel free to re-request once #72 lands.

@tankyleotankyleo self-assigned this Dec 11, 2025
@tankyleotankyleo moved this to Goal: Merge in Weekly GoalsDec 11, 2025
@tankyleo
tankyleo requested a review from tnullDecember 18, 2025 03:05
@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 4th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 5th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 6th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 7th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 8th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs a rebase now that #72 landed.

@tankyleotankyleo mentioned this pull request Jan 7, 2026
@tankyleo
tankyleo requested a review from tnullJanuary 10, 2026 00:08
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

This needs a rebase now that #72 landed.

5f38982 was already based on the latest main, but made a quick post-holiday pass and touched up a few nits. Should be good for review now.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally looks good, some minor comments.

Comment threadrust/server/vss-server-config.toml Outdated
host = "localhost"
port = 5432
database = "postgres"
default_database = "postgres"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might make sense to add comment here to specify that this will only be used for the initial connection. Otherwise it could be confusing why the user needs to specify two separate databases.


format!("postgresql://{}:{}@{}:{}", username, password, self.host, self.port)
}
pub(crate) struct Configuration {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So now we have ConfigandConfiguration? That seems rather confusing. Can they be merged, or at least one renamed appropriately to better distinguish their intended use?

Comment threadrust/server/src/util/config.rs Outdated
toml::from_str(&config_file)
.map_err(|e| format!("Failed to parse configuration file: {}", e))?;

macro_rules! read_env {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need macros for this? Maybe we can inline these or make them methods?

@tankyleo
tankyleo requested a review from tnullJanuary 14, 2026 00:40
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

Thanks tnull addressed your comments let me know if I can rebase

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks tnull addressed your comments let me know if I can rebase

Please go ahead and squash & rebase. While you're at it, you might address the one nit below.

Comment threadrust/server/src/util/config.rs Outdated
// environment variable.
#[derive(Deserialize, Default)]
struct Config {
struct TomlConfigTable {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: When you squash, can we drop the Table here?

Allow only a subset of `JwtAuthConfig` fields to be set in config file,
as we allow any members of the configuration tables to not be set in
the file, and instead be set by the corresponding environment variable.
...just like we do for the RSA public key used to authenticate incoming
JWTs.
Also parse the root certificate in `PostgresTlsBackend::new`. This makes
`PostgresTlsBackend` consistent with `JWTAuthorizer`; both structs take
cryptographic objects as `&str`'s and parse them in their constructors.
Not all postgres hosted services use `postgres`
Also rename `database` config parameter to `vss_database`
This allows users to configure VSS-Server entirely through environment
variables, without a configuration file. We hence remove the requirement
that a path to a configuration file always be passed as an
argument.
If a file is passed as an argument, and it does not exist,
we now abort startup.
Also consolidate host and port settings into single socket address
setting.
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

Rebased and squashed with the new TomlConfig change, and the change noted in the last commit message:

If a file is passed as an argument, and it does not exist, we now abort startup.

@tnull
tnull merged commit 5d13e11 into lightningdevkit:mainJan 15, 2026
2 checks passed
@github-project-automationgithub-project-automationBot moved this from Goal: Merge to Done in Weekly GoalsJan 15, 2026
@tankyleo
tankyleo deleted the default-db-config branch January 26, 2026 19:51
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants

@tankyleo@ldk-reviews-bot@tnull