Merge branch 'master' of git.calculate.ru:/calculate-client

data/login.d/10client

@@ -15,7 +15,7 @@
 
 env-update
 source /etc/profile
-source /usr/share/calculate-2.2/xdm/functions
+source /usr/share/calculate/xdm/functions
 
 if [ -e '/usr/bin/cl-sync' ];
 then

data/logout.d/10client

@@ -15,7 +15,7 @@
 
 env-update
 source /etc/profile
-source /usr/share/calculate-2.2/xdm/functions
+source /usr/share/calculate/xdm/functions
 
 if [ -e '/usr/bin/cl-sync' ];
 then

pym/cl_client.py

@@ -91,7 +91,7 @@ class share(color_print):
         else:
             return dirsFiles
 
-    def printVars(self, opts):
+    def printVars(self, opts=["all"]):
         """Печать существующих переменных"""
         if opts == ["all"]:
             self.clVars.printVars()

pym/cl_client_cmd.py

@@ -86,7 +86,7 @@ class client_cmd(share_cmd):
         """Проверка опций командной строки"""
         optionsNotDomain = self.getOptionsNotDomain(optObj)
         if not args:
-            options = optionsNotDomain + [optObj.color, optObj.vars]
+            options = optionsNotDomain + [optObj.color, optObj.v]
             if not filter(lambda x: x, options):
                 errMsg = _("no such argument")+":"+" %s" %USAGE.split(" ")[-1]
                 self.optobj.error(errMsg)
