Changeset 567


Ignore:
Timestamp:
11/08/09 13:33:13 (2 years ago)
Author:
tschmitt
Message:
  • automatische Zuordnung der User zu Systemgruppen bei der Anmeldung gefixt (pam_group.so in common-auth ergaenzt).
  • Paketkonfiguration nach postinst verschoben (bei der Paketinstallation eingebene Werte wurden nicht uebernommen).
  • Profilkopier-Skript von /etc/gdm/PostLogin/Default nach /usr/share/linuxmuster-client/copy-template.sh verschoben (wird nun beim Mounten des Homes ausgeführt).
  • Etch-Support entfernt.
  • Neue Konfigurationsvariable MYFILES speichert den Ordnernamen fuer "Eigene Dateien" im Home.
  • Wenn MYFILES gesetzt ist, wird bei der Anmeldung ein Desktoplink erzeugt.
  • Konfigurationsabfragen fuer die Ordnernamen von Einstellungen (APPS_BASEDIR) und Eigene Dateien (MYFILES) eingerichtet.
  • Bugfix: Teile des Template-User-Profils wurden nicht kopiert.
  • "keyrings/" aus profile.exclude entfernt.
Location:
client/linuxmuster-client/trunk
Files:
2 added
3 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • client/linuxmuster-client/trunk/common/templates/etc/pam.d/common-auth

    r397 r567  
    2121        auth required pam_ldap.so use_first_pass 
    2222        auth required pam_permit.so 
     23 
     24auth       optional   pam_group.so 
     25 

  • client/linuxmuster-client/trunk/debian/changelog

    r561 r567  
     1linuxmuster-client (0.9.15-0) testing; urgency=low 
     2 
     3  * fixed broken group memberships, added pam_group.so to common-auth. 
     4  * moved package configuration to postinst. 
     5  * moved /etc/gdm/PostLogin/Default to /usr/share/linuxmuster-client/copy-template.sh, 
     6    which will be sourced by mount.sh. 
     7  * removed etch from supported distros. 
     8  * added new config variable MYFILES. 
     9  * added desktop link to MYFILES if set. 
     10  * added templates for APPS_BASEDIR and MYFILES. 
     11  * fixed: parts of profile were not copied. 
     12  * removed keyrings/ from profile.exclude. 
     13 
     14 -- Thomas Schmitt <schmitt@lmz-bw.de>  Sun, 08 Nov 2009 12:18:27 +0100 
     15 
    116linuxmuster-client (0.9.14-3) testing; urgency=low 
    217 

  • client/linuxmuster-client/trunk/debian/install

    r538 r567  
    1 etc/Default     etc/gdm/PostLogin/ 
    21etc/config      etc/linuxmuster-client/ 
    32etc/profile.exclude     etc/linuxmuster-client/ 
    … …  
    54hardy/* var/lib/linuxmuster-client/hardy/ 
    65jaunty/*        var/lib/linuxmuster-client/jaunty/ 
    7 etch/*  var/lib/linuxmuster-client/etch/ 
    86share/* usr/share/linuxmuster-client/ 
    97debian/linuxmuster-hostname     etc/init.d/ 

  • client/linuxmuster-client/trunk/debian/po/de.po

    r462 r567  
    4242msgstr "Soll das Firefox-Profil des Vorlagen-Benutzers als Startprofil verwendet werden?" 
    4343 
     44#. Type: string 
     45#. Description 
     46#: ../templates:5 
     47msgid "Name of the folder which contains the user files." 
     48msgstr "Verzeichnisname fuer die Benutzerdateien (z.B. Eigene Dateien)." 
     49 
     50#. Type: string 
     51#. Description 
     52#: ../templates:5 
     53msgid "" 
     54"Folder will be created in user's home if it does not exist and linked to the desktop." 
     55msgstr "" 
     56"Verzeichnis wird -falls nicht vorhanden - im Benutzerhome erstellt und auf den Desktop verlinkt." 
     57 
     58#. Type: string 
     59#. Description 
     60#: ../templates:6 
     61msgid "Name of the folder in user's home which will contain the application settings (Firefox etc.)." 
     62msgstr "Name des Verzeichnisses im Benutzerhome, das Anwendungseinstellungen enthaelt (fuer Firefox z.B.)." 
     63 

  • client/linuxmuster-client/trunk/debian/postinst

    r538 r567  
    4747                        echo "This is $hardy!" 
    4848                        distro=hardy 
    49                 elif grep -q "$etch" /etc/issue; then 
    50                         echo "This is $etch!" 
    51                         distro=etch 
    52                         # adding system groups and users 
    53                         for i in fuse rdma tss; do 
    54                                 if ! grep -q ^${i}: /etc/group; then 
    55                                         addgroup --system $i 
    56                                 fi 
    57                         done 
    58                         if ! grep -q ^tss: /etc/passwd; then 
    59                                 adduser --system --no-create-home --ingroup tss --disabled-login tss 
    60                         fi 
    6149                else 
    6250                        echo "This distribution is not supported!" 
    … …  
    10189                fi 
    10290 
     91  # configure package 
     92  . /usr/share/linuxmuster-client/configure 
     93 
    10394                # basedn 
    10495                db_get shared/ldapns/ldap-server || true 
    … …  
    125116  if $RET; then firefox=yes; else firefox=no; fi 
    126117 
    127                 # we need this directory 
    128                 [ -d /etc/gdm/PostLogin ] || mkdir -p /etc/gdm/PostLogin 
     118  # my files folder 
     119  db_get linuxmuster-client/myfiles || true 
     120  myfiles="$RET" 
     121 
     122  # apps base dir 
     123  db_get linuxmuster-client/apps_basedir || true 
     124  apps_basedir="$RET" 
    129125 
    130126                # patching configuration files 
    … …  
    160156                 echo "FIREFOX=$firefox" >> /etc/linuxmuster-client/config 
    161157        fi 
     158         if grep -q ^MYFILES /etc/linuxmuster-client/config; then 
     159                 sed -e "s|^MYFILES=.*|MYFILES=\"$myfiles\"|" -i /etc/linuxmuster-client/config 
     160         else 
     161                 echo "MYFILES=\"$myfiles\"" > /etc/linuxmuster-client/config 
     162         fi 
     163         if grep -q ^APPS_BASEDIR /etc/linuxmuster-client/config; then 
     164                 sed -e "s|^APPS_BASEDIR=.*|APPS_BASEDIR=\"$apps_basedir\"|" -i /etc/linuxmuster-client/config 
     165         else 
     166                 echo "APPS_BASEDIR=\"$apps_basedir\"" > /etc/linuxmuster-client/config 
     167         fi 
    162168 
    163169                # remove hal's obsolete mountpolicies 

  • client/linuxmuster-client/trunk/debian/templates

    r462 r567  
    2222_Description: Copy initial Firefox profile to user's home? 
    2323 
     24Template: linuxmuster-client/myfiles 
     25Type: string 
     26Default: Eigene Dateien 
     27_Description: Name of the folder which contains the user files. 
     28 Folder will be created in user's home if it does not exist and linked to the desktop. 
     29 
     30Template: linuxmuster-client/apps_basedir 
     31Type: string 
     32Default: Einstellungen 
     33_Description: Name of the folder in user's home which will contain the application settings (Firefox etc.). 
     34 Folder will be created in user's home if it does not exist and linked to the desktop. 
     35 

  • client/linuxmuster-client/trunk/etc/config

    r538 r567  
    1414FIREFOX_PROFILE=firefox 
    1515 
     16# my files folder 
     17MYFILES="Eigene Dateien" 
     18 

  • client/linuxmuster-client/trunk/etc/profile.exclude

    r540 r567  
    11# list of directories and files to be excluded from sync with profile of template user 
    22cifs* 
    3 keyrings/ 
    43metacity/sessions/ 
     4share/gvfs-metadata/ 
    55share/tracker/ 
    66share/Trash/ 

  • client/linuxmuster-client/trunk/hardy/templates/etc/security/group.conf

    r400 r567  
    5555#xsh; tty* ;*;Al0900-1800;floppy 
    5656 
    57 *;*;*;Al0000-2400;dialout,cdrom,floppy,audio,dip,video,plugdev,scanner 
     57*;*;*;Al0000-2400;dialout,cdrom,floppy,audio,dip,video,plugdev,scanner,powerdev,pulse-rt 
    5858*;*;@@administrator@@;Al0000-2400;adm,admin,lpadmin 
    5959*;*;@@pgmadmin@@;Al0000-2400;adm,admin,lpadmin 

  • client/linuxmuster-client/trunk/jaunty/templates/etc/pam.d/common-auth

    r538 r567  
    2525# and here are more per-package modules (the "Additional" block) 
    2626# end of pam-auth-update config 
     27 
     28auth optional pam_group.so 
     29 

  • client/linuxmuster-client/trunk/jaunty/templates/etc/security/group.conf

    r535 r567  
    5555#xsh; tty* ;*;Al0900-1800;floppy 
    5656 
    57 *;*;*;Al0000-2400;dialout,cdrom,floppy,audio,dip,video,plugdev,scanner 
     57*;*;*;Al0000-2400;dialout,cdrom,floppy,audio,dip,video,plugdev 
    5858*;*;@@administrator@@;Al0000-2400;adm,admin,lpadmin 
    5959*;*;@@pgmadmin@@;Al0000-2400;adm,admin,lpadmin 

  • client/linuxmuster-client/trunk/share/config

    r538 r567  
    2525CDSDIR="$SAMBAHOME/cds" 
    2626USERDIRS="Desktop .kde .local" 
    27 MANDATORY_GROUPS="plugdev powerdev pulse-rt" 
    2827 

  • client/linuxmuster-client/trunk/share/mount.sh

    r540 r567  
    44# schmitt@lmz-bw.de 
    55# 
    6 # 11.07.2009 
     6# 08.11.2009 
    77# 
    88 
    … …  
    1414OPTIONS="$5" 
    1515 
    16 # no pammount for local users 
    17 grep -q ^${USER}: /etc/passwd && exit 0 
    18  
    1916# check if params are all set 
    2017[ -z "$SERVER" ] && exit 1 
    … …  
    2421[ -z "$OPTIONS" ] && exit 1 
    2522 
    26 # source profile 
     23# source various settings and functions 
    2724. /usr/share/linuxmuster-client/profile || exit 1 
     25. /etc/linuxmuster-client/config || exit 1 
     26. /usr/share/linuxmuster-client/config || exit 1 
     27. /usr/share/linuxmuster-client/helperfunctions.sh || exit 1 
     28 
     29# fetch user's homedir 
     30get_userhome 
     31[[ -z "$HOME" || "$HOME" = "/dev/null" ]] && exit 1 
     32 
     33# only for template user 
     34[ "$TEMPLATE_USER" = "$USER" -a "$HOME" = "$MNTPT" ] && . /usr/share/linuxmuster-client/copy-template.sh 
     35 
     36# no pammount for local users 
     37grep -q ^${USER}: /etc/passwd && exit 0 
    2838 
    2939# check if important variables are set 
    … …  
    3141[ -z "$DESKTOP" ] && exit 1 
    3242[ -z "$USERDIRS" ] && exit 1 
    33  
    34 # fetch user's homedir 
    35 get_userhome 
    36 [[ -z "$HOME" || "$HOME" = "/dev/null" ]] && exit 1 
    3743 
    3844# mount the given share 
    … …  
    4450# if userhome not mounted do exit 
    4551cat /proc/mounts | grep -qw $HOME || exit 1 
    46  
    47 # add user to mandatory groups 
    48 for i in $MANDATORY_GROUPS; do 
    49         if grep -q $i /etc/group; then 
    50                 grep $i /etc/group | grep -q $USER || adduser $USER $i 
    51         fi 
    52 done 
    5352 
    5453# move user's dirs temporarily to /tmp 
    … …  
    6362done 
    6463 
     64# copy template user profile 
     65. /usr/share/linuxmuster-client/copy-template.sh 
     66 

  • client/linuxmuster-client/trunk/share/supported_distros

    r561 r567  
    33intrepid="Ubuntu 8.10" 
    44hardy="Ubuntu 8.04" 
    5 etch="Debian GNU/Linux 4.0" 
    65 
Note: See TracChangeset for help on using the changeset viewer.