Add SSH key login support to IK terminals. Re-arrange config templates.

11 files changed, 21 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 430911a..63a3b7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ internet-kiosk (0.0.2-0~edu1) UNRELEASED; urgency=low
     - Provide a README.hostname file in doc folder of internet-kiosk-management.
     - Remove info lin in ik_shell about disabled service restarts. Service restarts
       are now possible during chroot maintenance.
+    - Add SSH key login support to IK terminals. Re-arrange config templates.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Tue, 21 Aug 2012 18:14:02 +0200
 
diff --git a/debian/internet-kiosk-management.install b/debian/internet-kiosk-management.install
index 3212f48..35e1d01 100644
--- a/debian/internet-kiosk-management.install
+++ b/debian/internet-kiosk-management.install
@@ -1,4 +1,4 @@
 internet-kiosk-management/sbin/ik_*                 usr/sbin/
 internet-kiosk-management/etc/ik_*                  etc/internet-kiosk
-internet-kiosk-management/share/ik_*                usr/share/internet-kiosk/
+internet-kiosk-management/share/etc                 usr/share/internet-kiosk/
 internet-kiosk-management/share/tftpboot            usr/share/internet-kiosk/
diff --git a/debian/internet-kiosk.examples b/debian/internet-kiosk.examples
index c41f891..39c99d2 100644
--- a/debian/internet-kiosk.examples
+++ b/debian/internet-kiosk.examples
@@ -1 +1 @@
-internet-kiosk-management/share/ik_*
+internet-kiosk-management/share/etc
diff --git a/debian/internet-kiosk.install b/debian/internet-kiosk.install
index 44afb08..2327f05 100644
--- a/debian/internet-kiosk.install
+++ b/debian/internet-kiosk.install
@@ -1,3 +1,4 @@
 internet-kiosk/etc/internet-kiosk                 etc/
 internet-kiosk/etc/iceweasel                      etc/
 internet-kiosk/sbin/internet-kiosk-daemon         usr/sbin/
+
diff --git a/internet-kiosk-management/sbin/ik_update b/internet-kiosk-management/sbin/ik_update
index f6aa9a5..e54412c 100755
--- a/internet-kiosk-management/sbin/ik_update
+++ b/internet-kiosk-management/sbin/ik_update
@@ -67,9 +67,13 @@ if test -f $IK_CONFIG/ik_start; then
 	chmod a+rx "$IK_CHROOT/etc/internet-kiosk/ik_start"
 fi
 
-if test -f $IK_CONFIG/ik_sessions; then
-	cp -v "$IK_CONFIG/ik_sessions" "$IK_CHROOT/etc/internet-kiosk/ik_sessions"
-	chmod a+rx "$IK_CHROOT/etc/internet-kiosk/ik_sessions"
+if test -f $IK_CONFIG/ssh-user/authorized_keys; then
+	cp -v "$IK_CONFIG/ssh-user/authorized_keys" "$IK_CHROOT/etc/internet-kiosk/ssh-user/authorized_keys"
+	chmod -Rf go-rwx "$IK_CHROOT/etc/internet-kiosk/ssh-user"
+fi
+if test -f $IK_CONFIG/ssh-root/authorized_keys; then
+	cp -v "$IK_CONFIG/ssh-root/authorized_keys" "$IK_CHROOT/etc/internet-kiosk/ssh-root/authorized_keys"
+	chmod -Rf go-rwx "$IK_CHROOT/etc/internet-kiosk/ssh-root"
 fi
 
 echo
diff --git a/internet-kiosk-management/share/ik_init b/internet-kiosk-management/share/etc/ik_init
index 6740b88..559bbcf 100755
--- a/internet-kiosk-management/share/ik_init
+++ b/internet-kiosk-management/share/etc/ik_init
@@ -18,7 +18,16 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
+# prepare account ,,internet-kiosk''
 mkdir -p /home/internet-kiosk
 mkdir -p /home/internet-kiosk/.mozilla
+mkdir -p /home/internet-kiosk/.ssh
+test -f /etc/internet-kiosk/ssh-user/authorized_keys && cp /etc/internet-kiosk/ssh-user/authorized_keys /home/internet-kiosk/.ssh
 chown internet-kiosk:internet-kiosk /home/internet-kiosk -Rf
 chmod go-rwx /home/internet-kiosk -Rf
+
+# prepare account ,,root''
+mkdir -p /root/.ssh
+test -f /etc/internet-kiosk/ssh-root/authorized_keys && cp /etc/internet-kiosk/ssh-root/authorized_keys /root/.ssh
+chown root:root /root -Rf
+chmod go-rwx /root -Rf
diff --git a/internet-kiosk-management/share/ik_start b/internet-kiosk-management/share/etc/ik_start
index 31918a6..31918a6 100755
--- a/internet-kiosk-management/share/ik_start
+++ b/internet-kiosk-management/share/etc/ik_start
diff --git a/internet-kiosk-management/share/ik_xmodmap b/internet-kiosk-management/share/etc/ik_xmodmap
index 83f1d69..83f1d69 100644
--- a/internet-kiosk-management/share/ik_xmodmap
+++ b/internet-kiosk-management/share/etc/ik_xmodmap
diff --git a/internet-kiosk-management/share/etc/ssh-root/authorized_keys b/internet-kiosk-management/share/etc/ssh-root/authorized_keys
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/internet-kiosk-management/share/etc/ssh-root/authorized_keys
diff --git a/internet-kiosk-management/share/etc/ssh-user/authorized_keys b/internet-kiosk-management/share/etc/ssh-user/authorized_keys
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/internet-kiosk-management/share/etc/ssh-user/authorized_keys
diff --git a/internet-kiosk/etc/internet-kiosk/README.unconfigured b/internet-kiosk/etc/internet-kiosk/README.unconfigured
index e6f39f3..22c19e4 100644
--- a/internet-kiosk/etc/internet-kiosk/README.unconfigured
+++ b/internet-kiosk/etc/internet-kiosk/README.unconfigured
@@ -21,7 +21,7 @@ you install Internet Kiosk on.
 To create a default configuration for Internet Kiosk, please run the
 below copy command and modify the copied files to your needs:
 
- $ sudo cp -av /usr/share/internet-kiosk/ik_* /etc/internet-kiosk/
+ $ sudo cp -av /usr/share/doc/internet-kiosk/examples/etc/* /etc/internet-kiosk/
 
 3.
 After that, start the Internet Kiosk Daemon: