summaryrefslogtreecommitdiff
path: root/internet-kiosk-management
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-10-22 09:33:51 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-10-22 09:33:51 +0200
commit471e2bd23eb412bca387ab719e1dac0e7b326192 (patch)
tree8f909bf507a60b6b86a46059c8fe0ab312234a51 /internet-kiosk-management
parentf7c6cef9f328c4bcfd3ce2ae62f1e47523218de8 (diff)
downloadinternet-kiosk-471e2bd23eb412bca387ab719e1dac0e7b326192.tar.gz
internet-kiosk-471e2bd23eb412bca387ab719e1dac0e7b326192.tar.bz2
internet-kiosk-471e2bd23eb412bca387ab719e1dac0e7b326192.zip
Add SSH key login support to IK terminals. Re-arrange config templates.
Diffstat (limited to 'internet-kiosk-management')
-rwxr-xr-xinternet-kiosk-management/sbin/ik_update10
-rwxr-xr-xinternet-kiosk-management/share/etc/ik_init (renamed from internet-kiosk-management/share/ik_init)9
-rwxr-xr-xinternet-kiosk-management/share/etc/ik_start (renamed from internet-kiosk-management/share/ik_start)0
-rw-r--r--internet-kiosk-management/share/etc/ik_xmodmap (renamed from internet-kiosk-management/share/ik_xmodmap)0
-rw-r--r--internet-kiosk-management/share/etc/ssh-root/authorized_keys0
-rw-r--r--internet-kiosk-management/share/etc/ssh-user/authorized_keys0
6 files changed, 16 insertions, 3 deletions
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