diff --git a/client/system/domain/.calculate_directory b/client/domain/.calculate_directory similarity index 100% rename from client/system/domain/.calculate_directory rename to client/domain/.calculate_directory diff --git a/client/domain/gdm/.calculate_directory b/client/domain/gdm/.calculate_directory new file mode 100644 index 0000000..256a736 --- /dev/null +++ b/client/domain/gdm/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!=&&pkg(gnome-base/gdm)!= append=skip \ No newline at end of file diff --git a/client/domain/gdm/Init/.calculate_directory b/client/domain/gdm/Init/.calculate_directory new file mode 100644 index 0000000..991347e --- /dev/null +++ b/client/domain/gdm/Init/.calculate_directory @@ -0,0 +1 @@ +# Calculate path=/etc/X11/gdm/Init \ No newline at end of file diff --git a/client/system/domain/etc/X11/gdm/Init/00Default b/client/domain/gdm/Init/00Default similarity index 100% rename from client/system/domain/etc/X11/gdm/Init/00Default rename to client/domain/gdm/Init/00Default diff --git a/client/system/domain/etc/X11/gdm/Init/05Default b/client/domain/gdm/Init/05Default similarity index 100% rename from client/system/domain/etc/X11/gdm/Init/05Default rename to client/domain/gdm/Init/05Default diff --git a/client/domain/gdm/custom.conf b/client/domain/gdm/custom.conf new file mode 100644 index 0000000..29af3c9 --- /dev/null +++ b/client/domain/gdm/custom.conf @@ -0,0 +1,4 @@ +# Calculate format=kde path=/etc/X11/gdm + +[greeter] +MinimalUID=1000 diff --git a/client/domain/glibc/.calculate_directory b/client/domain/glibc/.calculate_directory new file mode 100644 index 0000000..4be74c1 --- /dev/null +++ b/client/domain/glibc/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!= append=skip \ No newline at end of file diff --git a/client/system/domain/etc/nsswitch.conf b/client/domain/glibc/nsswitch.conf similarity index 80% rename from client/system/domain/etc/nsswitch.conf rename to client/domain/glibc/nsswitch.conf index 24cb3a8..a9f05a6 100644 --- a/client/system/domain/etc/nsswitch.conf +++ b/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 diff --git a/client/domain/kdm/.calculate_directory b/client/domain/kdm/.calculate_directory new file mode 100644 index 0000000..90c5ca4 --- /dev/null +++ b/client/domain/kdm/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!=&&pkg(kde-base/kdm)!= append=skip \ No newline at end of file diff --git a/client/system/domain/usr/share/config/kdm/kdmrc b/client/domain/kdm/kdmrc similarity index 63% rename from client/system/domain/usr/share/config/kdm/kdmrc rename to client/domain/kdm/kdmrc index 5ac69d1..b110557 100644 --- a/client/system/domain/usr/share/config/kdm/kdmrc +++ b/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] diff --git a/client/domain/nss_ldap/.calculate_directory b/client/domain/nss_ldap/.calculate_directory new file mode 100644 index 0000000..4be74c1 --- /dev/null +++ b/client/domain/nss_ldap/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!= append=skip \ No newline at end of file diff --git a/client/system/domain/etc/ldap.conf b/client/domain/nss_ldap/ldap.conf similarity index 97% rename from client/system/domain/etc/ldap.conf rename to client/domain/nss_ldap/ldap.conf index 3b53be2..a47e951 100644 --- a/client/system/domain/etc/ldap.conf +++ b/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)-# diff --git a/client/domain/openssh/.calculate_directory b/client/domain/openssh/.calculate_directory new file mode 100644 index 0000000..4be74c1 --- /dev/null +++ b/client/domain/openssh/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!= append=skip \ No newline at end of file diff --git a/client/domain/openssh/ssh_config b/client/domain/openssh/ssh_config new file mode 100644 index 0000000..a10a39b --- /dev/null +++ b/client/domain/openssh/ssh_config @@ -0,0 +1,2 @@ +# Calculate path=/etc/ssh +StrictHostKeyChecking=no diff --git a/client/domain/pambase/.calculate_directory b/client/domain/pambase/.calculate_directory new file mode 100644 index 0000000..4be74c1 --- /dev/null +++ b/client/domain/pambase/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!= append=skip \ No newline at end of file diff --git a/client/system/domain/etc/pam.d/system-auth b/client/domain/pambase/system-auth similarity index 97% rename from client/system/domain/etc/pam.d/system-auth rename to client/domain/pambase/system-auth index 432b76a..9464000 100644 --- a/client/system/domain/etc/pam.d/system-auth +++ b/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 diff --git a/client/domain/xfdesktop/.calculate_directory b/client/domain/xfdesktop/.calculate_directory new file mode 100644 index 0000000..67daf21 --- /dev/null +++ b/client/domain/xfdesktop/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!=&&pkg(xfce-base/xfdesktop)!= append=skip \ No newline at end of file diff --git a/client/domain/xfdesktop/kioskrc b/client/domain/xfdesktop/kioskrc new file mode 100644 index 0000000..37dc973 --- /dev/null +++ b/client/domain/xfdesktop/kioskrc @@ -0,0 +1,4 @@ +# Calculate format=samba path=/etc/xdg/xfce4/kiosk + +[xfce4-session] +Shutdown=NONE diff --git a/client/system/.calculate_directory b/client/system/.calculate_directory deleted file mode 100644 index c5bc990..0000000 --- a/client/system/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip cl_pass_action==domain||cl_pass_action==undomain diff --git a/client/system/domain/etc/X11/gdm/.calculate_directory b/client/system/domain/etc/X11/gdm/.calculate_directory deleted file mode 100644 index f7451de..0000000 --- a/client/system/domain/etc/X11/gdm/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate pkg(gnome-base/gdm)!= - diff --git a/client/system/domain/etc/X11/gdm/custom.conf b/client/system/domain/etc/X11/gdm/custom.conf deleted file mode 100644 index a8bd2a4..0000000 --- a/client/system/domain/etc/X11/gdm/custom.conf +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=kde - -[greeter] -MinimalUID=1000 diff --git a/client/system/domain/etc/ssh/ssh_config b/client/system/domain/etc/ssh/ssh_config deleted file mode 100644 index 6a5b447..0000000 --- a/client/system/domain/etc/ssh/ssh_config +++ /dev/null @@ -1 +0,0 @@ -StrictHostKeyChecking=no diff --git a/client/system/domain/etc/xdg/xfce4/.calculate_directory b/client/system/domain/etc/xdg/xfce4/.calculate_directory deleted file mode 100644 index 72846f4..0000000 --- a/client/system/domain/etc/xdg/xfce4/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate pkg(xfce-base/xfdesktop)!= diff --git a/client/system/domain/etc/xdg/xfce4/kiosk/kioskrc b/client/system/domain/etc/xdg/xfce4/kiosk/kioskrc deleted file mode 100644 index 0327515..0000000 --- a/client/system/domain/etc/xdg/xfce4/kiosk/kioskrc +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba pkg(xfce-base/xfdesktop)!= - -[xfce4-session] -Shutdown=NONE diff --git a/client/system/domain/usr/share/config/kdm/.calculate_directory b/client/system/domain/usr/share/config/kdm/.calculate_directory deleted file mode 100644 index e561c91..0000000 --- a/client/system/domain/usr/share/config/kdm/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate pkg(kde-base/kdm)!= - diff --git a/client/system/undomain/etc/X11/gdm/.calculate_directory b/client/system/undomain/etc/X11/gdm/.calculate_directory deleted file mode 100644 index f7451de..0000000 --- a/client/system/undomain/etc/X11/gdm/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate pkg(gnome-base/gdm)!= - diff --git a/client/system/undomain/etc/X11/gdm/custom.conf b/client/system/undomain/etc/X11/gdm/custom.conf deleted file mode 100644 index 0064ef9..0000000 --- a/client/system/undomain/etc/X11/gdm/custom.conf +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=kde - -[greeter] -MinimalUID=999 diff --git a/client/system/undomain/etc/ssh/ssh_config b/client/system/undomain/etc/ssh/ssh_config deleted file mode 100644 index 6a5b447..0000000 --- a/client/system/undomain/etc/ssh/ssh_config +++ /dev/null @@ -1 +0,0 @@ -StrictHostKeyChecking=no diff --git a/client/system/undomain/etc/xdg/xfce4/.calculate_directory b/client/system/undomain/etc/xdg/xfce4/.calculate_directory deleted file mode 100644 index 72846f4..0000000 --- a/client/system/undomain/etc/xdg/xfce4/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate pkg(xfce-base/xfdesktop)!= diff --git a/client/system/undomain/etc/xdg/xfce4/kiosk/kioskrc b/client/system/undomain/etc/xdg/xfce4/kiosk/kioskrc deleted file mode 100644 index 5f7ad2c..0000000 --- a/client/system/undomain/etc/xdg/xfce4/kiosk/kioskrc +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba pkg(xfce-base/xfdesktop)!= - -[xfce4-session] -!Shutdown= diff --git a/client/system/undomain/.calculate_directory b/client/undomain/.calculate_directory similarity index 100% rename from client/system/undomain/.calculate_directory rename to client/undomain/.calculate_directory diff --git a/client/undomain/gdm/.calculate_directory b/client/undomain/gdm/.calculate_directory new file mode 100644 index 0000000..eec4060 --- /dev/null +++ b/client/undomain/gdm/.calculate_directory @@ -0,0 +1,2 @@ +# Calculate belong()!=&&pkg(gnome-base/gdm)!= append=skip + diff --git a/client/undomain/gdm/Init/.calculate_directory b/client/undomain/gdm/Init/.calculate_directory new file mode 100644 index 0000000..991347e --- /dev/null +++ b/client/undomain/gdm/Init/.calculate_directory @@ -0,0 +1 @@ +# Calculate path=/etc/X11/gdm/Init \ No newline at end of file diff --git a/client/system/undomain/etc/X11/gdm/Init/00Default b/client/undomain/gdm/Init/00Default similarity index 100% rename from client/system/undomain/etc/X11/gdm/Init/00Default rename to client/undomain/gdm/Init/00Default diff --git a/client/system/undomain/etc/X11/gdm/Init/05Default b/client/undomain/gdm/Init/05Default similarity index 100% rename from client/system/undomain/etc/X11/gdm/Init/05Default rename to client/undomain/gdm/Init/05Default diff --git a/client/undomain/gdm/custom.conf b/client/undomain/gdm/custom.conf new file mode 100644 index 0000000..fc212f7 --- /dev/null +++ b/client/undomain/gdm/custom.conf @@ -0,0 +1,4 @@ +# Calculate format=kde path=/etc/X11/gdm + +[greeter] +MinimalUID=999 diff --git a/client/undomain/glibs/.calculate_directory b/client/undomain/glibs/.calculate_directory new file mode 100644 index 0000000..4be74c1 --- /dev/null +++ b/client/undomain/glibs/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!= append=skip \ No newline at end of file diff --git a/client/system/undomain/etc/nsswitch.conf b/client/undomain/glibs/nsswitch.conf similarity index 97% rename from client/system/undomain/etc/nsswitch.conf rename to client/undomain/glibs/nsswitch.conf index 20143d7..8abbbe5 100644 --- a/client/system/undomain/etc/nsswitch.conf +++ b/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 diff --git a/client/undomain/kdm/.calculate_directory b/client/undomain/kdm/.calculate_directory new file mode 100644 index 0000000..90c5ca4 --- /dev/null +++ b/client/undomain/kdm/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!=&&pkg(kde-base/kdm)!= append=skip \ No newline at end of file diff --git a/client/system/undomain/usr/share/config/kdm/kdmrc b/client/undomain/kdm/kdmrc similarity index 51% rename from client/system/undomain/usr/share/config/kdm/kdmrc rename to client/undomain/kdm/kdmrc index 4324baa..68ce652 100644 --- a/client/system/undomain/usr/share/config/kdm/kdmrc +++ b/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] diff --git a/client/undomain/nss_ldap/.calculate_directory b/client/undomain/nss_ldap/.calculate_directory new file mode 100644 index 0000000..4be74c1 --- /dev/null +++ b/client/undomain/nss_ldap/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!= append=skip \ No newline at end of file diff --git a/client/system/undomain/etc/ldap.conf b/client/undomain/nss_ldap/ldap.conf similarity index 84% rename from client/system/undomain/etc/ldap.conf rename to client/undomain/nss_ldap/ldap.conf index f25ea9b..f7c3d20 100644 --- a/client/system/undomain/etc/ldap.conf +++ b/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 diff --git a/client/undomain/openssh/.calculate_directory b/client/undomain/openssh/.calculate_directory new file mode 100644 index 0000000..4be74c1 --- /dev/null +++ b/client/undomain/openssh/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!= append=skip \ No newline at end of file diff --git a/client/undomain/openssh/ssh_config b/client/undomain/openssh/ssh_config new file mode 100644 index 0000000..a10a39b --- /dev/null +++ b/client/undomain/openssh/ssh_config @@ -0,0 +1,2 @@ +# Calculate path=/etc/ssh +StrictHostKeyChecking=no diff --git a/client/undomain/pambase/.calculate_directory b/client/undomain/pambase/.calculate_directory new file mode 100644 index 0000000..4be74c1 --- /dev/null +++ b/client/undomain/pambase/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!= append=skip \ No newline at end of file diff --git a/client/system/undomain/etc/pam.d/system-auth b/client/undomain/pambase/system-auth similarity index 96% rename from client/system/undomain/etc/pam.d/system-auth rename to client/undomain/pambase/system-auth index fcdc776..e545340 100644 --- a/client/system/undomain/etc/pam.d/system-auth +++ b/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 diff --git a/client/undomain/xfdesktop/.calculate_directory b/client/undomain/xfdesktop/.calculate_directory new file mode 100644 index 0000000..67daf21 --- /dev/null +++ b/client/undomain/xfdesktop/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!=&&pkg(xfce-base/xfdesktop)!= append=skip \ No newline at end of file diff --git a/client/undomain/xfdesktop/kioskrc b/client/undomain/xfdesktop/kioskrc new file mode 100644 index 0000000..aed65cc --- /dev/null +++ b/client/undomain/xfdesktop/kioskrc @@ -0,0 +1,4 @@ +# Calculate format=samba path=/etc/xdg/xfce4/kiosk + +[xfce4-session] +!Shutdown= diff --git a/pym/cl_client.py b/pym/cl_client.py index b59c878..0f10adf 100644 --- a/pym/cl_client.py +++ b/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 diff --git a/pym/cl_vars_client.py b/pym/cl_vars_client.py index 990330b..6744da9 100644 --- a/pym/cl_vars_client.py +++ b/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 = {} +