Skip to content

Fix global settings save failure in dev mode #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lyarinet merged 1 commit into from
Jan 22, 2026
Merged

Fix global settings save failure in dev mode #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 22 additions & 13 deletions app/samba_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,13 +566,25 @@ def write_global_settings(settings):

# Validate the configuration
if DEV_MODE:
# In dev mode, validate the local config
validate_cmd = subprocess.run(
["testparm", "-s", SMB_CONF],
capture_output=True,
text=True,
check=False,
# In dev mode, check if testparm is available
testparm_check = subprocess.run(
["which", "testparm"], capture_output=True, text=True, check=False
)
if testparm_check.returncode == 0:
# testparm is available, validate the local config
validate_cmd = subprocess.run(
["testparm", "-s", SMB_CONF],
capture_output=True,
text=True,
check=False,
)
if validate_cmd.returncode != 0:
# If validation fails, restore the backup
subprocess.run(["cp", backup_path, SMB_CONF], check=False)
print(f"Invalid configuration: {validate_cmd.stderr}")
return False
else:
print("testparm not available, skipping configuration validation in dev mode")
else:
# In production mode, validate the system config
validate_cmd = subprocess.run(
Expand All @@ -582,16 +594,13 @@ def write_global_settings(settings):
check=False,
)

if validate_cmd.returncode != 0:
# If validation fails, restore the backup
if DEV_MODE:
subprocess.run(["cp", backup_path, SMB_CONF], check=False)
else:
if validate_cmd.returncode != 0:
# If validation fails, restore the backup
subprocess.run(
["sudo", "cp", backup_path, "/etc/samba/smb.conf"], check=False
)
print(f"Invalid configuration: {validate_cmd.stderr}")
return False
print(f"Invalid configuration: {validate_cmd.stderr}")
return False

# Restart Samba services
if DEV_MODE:
Expand Down
Loading