Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki

* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  Move cert stuff to the puppet setup file
  Add IPv6 address for draghi too
  Drop nsswitch stuff, done by puppet now
  Use service foo rather than calling init scripts directly
  Do not ask for confirmation here
  Enable pluginsync at first run
  Update GNU/kFreeBSD package information
  the part about symlinks is really not needed
  the part about symlinks is really not needed
  puppet agent -t

diff --git a/input/howto/export-iscsi.creole b/input/howto/export-iscsi.creole
index ce89ce8..6d3b88f 100644 (file)
--- a/input/howto/export-iscsi.creole
+++ b/input/howto/export-iscsi.creole
@@ -23,7 +23,7 @@ This document describes how to add new new volumes on gustini and add them into
     iscsiadm -m node --targetname "iqn.1986-03.com.hp:storage.msa2012i.0834d5ecda.a" --rescan
 
   + on dijkstra: add aliases to the wwids (show topology)
-  + on dijkstra: /etc/init.d/multipath-tools reload
+  + on dijkstra: service multipath-tools reload
 }}}
 
 == via telnet interface ==

diff --git a/input/howto/install-ganeti.creole b/input/howto/install-ganeti.creole
index e5f46f8..5f9734f 100644 (file)
--- a/input/howto/install-ganeti.creole
+++ b/input/howto/install-ganeti.creole
@@ -124,17 +124,6 @@ On each node, create a volume group:
     vgcreate vg_ganeti /dev/cciss/c0d0p3
 }}}
 
-=== create kvmU symbolic links ===
-
-On each node, create vmlinuz and initrd symlinks as expected by the kvm
-hypervisor (not strictly required if all guests will boot from their own
-kernels):
-
-{{{
-    ln -s -T /boot/vmlinuz-2.6.32-5-amd64 /boot/vmlinuz-2.6-kvmU
-    ln -s -T /boot/initrd.img-2.6.32-5-amd64 /boot/initrd.img-2.6-kvmU
-}}}
-
 === exchange ssh keys ===
 
 on each node:
@@ -162,7 +151,7 @@ On the master node (foo) only:
       --mac-prefix 00:16:37 \
       --no-ssh-init \
       --no-etc-hosts \
-      --hypervisor-parameters kvm:initrd_path=/boot/initrd.img-2.6-kvmU,kernel_path=/boot/vmlinuz-2.6-kvmU \
+      --hypervisor-parameters kvm:initrd_path=,kernel_path= \
       foobar.debian.org
 }}}
 
@@ -377,7 +366,7 @@ And you want to convert it to use DRBD afterwards and start it on the other clus
   
   then:
   reload multipath-tools on gnt-master (normaly bm-bl1):
-  /etc/init.d/multipath-tools reload
+  service multipath-tools reload
   add the WWNs to dsa-puppet/modules/multipath/files/bm-multipath.conf and define the alias and commit that file to git.
 
   then:

diff --git a/input/howto/iscsi.creole b/input/howto/iscsi.creole
index 83e8eef..78acd25 100644 (file)
--- a/input/howto/iscsi.creole
+++ b/input/howto/iscsi.creole
@@ -72,9 +72,9 @@ corresponding to the two addresses that controller A has:
 
 * stop and start iscsi:
 {{{
-       /etc/init.d/open-iscsi stop &&
+       service open-iscsi stop &&
        sleep 3 &&
-       (cd / && env -i /etc/init.d/open-iscsi start)
+       service open-iscsi start)
 }}}
 
 * not sure if this is necessary again:
@@ -183,7 +183,7 @@ apt-get install multipath-tools
 * for the wwid thing in there create an entry in multipath.conf with a proper name, then reload multipathd
 {{{
        vi /etc/multipath.conf
-       /etc/init.d/multipath-tools reload
+       service multipath-tools reload
        echo show topology | multipathd -k
        ls -l /dev/mapper
 }}}

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index e66b0f0..62d4a4a 100644 (file)
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -41,19 +41,9 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * 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/;
-              s/^group:\[[:space:]]\+compat$/group:          db compat/;
-              s/^shadow:\[[:space:]]\+compat$/shadow:         compat db/' \
-        /etc/nsswitch.conf
-    (cd / && env -i /etc/init.d/ssh restart)
-}}}
-
 * on the host, run ud-replicate
 {{{
-    echo draghi.debian.org,draghi,db.debian.org,db,82.195.75.106,::ffff:82.195.75.106 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAy1mAS0xIOZH9OrJZf1Wv9qYORv5Z5fmpF0o8Y4IMdS+ZzTjN1Sl8M77jaFTJbumJNs+n2CMcX8CoMemQEPBoRe20a5t3dExPQ3c7FNU0z+WIVFbu/oTTkAWGp5gCDwF3pg2QxUjqYc0X4jpv6pkisyvisij6V/VJ5G1hsIMuKqrCKYyyyiJJytfzSfRrBx2QvB5ZWQxhYeSYDoLDvuF31qUy4TLZ/HR3qZQ1cBrP9dCh5d+GQxdY9LuO6zjlnSyU64GHkyjYt3p03AKG4plD7WHX01bD0DQQ/NOFVwFhOZ63mePyridPuqBMFW39jBf4jSsewV95RE5VbY04+MY4XQ== root@draghi >> /etc/ssh/ssh_known_hosts &&
+    echo draghi.debian.org,draghi,db.debian.org,db,82.195.75.106,::ffff:82.195.75.106,2001:41b8:202:deb:1a1a:0:52c3:4b6a ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAy1mAS0xIOZH9OrJZf1Wv9qYORv5Z5fmpF0o8Y4IMdS+ZzTjN1Sl8M77jaFTJbumJNs+n2CMcX8CoMemQEPBoRe20a5t3dExPQ3c7FNU0z+WIVFbu/oTTkAWGp5gCDwF3pg2QxUjqYc0X4jpv6pkisyvisij6V/VJ5G1hsIMuKqrCKYyyyiJJytfzSfRrBx2QvB5ZWQxhYeSYDoLDvuF31qUy4TLZ/HR3qZQ1cBrP9dCh5d+GQxdY9LuO6zjlnSyU64GHkyjYt3p03AKG4plD7WHX01bD0DQQ/NOFVwFhOZ63mePyridPuqBMFW39jBf4jSsewV95RE5VbY04+MY4XQ== root@draghi >> /etc/ssh/ssh_known_hosts &&
     ud-replicate
 }}}
 
