add ntfs-3g; add ability to send mails to Sascha Silbe

7 files changed, 109 insertions, 5 deletions

diff --git a/assim-xsession b/assim-xsession
index 48daba8..5beb87b 100755
--- a/assim-xsession
+++ b/assim-xsession
@@ -1,4 +1,4 @@
 #!/bin/bash
 . /etc/profile
-soas-assimilator.py&
+( cd /media ; soas-assimilator.py ) &
 exec icewm
diff --git a/build-livecd b/build-livecd
index d215832..641c9c1 100755
--- a/build-livecd
+++ b/build-livecd
@@ -4,12 +4,16 @@ DEBIAN_MIRROR=http://ftp.de.debian.org/debian/
 mkdir -p tmp
 cd tmp
 sudo lh_clean
-lh_config -a i386 -d lenny -m "$DEBIAN_MIRROR" --mirror-chroot "$DEBIAN_MIRROR" -p standard-x11 --packages "icewm hal python-dbus python-gobject python-gtk2"
-mkdir -p config/chroot_local-includes/{etc/X11,usr/local/bin,/usr/share/initramfs-tools/scripts/live-bottom}
+lh_config -a i386 -d lenny -m "$DEBIAN_MIRROR" --mirror-chroot "$DEBIAN_MIRROR" -p standard-x11 --packages "hal icewm less mailx mutt ntfs-3g nullmailer python-dbus python-gobject python-gtk2 openssh-client strace"
+mkdir -p config/chroot_local-includes/{etc/nullmailer,etc/ssh,etc/X11,usr/lib/nullmailer,usr/local/bin}
+cp ../rc.local config/chroot_local-includes/etc/
+cp ../ssh_known_hosts config/chroot_local-includes/etc/ssh/
+cp ../id_rsa_mail* config/chroot_local-includes/etc/nullmailer/
+cp ../remotes config/chroot_local-includes/etc/nullmailer/
+cp ../Xwrapper.config config/chroot_local-includes/etc/X11/
+cp ../ssh-sendmail config/chroot_local-includes/usr/lib/nullmailer/
 cp ../soas-assimilator.py config/chroot_local-includes/usr/local/bin/
 cp ../assim-xsession config/chroot_local-includes/usr/local/bin/
 cp ../diskmounter.sh config/chroot_local-includes/usr/local/bin/
-cp ../rc.local config/chroot_local-includes/etc/
-cp ../Xwrapper.config config/chroot_local-includes/etc/X11/
 sudo lh_build
 
