svn commit: samba r25947 - in branches/4.0-python: .
source/scripting/python/samba
jelmer at samba.org
jelmer at samba.org
Wed Nov 14 03:10:04 GMT 2007
Author: jelmer
Date: 2007-11-14 03:10:03 +0000 (Wed, 14 Nov 2007)
New Revision: 25947
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25947
Log:
Fix provisioning, update ignore file.
Modified:
branches/4.0-python/
branches/4.0-python/.bzrignore
branches/4.0-python/source/scripting/python/samba/provision.py
Changeset:
Property changes on: branches/4.0-python
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/4.0-python/.bzrignore
===================================================================
--- branches/4.0-python/.bzrignore 2007-11-14 02:46:10 UTC (rev 25946)
+++ branches/4.0-python/.bzrignore 2007-11-14 03:10:03 UTC (rev 25947)
@@ -219,3 +219,4 @@
*.po
libtdb.so.*
libtalloc.so.*
+source/lib/registry/tests/proto.h
Modified: branches/4.0-python/source/scripting/python/samba/provision.py
===================================================================
--- branches/4.0-python/source/scripting/python/samba/provision.py 2007-11-14 02:46:10 UTC (rev 25946)
+++ branches/4.0-python/source/scripting/python/samba/provision.py 2007-11-14 03:10:03 UTC (rev 25947)
@@ -47,6 +47,7 @@
self.configdn_ldb = None
self.schemedn = None
self.schemedn_ldb = None
+ self.s4_ldapi_path = None
def subst_vars(self):
return {"SCHEMADN": self.schemadn,
@@ -123,6 +124,7 @@
self.ldap_basedn_ldif = None
self.ldap_config_basedn_ldif = None
self.ldap_schema_basedn_ldif = None
+ self.s4_ldapi_path = None
#
# return True if the current install seems to be OK
@@ -358,7 +360,7 @@
paths.ldap_basedn_ldif = os.path.join(private_dir, subobj.dnsdomain + ".ldif")
paths.ldap_config_basedn_ldif = os.path.join(private_dir, subobj.dnsdomain + "-config.ldif")
paths.ldap_schema_basedn_ldif = os.path.join(private_dir, subobj.dnsdomain + "-schema.ldif")
- paths.s4_ldapi_socket = os.path.join(private_dir, "ldapi")
+ paths.s4_ldapi_path = os.path.join(private_dir, "ldapi")
paths.phpldapadminconfig = os.path.join(private_dir, "phpldapadmin-config.php")
return paths
@@ -597,9 +599,9 @@
samdb.transaction_commit()
- message("Setting up phpLDAPadmin configuration")
- setup_file(setup_dir, "phpldapadmin-config.php", message, paths.phpldapadminconfig, subobj)
- message("Please install the phpLDAPadmin configuration located at " + paths.phpldapadminconfig + " into /etc/phpldapadmin/config.php")
+ message("Setting up phpLDAPadmin configuration")
+ setup_file(setup_dir, "phpldapadmin-config.php", message, paths.phpldapadminconfig, subobj)
+ message("Please install the phpLDAPadmin configuration located at " + paths.phpldapadminconfig + " into /etc/phpldapadmin/config.php")
# Write out a DNS zone file, from the info in the current database
More information about the samba-cvs
mailing list