@@ -123,4 +123,4 @@ class client_cmd(share_cmd):
 
         а так-же ввод в домен если найдено имя хоста и пароль для подключения
         """
-        return self.logicObj.mountRemote()
+        return self.logicObj.mountRemote()

pym/cl_share_cmd.py

@@ -27,9 +27,8 @@ class share_cmd(color_print, _error):
     """Класс общих методов обработки опций командной строки"""
     def printVars(self, optObj):
         """Печать переменных"""
-        if optObj.vars:
+        if optObj.v:
-            terms = optObj.vars.split(",")
+            self.logicObj.printVars()
-            self.logicObj.printVars(terms)
 
     def setVars(self, optObj):
         """Установка переменных"""

scripts/cl-client

@@ -42,7 +42,7 @@ if __name__ == "__main__":
     # Печать переменных
     obj.printVars(opts)
     # Если нет печати переменных выполняем логику программы
-    if not opts.vars:
+    if not opts.v:
         if args:
             domainName = args[0]
             # Ввод в домен

scripts/cl-passwd

@@ -42,7 +42,7 @@ if __name__ == "__main__":
     # Печать переменных
     obj.printVars(opts)
     # Если нет печати переменных выполняем логику программы
-    if not opts.vars:
+    if not opts.v:
         # Изменение пароля пользователя
         if not obj.setUserPasswordToServer():
             sys.exit(1)

scripts/cl-sync

@@ -45,7 +45,7 @@ if __name__ == "__main__":
     # Печать переменных
     obj.printVars(opts)
     # Если нет печати переменных выполняем логику программы
-    if not opts.vars:
+    if not opts.v:
         sync = not opts.nosync
         if opts.login:
             # Монтирование ресурсов и синхронизация при входе

scripts/install

@@ -42,7 +42,7 @@ if __name__ == "__main__":
     # Печать переменных
     obj.printVars(opts)
     # Если нет печати переменных выполняем логику программы
-    if not opts.vars:
+    if not opts.v:
         # Апдейт env файлов
         if obj.updateEnvFiles():
             # Перечитывание переменные шаблонов из env файлов

scripts/uninstall

@@ -42,7 +42,7 @@ if __name__ == "__main__":
     # Печать переменных
     obj.printVars(opts)
     # Если нет печати переменных выполняем логику программы
-    if not opts.vars:
+    if not opts.v:
         # Наложение шаблонов на систему при деинсталяции
         if not obj.uninstallProg():
             sys.exit(1)

setup.cfg

@@ -2,4 +2,4 @@
 install-scripts=/usr/bin
 install-purelib=/usr/lib/calculate-2.2
 install-platlib=/usr/lib/calculate-2.2
-install-data=/usr/share/calculate-2.2/templates
+#install-data=/usr/share/calculate/templates

setup.py

@@ -33,11 +33,11 @@ data_files = []
 
 var_data_files = []
 
-data_dirs_template = ['templates']
+#data_dirs_template = ['templates']
 data_dirs_share = ['i18n']
-share_calculate_dir = "/usr/share/calculate-2.2"
+share_calculate_dir = "/usr/share/calculate"
-template_calculate_dir = os.path.join(share_calculate_dir, "templates")
+#template_calculate_dir = os.path.join(share_calculate_dir, "templates")
-template_replace_dirname = "client" 
+#template_replace_dirname = "client" 
 
 def __scanDir(scanDir, prefix, replace_dirname, dirData, flagDir=False):
     """Scan directory"""
@@ -70,23 +70,23 @@ def create_data_files(data_dirs, prefix="", replace_dirname=""):
         data_files += __scanDir(data_dir, prefix, replace_dirname, data)
     return data_files
 
-data_files += create_data_files (data_dirs_template, template_calculate_dir,
+#data_files += create_data_files (data_dirs_template, template_calculate_dir,
-                                 template_replace_dirname)
+#                                 template_replace_dirname)
 data_files += create_data_files (data_dirs_share, share_calculate_dir)
 data_files += [('/etc/init.d', ['data/client'])]
-data_files += [('/usr/share/calculate-2.2/xdm/login.d',
+data_files += [('/usr/share/calculate/xdm/login.d',
                                                 ['data/login.d/10client'])] +\
-              [('/usr/share/calculate-2.2/xdm/logout.d',
+              [('/usr/share/calculate/xdm/logout.d',
                                                 ['data/logout.d/10client'])] +\
-              [('/usr/share/calculate-2.2/xdm/',['data/wait_domain'])] +\
+              [('/usr/share/calculate/xdm/',['data/wait_domain'])]
-              [('/var/calculate/templates', [])]
+#              [('/var/calculate/templates', [])]
 
 
 class cl_install_data(install_data):
     def run (self):
         install_data.run(self)
         data_file = [("/etc/init.d/client",0755),
-                     ("/usr/share/calculate-2.2/xdm/wait_domain",0755)]
+                     ("/usr/share/calculate/xdm/wait_domain",0755)]
         fileNames = map(lambda x: os.path.split(x[0])[1], data_file)
         listNames = map(lambda x: filter(lambda y: y, x[0].split("/")),data_file)
         data_find = {}

templates/.calculate_directory

@@ -1 +0,0 @@
-# Calculate append=skip cl_name==calculate-client

templates/domain/.calculate_directory

@@ -1 +0,0 @@
-# Calculate append=skip cl_pass_action==domain&&os_remote_auth!=

templates/domain/gdm/.calculate_directory

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

templates/domain/gdm/Init/.calculate_directory

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

templates/domain/gdm/Init/00Default

@@ -1 +0,0 @@
-# Calculate name=Default.old link=/etc/X11/gdm/Init/Default mirror load(/etc/X11/gdm/Init/Default.old)==

templates/domain/gdm/Init/05Default

@@ -1,6 +0,0 @@
-# Calculate chmod=755 name=Default
-#!/bin/bash
-
-/usr/share/calculate-2.2/xdm/wait_domain
-OLDDEFAULT=/etc/X11/gdm/Init/Default.old
-[[ -f $OLDDEFAULT ]] && source $OLDDEFAULT

templates/domain/gdm/custom.conf

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

templates/domain/glibc/.calculate_directory

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

templates/domain/glibc/nsswitch.conf

@@ -1,19 +0,0 @@
-# Calculate format=ldap append=replace chmod=0644 chown=root:root path=/etc
-passwd:      files ldap
-shadow:      files ldap
-group:       files ldap
-
-hosts:       files dns
-networks:    files dns
-
-services:    files ldap
-protocols:   files ldap
-rpc:         db files
-ethers:      db files
-netmasks:    files
-netgroup:    files ldap
-bootparams:  files
-
-automount:   files ldap
-aliases:     files
-

templates/domain/kdm/.calculate_directory

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

templates/domain/kdm/kdmrc

@@ -1,10 +0,0 @@
-# Calculate format=kde path=/usr/share/config/kdm 
-[X-*-Core]
-Setup=/usr/share/calculate-2.2/xdm/wait_domain
-[X-*-Greeter]
-#?env(unix.sr_unix_min_id)!=#
-MinShowUID=#-env(unix.sr_unix_min_id)-#
-#env#
-#?env(unix.sr_unix_min_id)==#
-MinShowUID=1000
-#env#

templates/domain/nss_ldap/.calculate_directory

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

templates/domain/nss_ldap/ldap.conf

@@ -1,18 +0,0 @@
-# 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)-#
-binddn #-server(unix.bind_dn)-#
-bindpw #-server(unix.bind_pw)-#
-port 389
-ldap_version 3
-bind_policy soft
-
-#ускорим ограничив область поиска
-nss_base_passwd ou=Users,#-server(unix.dn)-#?one?shadowFlag=1
-nss_base_shadow ou=Users,#-server(unix.dn)-#?one?shadowFlag=1
-nss_base_group  ou=Groups,#-server(unix.dn)-#?one
-#?server(samba.dn)!=#
-nss_base_group  ou=Groups,#-server(samba.dn)-#?one
-#server#
-

templates/domain/openssh/.calculate_directory

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

templates/domain/openssh/ssh_config

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

templates/domain/pambase/.calculate_directory

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

templates/domain/pambase/system-auth

@@ -1,18 +0,0 @@
-# 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
-auth       sufficient   pam_ldap.so use_first_pass
-auth       required     pam_deny.so
-
-account    required     pam_unix.so
-account    sufficient   pam_ldap.so
-
-password   required     pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
-password   sufficient   pam_unix.so nullok md5 shadow use_authtok
-password   sufficient   pam_ldap.so
-password   required     pam_deny.so
-
-session    required     pam_limits.so
-session    required     pam_unix.so
-session    optional     pam_ldap.so

templates/domain/xfdesktop/.calculate_directory

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

templates/domain/xfdesktop/kioskrc

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

templates/undomain/.calculate_directory

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

templates/undomain/gdm/.calculate_directory

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

templates/undomain/gdm/Init/.calculate_directory

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

templates/undomain/gdm/Init/00Default

@@ -1 +0,0 @@
-# Calculate name=Default link=/etc/X11/gdm/Init/Default.old mirror load(/etc/X11/gdm/Init/Default.old)!=

templates/undomain/gdm/Init/05Default

@@ -1 +0,0 @@
-# Calculate append=remove name=Default.old

templates/undomain/gdm/custom.conf

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

templates/undomain/glibs/.calculate_directory

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

templates/undomain/glibs/nsswitch.conf

@@ -1,23 +0,0 @@
-# Calculate format=ldap append=replace chmod=0644 chown=root:root path=/etc
-passwd:      compat
-shadow:      compat
-group:       compat
-
-# passwd:    db files nis
-# shadow:    db files nis
-# group:     db files nis
-
-hosts:       files dns
-networks:    files dns
-
-services:    db files
-protocols:   db files
-rpc:         db files
-ethers:      db files
-netmasks:    files
-netgroup:    files
-bootparams:  files
-
-automount:   files
-aliases:     files
-

templates/undomain/kdm/.calculate_directory

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

templates/undomain/kdm/kdmrc

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

templates/undomain/nss_ldap/.calculate_directory

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

templates/undomain/nss_ldap/ldap.conf

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

templates/undomain/openssh/.calculate_directory

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

templates/undomain/openssh/ssh_config

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

templates/undomain/pambase/.calculate_directory

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

templates/undomain/pambase/system-auth

@@ -1,14 +0,0 @@
-# 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
-
-account    required     pam_unix.so
-
-password   required     pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
-password   sufficient   pam_unix.so nullok md5 shadow use_authtok
-password   required     pam_deny.so
-
-session    required     pam_limits.so
-session    required     pam_unix.so
-

templates/undomain/xfdesktop/.calculate_directory

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

templates/undomain/xfdesktop/kioskrc

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