Template files moved to the directory with the names of software packages which they belong. The templates used function belong ().

client/domain/gdm/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!=&&pkg(gnome-base/gdm)!= append=skip

client/domain/gdm/Init/.calculate_directory

@@ -0,0 +1 @@
+# Calculate path=/etc/X11/gdm/Init

client/domain/gdm/custom.conf

@@ -0,0 +1,4 @@
+# Calculate format=kde path=/etc/X11/gdm
+
+[greeter]
+MinimalUID=1000

client/domain/glibc/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!= append=skip

client/domain/glibc/nsswitch.conf

@@ -1,7 +1,4 @@
-# Calculate format=ldap\
-append=replace\
-chmod=0644\
-chown=root:root
+# Calculate format=ldap append=replace chmod=0644 chown=root:root path=/etc
 passwd:      files ldap
 shadow:      files ldap
 group:       files ldap

client/domain/kdm/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!=&&pkg(kde-base/kdm)!= append=skip

client/domain/kdm/kdmrc

@@ -1,4 +1,4 @@
-# Calculate format=kde 
+# Calculate format=kde path=/usr/share/config/kdm 
 [X-*-Core]
 Setup=/usr/share/calculate-2.2/xdm/wait_domain
 [X-*-Greeter]

client/domain/nss_ldap/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!= append=skip

client/domain/nss_ldap/ldap.conf

@@ -1,4 +1,4 @@
-# Calculate format=ldap append=replace chmod=0644 chown=root:root
+# Calculate format=ldap append=replace chmod=0644 chown=root:root path=/etc
 host #-cl_remote_host-#
 base #-server(ldap.services_dn)-#
 rootbinddn #-server(unix.dn)-#

client/domain/openssh/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!= append=skip

client/domain/openssh/ssh_config

@@ -0,0 +1,2 @@
+# Calculate path=/etc/ssh
+StrictHostKeyChecking=no

client/domain/pambase/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!= append=skip

client/domain/pambase/system-auth

@@ -1,4 +1,4 @@
-# Calculate format=ldap append=replace chmod=0644 chown=root:root
+# Calculate format=ldap append=replace chmod=0644 chown=root:root path=/etc/pam.d
 auth       required     pam_env.so
 auth       optional     pam_keystore.so
 auth       sufficient   pam_unix.so use_first_pass

client/domain/xfdesktop/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!=&&pkg(xfce-base/xfdesktop)!= append=skip

client/domain/xfdesktop/kioskrc

@@ -0,0 +1,4 @@
+# Calculate format=samba path=/etc/xdg/xfce4/kiosk
+
+[xfce4-session]
+Shutdown=NONE

client/system/.calculate_directory

@@ -1 +0,0 @@
-# Calculate append=skip cl_pass_action==domain||cl_pass_action==undomain

client/system/domain/etc/X11/gdm/.calculate_directory

@@ -1,2 +0,0 @@
-# Calculate pkg(gnome-base/gdm)!=
-

client/system/domain/etc/X11/gdm/custom.conf

@@ -1,4 +0,0 @@
-# Calculate format=kde
-
-[greeter]
-MinimalUID=1000

client/system/domain/etc/ssh/ssh_config

@@ -1 +0,0 @@
-StrictHostKeyChecking=no

client/system/domain/etc/xdg/xfce4/.calculate_directory

@@ -1 +0,0 @@
-# Calculate pkg(xfce-base/xfdesktop)!=

client/system/domain/etc/xdg/xfce4/kiosk/kioskrc

@@ -1,4 +0,0 @@
-# Calculate format=samba pkg(xfce-base/xfdesktop)!=
-
-[xfce4-session]
-Shutdown=NONE

client/system/domain/usr/share/config/kdm/.calculate_directory

@@ -1,2 +0,0 @@
-# Calculate pkg(kde-base/kdm)!=
-

client/system/undomain/etc/X11/gdm/.calculate_directory

@@ -1,2 +0,0 @@
-# Calculate pkg(gnome-base/gdm)!=
-

client/system/undomain/etc/X11/gdm/custom.conf

@@ -1,4 +0,0 @@
-# Calculate format=kde
-
-[greeter]
-MinimalUID=999

client/system/undomain/etc/ssh/ssh_config

@@ -1 +0,0 @@
-StrictHostKeyChecking=no

client/system/undomain/etc/xdg/xfce4/.calculate_directory

@@ -1 +0,0 @@
-# Calculate pkg(xfce-base/xfdesktop)!=

client/system/undomain/etc/xdg/xfce4/kiosk/kioskrc

@@ -1,4 +0,0 @@
-# Calculate format=samba pkg(xfce-base/xfdesktop)!=
-
-[xfce4-session]
-!Shutdown=

client/undomain/gdm/.calculate_directory

@@ -0,0 +1,2 @@
+# Calculate belong()!=&&pkg(gnome-base/gdm)!= append=skip
+

client/undomain/gdm/Init/.calculate_directory