diff --git a/id_rsa_mail b/id_rsa_mail
new file mode 100644
index 0000000..2b2f5a3
--- /dev/null
+++ b/id_rsa_mail
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAokOkZvgePVM50K/mU9kht0D5k2KTaHYwbjdO3yhX3Aq6ImbQ
+X0pKjYZH4XXhzlhXr5zrAfUsJ1lHVfez23Yg845EzvSt9GsWmo9KOlnDKwbz6kfK
+LADlo+yy2pTvb8sM1awiJsuVSosyT4c4l1cp/1MgoY2iYtqsl1Qr/q+dfnu+3Ypw
+vZvqtTEloKy426deUMbQgXjMYXqJopZaI5Z+ruBCtXaEGYxq2kGlkavd9m77DDZE
+soF5UKYMc0KOPCnYxlTbGQjBzj2PtiQnovpBjnvT3mtfyMj3JibpW6rdsjwAyrhb
+S9KV0B379SFjnuLF8bV4KPlRHi+gxLnrry+YFQIBIwKCAQEAmP3yx3w5xMrQHIiX
+Vl8CiDXyoOfqEgkJF3X56Fk85WkzJ8AGSzdq3TV2+SYAyd5EC/pZ6+cpoXFvJStg
+b9XHTAnL2RKVYstedHh5L7O4A/89v6LF7vmID5YHuCYGU3ZN7giyfFmMwqB/5JVv
+3yZMKz+/rkO2XTSUGaciKqWUfpBuCZA4c+yRGR800SfTi2v4h6oWqATnn9lIBWju
+aOmEKi+PoAkaDhVIibcuZB5bOx71lTYV3UWsDbvCh6K4bpRngQUvZfAibXhUpf2/
+aTdhg9S1DeZ63NnEDl+iFazzHfNfYvrkgtplZKzNz0ZU/sMnrLAbcLDkIrxaWRsX
+1tZHjwKBgQDQlqGMW1MiJPVvIwWt5PMC4Itww8i+ZOs3WU4iM4o/Dp7DZolsGh4I
+YrqdfzrWLApkftMMx89yQ+SZ8kxh+VBozpkO+cbDTwtTbpxMYlVW3Hxsdw9vt60P
+wbx0W3IStEY0SijF1l8vaXjrq5hoNqA4ltQbxZcUdIofx3f5Rsy7xwKBgQDHJX55
+9tmEATmlQrrdBb32wVCsj11G3qjfHMGnr1Kj76JynW8Tous0kCHW3o7lF1NEgoby
+Lo7ruF8oECLNf/36buTX6XHZ+5OU7NAQPag9c8C25ECzk3rCHt49dN5zzq3bsrvJ
+4ujb1RSTGF1q9TWCTmSkIiqBAO1AMiU2NvP1QwKBgBfWs2B/dzcaKq2dmj/CZOpi
+zhuEFvEwGuHBED5sSlBZcTrnJaX0WzQoilske8C0k3kzEM5CuJ9YN2INEAsyb5bz
+Ci2Y44QJCJvSIH3CGGGyzGQq3TFW0fMsFYmkDQlzsEB9gQCqyQy7mMp6AsoU3xxp
+AkxRGJSfmsHNp0+wUemTAoGAZmsN2FMQx4uZ/ThC2BGU5U158lhb203wcr5U9yb3
+TP7l1It69CfmrVFwfSIAWI+nKoxFZpuZ9ZIFDUoghvFeC8QAqY4ACbSVCsLuqURH
+5Rb1ZV9xu3BrBL9q+wjnbsIQRRoXbyQ9PdtMaOf1h3bLD9CLh5yK40JOIQPYn4n5
+zpcCgYEAggU/bNFeyZ1f0GdCeh+cqpzZK+4mz0yWG3DC0AD71PG7+pubv3NOgWjT
+XmeqnG6nFQFVT/d/6uiZQh2EY/x+ULGWzTOiIBauObSmLDm0JVDAjKTEGdkGo0Ly
+ABix3HywS23ntJQKu5DP7Q3/lDP7dKlwtuZdU9WkfBKQyZl1meo=
+-----END RSA PRIVATE KEY-----
diff --git a/id_rsa_mail.pub b/id_rsa_mail.pub
new file mode 100644
index 0000000..50a056e
--- /dev/null
+++ b/id_rsa_mail.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAokOkZvgePVM50K/mU9kht0D5k2KTaHYwbjdO3yhX3Aq6ImbQX0pKjYZH4XXhzlhXr5zrAfUsJ1lHVfez23Yg845EzvSt9GsWmo9KOlnDKwbz6kfKLADlo+yy2pTvb8sM1awiJsuVSosyT4c4l1cp/1MgoY2iYtqsl1Qr/q+dfnu+3YpwvZvqtTEloKy426deUMbQgXjMYXqJopZaI5Z+ruBCtXaEGYxq2kGlkavd9m77DDZEsoF5UKYMc0KOPCnYxlTbGQjBzj2PtiQnovpBjnvT3mtfyMj3JibpW6rdsjwAyrhbS9KV0B379SFjnuLF8bV4KPlRHi+gxLnrry+YFQ== submit mail to Sascha Silbe
diff --git a/remotes b/remotes
new file mode 100644
index 0000000..2d5fb9b
--- /dev/null
+++ b/remotes
@@ -0,0 +1 @@
+setoy.chost.de ssh-sendmail -- -l sascha -i /etc/nullmailer/id_rsa_mail
diff --git a/ssh-sendmail b/ssh-sendmail
new file mode 100755
index 0000000..c2e762e
--- /dev/null
+++ b/ssh-sendmail
@@ -0,0 +1,70 @@
+#!/bin/bash
+# arch-tag: 3d2f498c-aba5-4400-a867-0fc7bcc8623e
+# interface:
+# CLI: ssh-sendmail <remoteHost> <options>
+# Ubuntu uses "ssh-sendmail -d -s <remoteHost> <options>" instead
+# stdin:
+# <envelope sender address>
+# <rcpt address 1>
+# <rcpt address 2>
+# <rcpt address ...>
+# <empty line>
+# <mail incl. headers>
+#
+# stdout:
+# ssh-sendmail: (Failed: <error message>|Succeeded: <remote accept message>)
+#
+# exit code:
+# 0 successful
+# error code otherwise (see nullmailer source for details)
+
+myName="`basename \"${0}\"`"
+
+# skip nullmailer options
+while [ $# -gt 0 -a "${1}" != "--" ] ; do
+  shift
+done
+if [ $# -gt 0 ] ; then
+  shift
+fi
+
+remoteHost="${1}"
+
+printSyntax() {
+  cat << EOT
+Syntax: ${myName} <ssh-options> <remoteHost> 
+Sample: ${myName} mail.sascha.silbe.org -l alias -i /etc/nullmailer/id_dsa
+EOT
+  exit 1
+}
+
+getEnvelope() {
+  read envSender
+  envRcpts=""
+  
+  read curLine
+  while [ -n "${curLine}" ] ; do
+    # FIXME: curLine might contain malicious chars
+    envRcpts="${envRcpts} ${curLine}"
+    read curLine
+  done
+}
+
+sendMail() {
+  # reads mail from stdin
+  if sshOutput="`ssh \"${@}\" /usr/lib/sendmail -f \"${envSender}\" ${envRcpts} 2>&1`" ; then
+    echo "${myName}: Succeeded: ${sshOutput}"
+    exit 0
+  else
+    echo "${myName}: Failed: ${sshOutput}"
+    # temporary error
+    exit 17
+  fi
+}
+
+if [ -z "${1}" ] ; then
+  printSyntax
+fi
+getEnvelope
+sendMail "$@"
+
diff --git a/ssh_known_hosts b/ssh_known_hosts
new file mode 100644
index 0000000..eeb649e
--- /dev/null
+++ b/ssh_known_hosts
@@ -0,0 +1 @@
+setoy.chost.de,217.160.209.225,2001:8d8:80:11::21d ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAnrBjCicOM4L5tOJjRKOdZ+2Vbi1R2+lwnoYUkpTqA7Dzt2H3NUGxBv3nOcpxI7NZ2OKNmSA5eb6H23r8S02ahqIwG1mItv2k7qCfDGY3oX5Kw/xxqJTRAjixaet4gUz0yY1nbVod+iUZ27vNFZuNNukR6jj0JW9/3BmbpWvXGpc=