@@ -64,17 +54,12 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * install debian.org which brings you shells and much other fun
 {{{
-    apt-get install debian.org debian.org-recommended
-}}}
-
-* On handel, make sure the certs exist for the new host
-{{{
-  : :: handel :: : && sudo -u puppet make -C /srv/puppet.debian.org/ca/ install
+    apt-get install -y debian.org debian.org-recommended
 }}}
 
 * run puppet a couple times
 {{{
-    puppetd -t; puppetd -t; puppetd -t; puppetd -t
+    puppet agent -t; puppet agent -t; puppet agent -t; puppet agent -t
 }}}
 
 * try to login using your user and ssh key.  you should get a homedir.

diff --git a/input/howto/puppet-setup.mdwn b/input/howto/puppet-setup.mdwn
index 689b2d9..edb9bae 100644 (file)
--- a/input/howto/puppet-setup.mdwn
+++ b/input/howto/puppet-setup.mdwn
@@ -10,12 +10,12 @@ Make sure you have set up the IP address for the new machine in ud-ldap.
 After that run puppet on puppetmaster once, so the ferm config get
 adjusted.
 
-        : __handel__ && puppetd -t --environment=production
+        : __handel__ && puppet agent -t --environment=production
 
         : ::client:: && me=$(hostname -f) && [ "$me" != "${me%debian.org}" ] && apt-get update &&
                 apt-get install -y --no-install-recommends puppet libaugeas-ruby1.8 augeas-lenses lsb-release &&
-                /etc/init.d/puppet stop &&
-                (puppetd -t || true ) &&
+                service puppet stop &&
+                (puppet agent -t || true ) &&
                 cd /var/lib/puppet/ssl/certificate_requests &&
                 echo sha256sum output: && echo &&
                 sha256sum $me.pem &&
@@ -51,16 +51,20 @@ although the config files should remain identical before and after.
 
 Then run (this will change the configs in /etc):
 
-        : ::client:: && puppetd -t
+        : ::client:: && puppet agent -t --pluginsync
 
-This run will start puppet after reconfiguring it, so if you are 
-unhappy with what just happened, you'll need to stop it again to do 
+This run will start puppet after reconfiguring it, so if you are
+unhappy with what just happened, you'll need to stop it again to do
 repair.
 
 Double check apt - the puppet setup usually results in duplicate apt
 sources, since we ship a few under sources.list.d.  Remove any unnecessary
 entries from sources.list.
 
+On handel, make sure the certs exist for the new host
+
+  : :: handel :: : && sudo -u puppet make -C /srv/puppet.debian.org/ca/ install
+
 We ship a samhain config file that includes /lib and /usr/lib.  This will
 almost certainly be different than the config file on the machine, so it
 will result in 1000s of files changed.

diff --git a/input/ports/kfreebsd.creole b/input/ports/kfreebsd.creole
index e48ebd7..6966692 100644 (file)
--- a/input/ports/kfreebsd.creole
+++ b/input/ports/kfreebsd.creole
@@ -9,13 +9,13 @@ from a purely DSA perspective.
 ** bridge-utils (ditto)
 ** vlan (same)
 ** iproute
-** traceroute
-** emacs22-nox or emacs22
+** traceroute (inetutils-traceroute instead, available on all arches)
+** emacs22-nox or emacs22 (emacs23-nox or emacs23 instead)
 ** lshw
 ** mcelog (useful on kfreebsd?)
 ** lsof
-** timeout
-** strace
+** timeout (replaced by coreutils)
+** strace (ktrace instead)
 
 == Operational ==
 
@@ -23,5 +23,3 @@ puppet runs do not run reliably and often hang.  Might be a ruby bug.
 
 === Broken Packages ===
 
-* molly-guard (ssh check broken) (<a href="http://bugs.debian.org/548099">#548099</a>)
-