domtool-readdcerts

diff --git a/Makefile b/Makefile
index 5a47071..c1fb6d3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -188,7 +188,7 @@ install: install_sos
        cp scripts/domtool-reset-local /usr/local/sbin/
        cp scripts/domtool-adduser /usr/local/bin/
        cp scripts/domtool-addcert /usr/local/bin/
        cp scripts/domtool-reset-local /usr/local/sbin/
        cp scripts/domtool-adduser /usr/local/bin/
        cp scripts/domtool-addcert /usr/local/bin/

-       cp scripts/domtool-addcert-daemon /usr/local/bin/
+       cp scripts/domtool-readdcerts /usr/local/bin/

        cp scripts/domtool-addacl /usr/local/bin/
        cp scripts/domtool-rmuser /usr/local/bin/
        cp scripts/domtool-admin-sudo /usr/local/bin/
        cp scripts/domtool-addacl /usr/local/bin/
        cp scripts/domtool-rmuser /usr/local/bin/
        cp scripts/domtool-admin-sudo /usr/local/bin/

diff --git a/scripts/domtool-addcert b/scripts/domtool-addcert
index 3fb6b82..0d23333 100755 (executable)
--- a/scripts/domtool-addcert
+++ b/scripts/domtool-addcert
@@ -6,14 +6,14 @@ if test -z "$USER"; then
        exit 1
 fi   
 
        exit 1
 fi   
 

-  KEYDIR=/afs/hcoop.net/common/etc/domtool/keys/$1
+  KEYDIR=/afs/hcoop.net/common/etc/domtool/keys/$USER

  KEYFILE=$KEYDIR/key.pem
  KEYFILE=$KEYDIR/key.pem

-CERTFILE=/afs/hcoop.net/common/etc/domtool/certs/$1.pem
+CERTFILE=/afs/hcoop.net/common/etc/domtool/certs/$USER.pem

   NEWREQ=~/.newreq.pem
      NEW=~/.new.pem
    KEYIN=~/.keyin
 
   NEWREQ=~/.newreq.pem
      NEW=~/.new.pem
    KEYIN=~/.keyin
 

-mkdir -p $KEYDIR
+mkdir $KEYDIR || echo Key directory already exists.

 openssl genrsa -out $KEYFILE
 chown -R domtool.domtool $KEYDIR
 fs sa $KEYDIR $USER read
 openssl genrsa -out $KEYFILE
 chown -R domtool.domtool $KEYDIR
 fs sa $KEYDIR $USER read

diff --git a/scripts/domtool-addcert-daemon b/scripts/domtool-addcert-daemon
deleted file mode 100755 (executable)
index 4cac202..0000000
--- a/scripts/domtool-addcert-daemon
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh -e
-
-USER="$1"
-if test -z "$USER"; then
-        echo Usage: domtool-addcert USERNAME
-        exit 1
-fi
-
-  KEYDIR=/afs/hcoop.net/common/etc/domtool/keys/$USER
- KEYFILE=$KEYDIR/key.pem
-CERTFILE=/afs/hcoop.net/common/etc/domtool/certs/$USER.pem
-  NEWREQ=~/.newreq.pem
-     NEW=~/.new.pem
-   KEYIN=~/.keyin
-
-mkdir $KEYDIR || echo Already exists
-openssl genrsa -out $KEYFILE
-chown -R domtool.domtool $KEYDIR
-echo "." >$KEYIN
-echo "." >>$KEYIN
-echo "." >>$KEYIN
-echo "." >>$KEYIN
-echo "." >>$KEYIN
-echo "$USER" >>$KEYIN
-echo "$USER@hcoop.net" >>$KEYIN
-echo "" >>$KEYIN
-echo "" >>$KEYIN
-openssl req -new -key $KEYFILE -out $NEWREQ -days 365 <$KEYIN
-rm $KEYIN
-cat $NEWREQ $KEYFILE >$NEW
-rm $NEWREQ
-openssl ca -batch -config /etc/domtool/openssl.cnf -policy policy_anything -out $CERTFILE -infiles $NEW
-rm $NEW
-chown domtool.domtool $CERTFILE

diff --git a/scripts/domtool-readdcerts b/scripts/domtool-readdcerts
new file mode 100755 (executable)
index 0000000..2d93579
--- /dev/null
+++ b/scripts/domtool-readdcerts
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+for i in `ls /afs/hcoop.net/common/etc/domtool/keys`; do
+    /usr/local/bin/domtool-addcert $i
+done;