ed25519 support

My attempt to get ed25519 support for the doors in the script.
Please check function and syntax!

README.md

@@ -29,6 +29,19 @@ Der Deamon besteht aus folgenden Dateien.
 * foodoor-ssh-wrapper
 * foodoor-update-keydb
 
+Zusätzlich sollte für das git-repo eine Config angelegt werden: 
+
+/root/.ssh/config
+```
+Host git.chaospott.de
+  User git
+  Port 2222
+  IdentityFile ~/.ssh/id_chaospott
+```
+
+Das IdentityFile ist der Deploy-SSH-Key, der im [Repo](https://git.chaospott.de/Chaospott/foodoor-keys) hinterlegt ist.
+
+
 ##Schüssel
 
 ###Schlüsselupdate

debian/changelog

@@ -1,11 +0,0 @@
-foodoord (2-1~foobar1) UNRELEASED; urgency=medium
-
-  * New upstream release.
-
- -- Hauro <hauro@chaospott.de>  Fri, 17 Jul 2015 20:10:27 +0200
-
-foodoord (1-1~foobar1) unstable; urgency=low
-
-  * Initial release.
-
- -- gammlaa <gammlaa@chaospott.de>  Sat, 04 Apr 2015 16:19:46 +0100

debian/compat

@@ -1 +0,0 @@
-9

debian/control

@@ -1,15 +0,0 @@
-Source: foodoord
-Section: net
-Priority: optional
-Maintainer: gammlaa <gammlaa@chaospott.de>
-Build-Depends: debhelper (>= 9), dh-python, python
-Standards-Version: 3.9.6
-Homepage: https://github.com/c3e/foodoord
-
-Package: foodoord
-Architecture: all
-X-Python-Version: any
-Depends: ${misc:Depends}, adduser, python-pifacedigitalio
-Description: Türschließsystem des foobar e.V.
- Simsalabim!
-

debian/copyright

@@ -1,38 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: foodoord
-Source: <url://example.com>
-
-Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
-
-# If you want to use GPL v2 or later for the /debian/* files use 
-# the following clauses, or change it to suit. Delete these two lines
-Files: debian/*
-Copyright: 2014 gammlaa <gammlaa@chaospott.de>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.

debian/foodoord.cron.d

@@ -1 +0,0 @@
-*/5 * * * * root [ -x /usr/sbin/foodoor-update-keydb ] && /usr/sbin/foodoor-update-keydb >/dev/null 2>&1

debian/foodoord.install

@@ -1,5 +0,0 @@
-foodoord.conf		etc
-foodoor			usr/sbin
-foodoord		usr/sbin
-foodoor-ssh-wrapper	usr/sbin
-foodoor-update-keydb	usr/sbin

debian/foodoord.preinst

@@ -1,38 +0,0 @@
-#!/bin/sh
-# preinst script for foodoord
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    install|upgrade)
-        addgroup --system foodoor
-        adduser --system --ingroup foodoor --home /var/lib/foodoor/open --disabled-password --disabled-login open
-        adduser --system --ingroup foodoor --home /var/lib/foodoor/close --disabled-password --disabled-login close
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

debian/rules

@@ -1,12 +0,0 @@
-#!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#DH_VERBOSE = 1
-
-%:
-	dh $@ --with=python2
-
-override_dh_installinit:
-	mkdir debian/foodoord/etc/init.d
-	cp foodoord_initd debian/foodoord/etc/init.d/foodoord
-	dh_installinit --onlyscripts

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

foodoor-update-keydb

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 
 export PATH="/usr/bin:/bin:/usr/sbin:/sbin"
@@ -9,7 +9,7 @@ dest=/var/run/foodoor-keys
 if [ ! -e "${dest}/.git/config" ]
 then
     #echo "Repo does not exist, trying to clone..."
-    ( cd /var/run && git clone --quiet --single-branch --depth=1 luftschleuse@nordstern.chaospott.de:/home/luftschleuse/foodoor-keys "${dest}" )
+    ( cd /var/run && git clone --quiet --single-branch --depth=1 ssh://git.chaospott.de/Chaospott/foodoor-keys.git "${dest}" )
 else
     #echo "Repo exists, updating..."
     ( cd "${dest}" && git fetch --quiet && git merge --quiet origin/master master )
@@ -22,10 +22,13 @@ do
     find "${dest}/keys" -name '*.pub' | sort | \
         while read keyfile
         do
-            valid_key=$(ssh-keygen -l -f ${keyfile})
+			ssh-keygen -l -f ${keyfile} &> /dev/null
-            if [ "$?" -eq "0" ]; then
+			if [ $? -eq 0 ]; then
-                if [ $(echo "${valid_key}" | cut -d" " -f1) -lt "4096" ]; then
+				key_length=`ssh-keygen -l -f ${keyfile} | cut -d" " -f1`
-                    echo "Size of key ${keyfile} is less than 4096. Not adding it to key database." >&2
+				if ssh-keygen -l -f id_ed25519.pub| cut -d" " -f4 == "(ED25519)"; then
+					key_length += 3840
+				if [ ${key_length} -lt 4096 ]; then
+                    echo "Key size of key ${keyfile} not equal to 4096. Not adding it to key database." >&2
                     continue
                 fi
             fi