[D-community-commits] r315 - in trunk/userdir-ldap: . debian

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2008-07-24 18:45:03 +0000 (Thu, 24 Jul 2008)
New Revision: 315

Modified:
   trunk/userdir-ldap/debian/ud-replicate.cron.d
   trunk/userdir-ldap/ud-useradd
Log:
* remove debian-private subscription
* comment cronjob by default


Modified: trunk/userdir-ldap/debian/ud-replicate.cron.d
===================================================================
--- trunk/userdir-ldap/debian/ud-replicate.cron.d	2008-07-24 16:52:32 UTC (rev 314)
+++ trunk/userdir-ldap/debian/ud-replicate.cron.d	2008-07-24 18:45:03 UTC (rev 315)
@@ -1,2 +1,2 @@
 # crontab for the replicate operation, 15 min cycle.
-10,25,40,55 * * * * root if [ -x /usr/bin/ud-replicate ]; then /usr/bin/ud-replicate; fi
+#10,25,40,55 * * * * root if [ -x /usr/bin/ud-replicate ]; then /usr/bin/ud-replicate; fi

Modified: trunk/userdir-ldap/ud-useradd
===================================================================
--- trunk/userdir-ldap/ud-useradd	2008-07-24 16:52:32 UTC (rev 314)
+++ trunk/userdir-ldap/ud-useradd	2008-07-24 18:45:03 UTC (rev 315)
@@ -119,7 +119,7 @@
          account = Res;
    Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=" + account);
    if len(Attrs) == 0:
-      privsub = "%s at debian.org"%(account);
+      privsub = "%s at debian-community.org"%(account);
       break;
    Res = raw_input("That account already exists, update [No/yes]? ");
    if Res == "yes":
@@ -153,9 +153,9 @@
    email = Res;
 
 # Debian-Private subscription
-Res = raw_input("Subscribe to debian-private (space is none) [" + privsub + "]? ");
-if Res != "":
-   privsub = Res;
+#Res = raw_input("Subscribe to debian-private (space is none) [" + privsub + "]? ");
+#if Res != "":
+#   privsub = Res;
 
 # GID
 Res = raw_input("Group ID Number [" + gidNumber + "]? ");
@@ -198,7 +198,7 @@
 print " %s <%s@%s>:" % (FullName,account,EmailAppend);
 print "   Assigned UID:",uidNumber," GID:", gidNumber;
 print "   Email forwarded to:",email;
-print "   Private Subscription:",privsub;
+#print "   Private Subscription:",privsub;
 print "   GECOS Field: \"%s,,,,\"" % (FullName);
 print "   Login Shell: /bin/bash";
 print "   Key Fingerprint:",Keys[0][1];
@@ -241,8 +241,8 @@
               ("userPassword","{crypt}"+Pass)];
    if mn:
       Details.append(("mn",mn));
-   if privsub != " ":
-      Details.append(("privateSub",privsub))
+#   if privsub != " ":
+#      Details.append(("privateSub",privsub))
    l.add_s(Dn,Details);
 else:
    # Modification
@@ -261,8 +261,8 @@
           (ldap.MOD_REPLACE,"shadowWarning","7"),
           (ldap.MOD_REPLACE,"shadowInactive",""),
           (ldap.MOD_REPLACE,"shadowExpire","")];
-   if privsub != " ":
-      Rec.append((ldap.MOD_REPLACE,"privateSub",privsub));
+#   if privsub != " ":
+#      Rec.append((ldap.MOD_REPLACE,"privateSub",privsub));
    if Pass != None:
       Rec.append((ldap.MOD_REPLACE,"userPassword","{crypt}"+Pass));
    # Do it