sign-ca.in: mostly revert 96826744, it was right(er) before

1 files changed, 7 insertions, 7 deletions

diff --git a/sign-ca.in b/sign-ca.in
index 6ac277d..4448be4 100755
--- a/sign-ca.in
+++ b/sign-ca.in
@@ -33,15 +33,15 @@ move_old_ca() {
 }
 
 level_ground_for_new_ca() {
-  install -d -m0755 '#ETCDIR#/'"$1"'/ca/'"$1"'/db'
-  install -d -m0700 '#ETCDIR#/'"$1"'/ca/'"$1"'/private'
+  install -d -m0755 '#ETCDIR#/simple-pki/ca/'"$1"'/db'
+  install -d -m0700 '#ETCDIR#/simple-pki/ca/'"$1"'/private'
   touch \
-    '#ETCDIR#/'"$1"'/ca/'"$1"'/db/'"$1"'.db' \
-    '#ETCDIR#/'"$1"'/ca/'"$1"'/db/'"$1"'.db.attr'
+    '#ETCDIR#/simple-pki/ca/'"$1"'/db/'"$1"'.db' \
+    '#ETCDIR#/simple-pki/ca/'"$1"'/db/'"$1"'.db.attr'
   for srl in 'crl' 'crt'; do
-    old='#ETCDIR#/'"$1"'.old/ca/'"$1"'/db/'"$1"'.old.'"${srl}"'.srl'
-    new='#ETCDIR#/'"$1"'/ca/'"$1"'/db/'"$1"'.'"${srl}"'.srl'
-    if [ ! -f "${old}" ]; then
+    old='#ETCDIR#/simple-pki/ca/'"$1"'.old/db/'"$1"'.old.'"${srl}"'.srl'
+    new='#ETCDIR#/simple-pki/ca/'"$1"'/db/'"$1"'.'"${srl}"'.srl'
+    if [ -f "${old}" ]; then
       cp "${old}" "${new}"
     else
       echo '01' \