@@ -0,0 +1 @@
+# Calculate path=/etc/X11/gdm/Init

client/undomain/gdm/custom.conf

@@ -0,0 +1,4 @@
+# Calculate format=kde path=/etc/X11/gdm
+
+[greeter]
+MinimalUID=999

client/undomain/glibs/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!= append=skip

client/undomain/glibs/nsswitch.conf

@@ -1,4 +1,4 @@
-# Calculate format=ldap append=replace chmod=0644 chown=root:root
+# Calculate format=ldap append=replace chmod=0644 chown=root:root path=/etc
 passwd:      compat
 shadow:      compat
 group:       compat

client/undomain/kdm/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!=&&pkg(kde-base/kdm)!= append=skip

client/undomain/kdm/kdmrc

@@ -1,4 +1,4 @@
-# Calculate format=kde pkg(kde-base/kdm)!=
+# Calculate format=kde pkg(kde-base/kdm)!= path=/usr/share/config/kdm
 [X-*-Core]
 Setup=/usr/share/config/kdm/Xsetup
 [X-*-Greeter]

client/undomain/nss_ldap/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!= append=skip

client/undomain/nss_ldap/ldap.conf

@@ -1,2 +1,2 @@
-# Calculate format=ldap append=replace chmod=0644 chown=root:root
+# Calculate format=ldap append=replace chmod=0644 chown=root:root path=/etc
 

client/undomain/openssh/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!= append=skip

client/undomain/openssh/ssh_config

@@ -0,0 +1,2 @@
+# Calculate path=/etc/ssh
+StrictHostKeyChecking=no

client/undomain/pambase/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!= append=skip

client/undomain/pambase/system-auth

@@ -1,4 +1,4 @@
-# Calculate format=ldap append=replace chmod=0644 chown=root:root
+# Calculate format=ldap append=replace chmod=0644 chown=root:root path=/etc/pam.d
 auth       required     pam_env.so
 auth       sufficient   pam_unix.so
 auth       required     pam_deny.so

client/undomain/xfdesktop/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!=&&pkg(xfce-base/xfdesktop)!= append=skip

client/undomain/xfdesktop/kioskrc

@@ -0,0 +1,4 @@
+# Calculate format=samba path=/etc/xdg/xfce4/kiosk
+
+[xfce4-session]
+!Shutdown=

pym/cl_client.py

@@ -1460,6 +1460,8 @@ class client(share, commandServer, encrypt):
                 return False
             if not self.mountRemote():
                 return False
+            # Записываем действие, введен в домен
+            self.clVars.Write("cl_pass_action", "domain", True)
             self.printOK(_("To be used domain profile") + " ...")
         else:
             self.printOK(_("To be used local profile") + " ...")
@@ -1492,6 +1494,8 @@ class client(share, commandServer, encrypt):
             return False
         if not self.delDaemonAutostart("client"):
             return False
+        # Записываем действие, выведен из домена
+        self.clVars.Write("cl_pass_action", "undomain", True)
         self.printOK(_("Apply uninstall templates"))
         return True
 
@@ -1544,6 +1548,8 @@ class client(share, commandServer, encrypt):
         self.printSUCCESS(_("Apply undomain templates"))
         if not self.delDaemonAutostart("client"):
             return False
+        # Записываем действие, введен в домен
+        self.clVars.Write("cl_pass_action", "undomain", True)
         self.printOK(_("Computer removed from domain %s")%domain + " ...")
         return True
 
@@ -1698,13 +1704,9 @@ class client(share, commandServer, encrypt):
                 return False
             self.printSUCCESS(_("Mount") + " " + str(pathHome) + " " +\
                                     " ...")
-        #servDn = self.clVars.Get("ld_services_dn")
         servDn = self.getInfoService("ldap", "services_dn")
-        #unixDn = self.clVars.Get("ld_unix_dn")
         unixDn = self.getInfoService("unix", "dn")
-        # bindDn = self.clVars.Get("ld_bind_dn")
         bindDn = self.getInfoService("unix", "bind_dn")
-        #bindPw = self.clVars.Get("ld_bind_pw")
         bindPw = self.getInfoService("unix", "bind_pw")
         # запишем их
         if not (servDn and unixDn and bindDn and bindPw):
@@ -1728,6 +1730,8 @@ class client(share, commandServer, encrypt):
         # Записываем текущую версию программы
         currentVersion = self.clVars.Get("cl_ver")
         self.clVars.Write("os_remote_client", currentVersion, True)
+        # Записываем действие, введен в домен
+        self.clVars.Write("cl_pass_action", "domain", True)
         self.printOK(_("Computer added to domain %s")%domain + " ...")
         return True
 

pym/cl_vars_client.py

@@ -81,4 +81,7 @@ class Data:
     cl_sync_del_path = {'value':[".kde4/share/config/phonondevicesrc",
                                  ".kde4/cache-*", ".kde4/tmp-*"]}
 
+    # Дествие программы - domain,undomain
+    cl_pass_action = {}
+