# completely
cd /etc
if [ ! -d /etc/.bzr ]; then
- for i in passwd group shadow fstab; do
+ #for i in passwd group shadow fstab; do
+ for i in 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 "^#.*chroot" fstab >> fstab.originst || true
mv fstab.originst fstab
# only restore the human users from passwd/group
- for i in passwd group; do
- perl -naF: -e 'print if $F[2] > 1000 && $F[2] < 60000' $i >> $i.originst
- mv $i.originst $i
- done
+ #for i in passwd group; do
+ # perl -naF: -e 'print if $F[2] > 1000 && $F[2] < 60000' $i >> $i.originst
+ # mv $i.originst $i
+ #done
# only restore some passwords from shadow
- egrep 'martin|netti|joe' shadow >> shadow.originst
- mv shadow.originst shadow
- chown root:shadow shadow
- chmod 640 shadow
+ #egrep 'martin|netti|joe' shadow >> shadow.originst
+ #mv shadow.originst shadow
+ #chown root:shadow shadow
+ #chmod 640 shadow
fi
# update postfix for new configuration
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 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 openvpn texlive-lang-german python-coverage powertop sane-utils
-apt-get -y build-dep postgresql-8.3 gnome-mount hal cups apport jockey
+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 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 greasemonkey
+apt-get -y build-dep postgresql-8.4 hal cups apport jockey calibre gvfs devicekit-disks devicekit-power
umount /cdrom || true