for i in passwd group shadow fstab; do
[ -e $i.originst ] || cp $i $i.originst
done
- [ -e /backup-etc ] || bzr get sftp://martin@piware.de/home/martin/backup/`hostname`-etc /backup-etc
+ [ -e /backup-etc ] || bzr get bzr+ssh://martin@piware.de/home/martin/backup/`hostname`-etc /backup-etc
cp -av /backup-etc/* /etc/
cp -av /backup-etc/.bzr/ /etc/
rm -rf /backup-etc
chmod 600 /etc/ssh/ssh_*_key
+ chmod 640 /etc/shadow
+ chown root:shadow /etc/shadow
+ chmod 700 /etc/ssl/private
+ chmod 640 /etc/ssl/private/ssl-cert-*
+ chown root:ssl-cert /etc/ssl/private/ssl-cert*
# only restore dchroot part into fstab
- grep -A 200 "^# dchroots" fstab >> fstab.originst || true
+ grep -A 200 "^# sid chroot" fstab >> fstab.originst || true
mv fstab.originst fstab
# only restore the human users from passwd/group
# remove packages that we do not need
killall apt-get || true # cronjob goo
-apt-get purge -y --auto-remove hplip brltty bluez-cups gnome-accessibility-themes gnome-mag gnome-orca onboard tomboy ttf-arabeyes ttf-arphic-uming ttf-kochi-gothic ttf-kochi-mincho ttf-lao ttf-malayalam-fonts ttf-thai-tlwg || true
+apt-get purge -y --auto-remove hplip brltty bluez-cups gnome-accessibility-themes gnome-mag gnome-orca onboard tomboy ttf-arabeyes ttf-arphic-uming ttf-lao ttf-thai-tlwg update-motd || true
rm -f /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
killall apt-get || true
apt-get update -o Acquire::Http::No-Cache=true
-DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim bzrtools bzr-svn patchutils offlineimap wipe diffstat gtimelog jigdo-file libtool devhelp python-doc manpages-dev gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-plugins-bad-multiverse gstreamer0.10-plugins-ugly-multiverse gstreamer0.10-ffmpeg weechat weechat-plugins weechat-scripts dpatch wdiff grep-dctrl ccache subversion listadmin quilt python-dev cryptsetup mutt editmoin lintian python-gtk2-doc fakechroot ubuntu-dev-tools dput gnome-blog dchroot fakechroot imagemagick pngquant pdfjam easytag rsnapshot
-apt-get -y build-dep postgresql-8.3 gnome-volume-manager hal cupsys apport jockey
-
-if [ `hostname` = donald ]; then
- DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes dhcp3-server ia32-libs texlive latex-beamer texlive-lang-german sane-utils
-fi
+DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim bzrtools bzr-svn patchutils offlineimap wipe diffstat gtimelog jigdo-file libtool devhelp python-doc manpages-dev gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-plugins-bad-multiverse gstreamer0.10-plugins-ugly-multiverse gstreamer0.10-ffmpeg weechat weechat-plugins weechat-scripts dpatch wdiff debian-goodies ccache subversion listadmin quilt python-dev cryptsetup mutt editmoin lintian python-gtk2-doc fakechroot ubuntu-dev-tools dput gnome-blog dchroot fakechroot imagemagick pngquant pdfjam easytag rsnapshot texlive-lang-german texlive-latex-extra python-coverage powertop sane-utils vim-scripts libtemplate-perl kvm bzr-buildpackage git-core
+apt-get -y build-dep postgresql-8.3 gnome-mount hal cups apport jockey calibre
umount /cdrom || true
-# other setup
-if [ `hostname` = "donald" ]; then
- ifdown eth1
- ifup eth1
- /etc/init.d/dhcp3-server restart
-
- # crontabs
- crontab -u martin - <<EOF
+# crontabs
+crontab -u martin - <<EOF
# m h dom mon dow command
05 * * * * \$HOME/bin/backup >/dev/null
EOF
-fi
+
if [ -x /usr/bin/gtimelog ]; then
- patch /usr/bin/gtimelog ~martin/archiv/gtimelog.wednesday.patch
+ patch /usr/bin/gtimelog ~martin/archiv/gtimelog.tuesday.patch
fi