nmav pushed to caml-crush (f22). "pkcs11proxyd-init -> pkcs11proxyd-softhsm-init"

[notifications at fedoraproject.org]

>From 8ce2334219b684e3dd75f4dda2017e6746eb7e35 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date: Thu, 2 Apr 2015 11:53:37 +0200
Subject: pkcs11proxyd-init -> pkcs11proxyd-softhsm-init


diff --git a/caml-crush.spec b/caml-crush.spec
index 7469e0e..dac0aec 100644
--- a/caml-crush.spec
+++ b/caml-crush.spec
@@ -17,7 +17,7 @@ Source2:        pkcs11proxyd.conf
 Source3:        pkcs11proxyd-softhsm.service
 Source4:        pkcs11proxyd-softhsm.module
 Source5:        softhsm.conf
-Source6:        pkcs11proxyd-init
+Source6:        pkcs11proxyd-softhsm-init
 Source8:        pkcs11.conf
 Source9:        softhsm.module
 Source10:       pkcs11proxyd-softhsm.conf
@@ -152,7 +152,7 @@ ln -s %{_sharedstatedir}/pkcs11proxyd/filter-softhsm-unlocked.conf %{buildroot}%
 %config(noreplace) %{_sysconfdir}/pkcs11proxyd/filter-softhsm.conf
 
 %files softhsm
-%{_sbindir}/pkcs11proxyd-init
+%{_sbindir}/pkcs11proxyd-softhsm-init
 %{_bindir}/pkcs11proxyd-softhsm-ctl
 %{_libdir}/pkcs11/libp11clientsofthsm.so
 %{_unitdir}/pkcs11proxyd-softhsm.service
diff --git a/pkcs11proxyd-init b/pkcs11proxyd-init
deleted file mode 100755
index f50da46..0000000
--- a/pkcs11proxyd-init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-SOFTHSM_UTIL=/usr/bin/softhsm2-util
-
-rm -f /var/run/pkcs11proxyd.socket
-
-if test -d /var/lib/pkcs11proxyd/tokens;then
-	logger -t pkcs11proxyd-init Tokens are already initialized
-	exit 0
-fi
-
-if test -e /etc/pkcs11proxyd/pins.txt;then
-	. /etc/pkcs11proxyd/pins.txt
-else
-	logger -t pkcs11proxyd-init Using random PIN and PUK
-	PIN=$RANDOM
-	PUK=$RANDOM$RANDOM
-	umask 066
-	printf "PIN=$PIN\nPUK=$PUK" >/etc/pkcs11proxyd/pins.txt
-fi
-
-
-su pkcs11proxyd -s /bin/sh -c "mkdir /var/lib/pkcs11proxyd/tokens; SOFTHSM2_CONF=/var/lib/pkcs11proxyd/softhsm.conf $SOFTHSM_UTIL --init-token --slot 0 --label \"System softtoken\" --so-pin $PUK --pin $PIN"
-if test $? != 0;then
-	logger -t pkcs11proxyd-init could not create new token
-	rmdir /var/lib/pkcs11proxyd/tokens
-	exit 1
-fi
-
-exit 0
diff --git a/pkcs11proxyd-softhsm-init b/pkcs11proxyd-softhsm-init
new file mode 100755
index 0000000..61d9283
--- /dev/null
+++ b/pkcs11proxyd-softhsm-init
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+SOFTHSM_UTIL=/usr/bin/softhsm2-util
+
+rm -f /var/run/pkcs11proxyd.socket
+
+if test -d /var/lib/pkcs11proxyd/tokens;then
+	logger -t pkcs11proxyd-softhsm-init Tokens are already initialized
+	exit 0
+fi
+
+if test -e /etc/pkcs11proxyd/pins.txt;then
+	. /etc/pkcs11proxyd/pins.txt
+else
+	logger -t pkcs11proxyd-softhsm-init Using random PIN and PUK
+	PIN=$RANDOM
+	PUK=$RANDOM$RANDOM
+	umask 066
+	printf "PIN=$PIN\nPUK=$PUK" >/etc/pkcs11proxyd/pins.txt
+fi
+
+
+su pkcs11proxyd -s /bin/sh -c "mkdir /var/lib/pkcs11proxyd/tokens; SOFTHSM2_CONF=/var/lib/pkcs11proxyd/softhsm.conf $SOFTHSM_UTIL --init-token --slot 0 --label \"System softtoken\" --so-pin $PUK --pin $PIN"
+if test $? != 0;then
+	logger -t pkcs11proxyd-softhsm-init could not create new token
+	rmdir /var/lib/pkcs11proxyd/tokens
+	exit 1
+fi
+
+exit 0
diff --git a/pkcs11proxyd-softhsm.service b/pkcs11proxyd-softhsm.service
index f510d5a..7fce5d9 100644
--- a/pkcs11proxyd-softhsm.service
+++ b/pkcs11proxyd-softhsm.service
@@ -8,7 +8,7 @@ After=network-online.target
 Environment="SOFTHSM2_CONF=/var/lib/pkcs11proxyd/softhsm.conf"
 PrivateTmp=true
 Type=simple
-ExecStartPre=/usr/sbin/pkcs11proxyd-init
+ExecStartPre=/usr/sbin/pkcs11proxyd-softhsm-init
 ExecStart=/usr/sbin/pkcs11proxyd -fg -conf /etc/pkcs11proxyd/pkcs11proxyd-softhsm.conf 
 UMask=0007
 Group=pkcs11proxy
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/caml-crush.git/commit/?h=f22&id=8ce2334219b684e3dd75f4dda2017e6746eb7e35