pam common-session is now in puppet - move login check until after puppet is setup

[mirror/dsa-wiki.git] / input / howto / new-machine.creole

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 33d36e8..86b0518 100644 (file)
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -13,10 +13,7 @@ Note: this is partially obsolete now that we have [[puppet|howto/puppet-setup]].
     echo 'APT::Install-Recommends 0;' > /etc/apt/apt.conf.d/local-recommends
 }}}
 
-* sane locales:
-
- make sure there is _no_ locale defined in /etc/environment and /etc/default/locale
-
+* sane locales: (make sure there is _no_ locale defined in /etc/environment and /etc/default/locale)
 {{{
    echo -n > /etc/environment
    echo -n > /etc/default/locale
@@ -97,19 +94,14 @@ EOF
     : :: draghi :: && sudo -u sshdist ud-generate
 }}}
 
-* fix nsswitch for ud fu.
+* fix nsswitch for ud fu.  (you might have to restart sshd here)
 {{{
     sed -i -e 's/^passwd:\[[:space:]]\+compat$/passwd:         compat db/;
               s/^group:\[[:space:]]\+compat$/group:          db compat/;
               s/^shadow:\[[:space:]]\+compat$/shadow:         compat db/' \
         /etc/nsswitch.conf
-}}}
-
-(you might have to restart sshd here:
-{{{
     (cd / && env -i /etc/init.d/ssh restart)
 }}}
-)
 
 * on the host, run ud-replicate
 {{{
@@ -122,19 +114,11 @@ EOF
     id weasel
 }}}
 
-* add pam_mkhomedir to common-session:
-{{{
-    grep pam_mkhomedir /etc/pam.d/common-session || \
-    echo "session optional        pam_mkhomedir.so skel=/etc/skel umask=0022" >> /etc/pam.d/common-session
-}}}
-
 * install debian.org which brings you shells and much other fun
 {{{
     apt-get install debian.org
 }}}
 
-* try to login using your user and ssh key.  you should get a homedir.
-
 * make ca-certificates sane:  (choose to *not* trust new certs, and we only want the spi cert activated)
 {{{
     echo "ca-certificates ca-certificates/trust_new_crts  select no" | debconf-set-selections
@@ -177,6 +161,8 @@ EOF
 
 * setup [[puppet|howto/puppet-setup]]
 
+* try to login using your user and ssh key.  you should get a homedir.
+
 * edit dedication into in $DSA-PUPPET/modules/debian-org/misc/local.yaml
 
 * add to nagios