summaryrefslogtreecommitdiff
path: root/source4/scripting/python
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-07-12 13:04:08 +0200
committerStefan Metzmacher <metze@samba.org>2011-07-12 14:58:34 +0200
commitc0eb56d1599fee0f0f5cf757b5381f56e04b74c1 (patch)
treec5e8dab9b820a775c3463075c7142802f4c677e9 /source4/scripting/python
parent8a234cbe1589439497608d35f35768c6841750c9 (diff)
downloadsamba-c0eb56d1599fee0f0f5cf757b5381f56e04b74c1.tar.gz
samba-c0eb56d1599fee0f0f5cf757b5381f56e04b74c1.tar.bz2
samba-c0eb56d1599fee0f0f5cf757b5381f56e04b74c1.zip
s4:param: add "state dir" and "cache dir" options
metze
Diffstat (limited to 'source4/scripting/python')
-rw-r--r--source4/scripting/python/samba/provision/__init__.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 91c4ef7f80..b20e584776 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -714,11 +714,17 @@ def make_smbconf(smbconf, hostname, domain, realm, serverrole,
if targetdir is not None:
privatedir_line = "private dir = " + os.path.abspath(os.path.join(targetdir, "private"))
lockdir_line = "lock dir = " + os.path.abspath(targetdir)
+ statedir_line = "state dir = " + os.path.abspath(targetdir)
+ cachedir_line = "cache dir = " + os.path.abspath(targetdir)
lp.set("lock dir", os.path.abspath(targetdir))
+ lp.set("state dir", os.path.abspath(targetdir))
+ lp.set("cache dir", os.path.abspath(targetdir))
else:
privatedir_line = ""
lockdir_line = ""
+ statedir_line = ""
+ cachedir_line = ""
sysvol = os.path.join(lp.get("lock dir"), "sysvol")
netlogon = os.path.join(sysvol, realm.lower(), "scripts")
@@ -732,7 +738,9 @@ def make_smbconf(smbconf, hostname, domain, realm, serverrole,
"NETLOGONPATH": netlogon,
"SYSVOLPATH": sysvol,
"PRIVATEDIR_LINE": privatedir_line,
- "LOCKDIR_LINE": lockdir_line
+ "LOCKDIR_LINE": lockdir_line,
+ "STATEDIR_LINE": statedir_line,
+ "CACHEDIR_LINE": cachedir_line
})
# reload the smb.conf