X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fnew-machine.creole;h=4bfd9f5c7f8e6e33eb2c49058fbbb11cf4fd11f1;hb=b0b091134d88398845e8bc7fe0698a92fdf816c3;hp=9685e5b0ec5bbf62f1822878f43bbf54f504018c;hpb=2f04de8898e5c1789358ae4bff177875d64805dd;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 9685e5b..4bfd9f5 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -1,16 +1,16 @@
 == setup/integrate a new machine ==
 
-Note: this is partially obsolete now that we have [[puppet|howto/puppet-setup]].  We should probably update/rework some parts.
+Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup]].  If stuff breaks fix it.
+
 
 * install ssh if it isn't there already
 {{{
     apt-get install ssh
 }}}
 
-* make apt sane
+* sane editor
 {{{
-    echo 'Acquire::PDiffs "false";' > /etc/apt/apt.conf.d/local-pdiff
-    echo 'APT::Install-Recommends 0;' > /etc/apt/apt.conf.d/local-recommends
+    apt-get install vim
 }}}
 
 * sane locales: (make sure there is _no_ locale defined in /etc/environment and /etc/default/locale)
@@ -31,19 +31,16 @@ Note: this is partially obsolete now that we have [[puppet|howto/puppet-setup]].
     dpkg -l postfix | grep '^ii  postfix' && (dpkg --purge postfix && rm /etc/aliases)
 }}}
 
-* setup [[puppet|howto/puppet-setup]]
+* on draghi, add the host to the ldap using ud-host.  Set the ssh key and the IP Address attributes.
 
-* on draghi, add the host to /home/sshdist/.ssh/authorized_keys and generate.conf
-(you want the host's rsa host key there: {{{cat /etc/ssh/ssh_host_rsa_key.pub}}})
-{{{
-    : :: draghi :: && sudo vi /home/sshdist/.ssh/authorized_keys
-    : :: draghi :: && sudo vi /etc/userdir-ldap/generate.conf
-}}}
 * run generate, or wait until cron runs it for you
 {{{
-    : :: draghi :: && sudo -u sshdist ud-generate
+    : :: draghi :: && sudo -u sshdist ud-generate && sudo -H ud-replicate
 }}}
 
+* setup [[puppet|howto/puppet-setup]]  (run the puppet client two or three times until things converge.)
+
+
 * fix nsswitch for ud fu.  (you might have to restart sshd here)
 {{{
     sed -i -e 's/^passwd:\[[:space:]]\+compat$/passwd:         compat db/;
@@ -71,43 +68,13 @@ Note: this is partially obsolete now that we have [[puppet|howto/puppet-setup]].
 
 * install debian.org which brings you shells and much other fun
 {{{
-    apt-get install debian.org
-}}}
-
-* in /etc/ssh/sshd_config:
-** disable the DSA hostkey, so that it only does RSA
-** remove old host keys:
-** disable X11 forwarding
-** Tell it to use alternate authorized_keys locations
-** maybe link root's auth key there:
-{{{
-    #| HostKey /etc/ssh/ssh_host_rsa_key
-    #| X11Forwarding no
-    #| AuthorizedKeysFile /etc/ssh/userkeys/%u
-    #| AuthorizedKeysFile2 /var/lib/misc/userkeys/%u
-
-    cd /etc/ssh/ && rm -f ssh_host_dsa_key ssh_host_dsa_key.pub ssh_host_key ssh_host_key.pub &&
-    mkdir -p /etc/ssh/userkeys && ln -s /root/.ssh/authorized_keys /etc/ssh/userkeys/root &&
-    sed -i -e 's/^HostKey.*_dsa_key/# &/;
-               s/^X11Forwarding yes/X11Forwarding no/;
-               $ a AuthorizedKeysFile /etc/ssh/userkeys/%u
-               $ a AuthorizedKeysFile2 /var/lib/misc/userkeys/%u' sshd_config &&
-    (cd / && env -i /etc/init.d/ssh restart)
+    apt-get install debian.org debian.org-recommended
 }}}
 
 * try to login using your user and ssh key.  you should get a homedir.
 
 * try to become root using sudo.
 
-* disable password auth with ssh (again: once you verified you can log in and become root using keys.)
-{{{
-    #vi /etc/ssh/sshd_config
-    #  | PasswordAuthentication no
-
-    sed -i -e 's/^PasswordAuthentication yes/PasswordAuthentication no/' /etc/ssh/sshd_config &&
-    (cd / && env -i /etc/init.d/ssh restart)
-}}}
-
 * 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
@@ -117,17 +84,12 @@ Note: this is partially obsolete now that we have [[puppet|howto/puppet-setup]].
 
 * Add debian-admin@debian.org to root in /etc/aliases
 {{{
-	if ! egrep '^root:' /etc/aliases > /dev/null; then
-		echo "root: debian-admin@debian.org" >> /etc/aliases
-	elif ! egrep '^root:.*debian-admin@debian.org' /etc/aliases > /dev/null; then
-		sed -i -e 's/^root: .*/&, debian-admin@debian.org/' /etc/aliases
-	fi
-	newaliases
-}}}
-
-* sane default editor
-{{{
-    apt-get install vim && update-alternatives --set editor /usr/bin/vim.basic
+  if ! egrep '^root:' /etc/aliases > /dev/null; then
+    echo "root: debian-admin@debian.org" >> /etc/aliases
+  elif ! egrep '^root:.*debian-admin@debian.org' /etc/aliases > /dev/null; then
+    sed -i -e 's/^root: .*/&, debian-admin@debian.org/' /etc/aliases
+  fi
+  newaliases
 }}}
 
 * add to munin on spohr
@@ -141,6 +103,4 @@ Note: this is partially obsolete now that we have [[puppet|howto/puppet-setup]].
 
 * add to nagios
 
-* add host to ldap: ud-host -a $USER -h ....
-
 -- weasel, Wed, 04 Jun 2008 20:52:56 +0200