studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify references to server_name

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-01-25 23:41:39 +00:00
parent 71a3855af6
commit 3e0ff2dc84
13 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/service/migrations.rs
View File

@@ -218,8 +218,6 @@ async fn migrate(services: &Services) -> Result<()> {
}
async fn db_lt_12(services: &Services) -> Result<()> {
let config = &services.server.config;
for username in &services
.users
.list_local_users()
@@ -227,7 +225,8 @@ async fn db_lt_12(services: &Services) -> Result<()> {
.collect::<Vec<_>>()
.await
{
let user = match UserId::parse_with_server_name(username.as_str(), &config.server_name) {
let user = match UserId::parse_with_server_name(username.as_str(), &services.server.name)
{
| Ok(u) => u,
| Err(e) => {
warn!("Invalid username {username}: {e}");
@@ -297,8 +296,6 @@ async fn db_lt_12(services: &Services) -> Result<()> {
}
async fn db_lt_13(services: &Services) -> Result<()> {
let config = &services.server.config;
for username in &services
.users
.list_local_users()
@@ -306,7 +303,8 @@ async fn db_lt_13(services: &Services) -> Result<()> {
.collect::<Vec<_>>()
.await
{
let user = match UserId::parse_with_server_name(username.as_str(), &config.server_name) {
let user = match UserId::parse_with_server_name(username.as_str(), &services.server.name)
{
| Ok(u) => u,
| Err(e) => {
warn!("Invalid username {username}: {e}");