alexz/runtipi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nas-samba v2.0.0: persist Samba TDB, fix startup user migration

Browse Source
This commit is contained in:
Alex Zaw
2026-04-26 05:54:55 +00:00
parent b1697d6e1e
commit 6599fc5a21
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/nas-samba/docker-compose.json
View File

@@ -14,7 +14,8 @@
], ],
"volumes": [ "volumes": [
{ "hostPath": "${NAS_PATH:-/nas}", "containerPath": "/nas" }, { "hostPath": "${NAS_PATH:-/nas}", "containerPath": "/nas" },
{ "hostPath": "${APP_DATA_DIR}/data/config", "containerPath": "/config" } { "hostPath": "${APP_DATA_DIR}/data/config", "containerPath": "/config" },
{ "hostPath": "${APP_DATA_DIR}/data/samba", "containerPath": "/var/lib/samba" }
], ],
"environment": [ "environment": [
{ "key": "SMB_PASSWORD", "value": "${SMB_PASSWORD}" }, { "key": "SMB_PASSWORD", "value": "${SMB_PASSWORD}" },

16
apps/nas-samba/source/app/server.js
View File

@@ -1675,12 +1675,24 @@ function main() {
// Seed admin // Seed admin
seedAdmin(); seedAdmin();
// Ensure existing users have home directories (migration support) // Re-create Linux users and ensure Samba accounts on every startup
const existingUsers = sqlDb.prepare('SELECT username FROM users').all(); const existingUsers = sqlDb.prepare('SELECT username FROM users').all();
for (const u of existingUsers) { for (const u of existingUsers) {
const homeDir = path.join(HOME_BASE, u.username); const homeDir = path.join(HOME_BASE, u.username);
if (!fs.existsSync(homeDir)) {
fs.mkdirSync(homeDir, { recursive: true }); fs.mkdirSync(homeDir, { recursive: true });
try {
execSync(`id -u "${u.username}" >/dev/null 2>&1 || useradd -M -s /usr/sbin/nologin "${u.username}"`);
execSync(`chown "${u.username}":nogroup "${homeDir}"`);
// Set Samba password only if user not already in TDB (first run or migration)
try {
execSync(`pdbedit -u "${u.username}" >/dev/null 2>&1`);
} catch (_e) {
const escaped = ADMIN_PASSWORD.replace(/'/g, "'\\''");
execSync(`printf '%s\\n%s\\n' '${escaped}' '${escaped}' | smbpasswd -a -s "${u.username}"`);
console.log(`Samba account created for ${u.username} (using SMB_PASSWORD)`);
}
} catch (err) {
console.error(`Failed to ensure system user ${u.username}:`, err.message);
} }
} }