1.2.9

md-message

@@ -11,36 +11,73 @@ MSG="$1"
 DOMAIN="$2"
 
 mkdir -p $MD_RENEWED_DIR
-mkdir -p $MD_RENEWED_DIR/{ready,renewing,renewed,installed,expiring,errored,ocsp-renewed,oscp-errored}
+mkdir -p $MD_RENEWED_DIR/{renewing,renewed,installed,expiring,errored,ocsp-renewed,oscp-errored}
 
 case $1 in
     renewing)
+      if [[ ! -d $MD_RENEWED_DIR/renewing ]]; then
+        mkdir -p $MD_RENEWED_DIR/renewing
+      fi
       if [[ -f $MD_RENEWED_DIR/renewing/$DOMAIN ]]; then
         exit 1
       fi
-      hostname > $MD_RENEWED_DIR/renewing/$DOMAIN
+      echo $(date) $(hostname) > $MD_RENEWED_DIR/renewing/$DOMAIN
       ;;
     renewed)
-      rm -f $MD_RENEWED_DIR/renewing/$DOMAIN
-      hostname > $MD_RENEWED_DIR/renewed/$DOMAIN
-      hostname > $MD_RENEWED_DIR/ready/$DOMAIN
+      if [[ ! -d $MD_RENEWED_DIR/renewed ]]; then
+        mkdir -p $MD_RENEWED_DIR/renewed
+      fi
+      if [[ -f $MD_RENEWED_DIR/renewing/$DOMAIN ]]; then
+        rm -f $MD_RENEWED_DIR/renewing/$DOMAIN
+      fi
+      if [[ -z $MD_RENEWED_HOST_DIR ]]; then
+        echo $(date) $(hostname) > $MD_RENEWED_DIR/renewed/$DOMAIN
+      else
+        mkdir -p $MD_RENEWED_DIR/renewed/$MD_RENEWED_HOST_DIR
+        for f in $MD_RENEWED_DIR/renewed/*/; do
+          if [[ ! -d "$f" ]]; then
+            continue
+          fi
+          echo $(date) $(hostname) > ${f}${DOMAIN}
+        done
+      fi
       ;;
     installed)
-      rm -f $MD_RENEWED_DIR/renewing/$DOMAIN
-      hostname > $MD_RENEWED_DIR/installed/$DOMAIN
+      DEST=$MD_RENEWED_DIR/installed
+      if [[ ! -d $DEST ]]; then
+        mkdir -p $DEST
+      fi
+      if [[ ! -z $MD_RENEWED_HOST_DIR ]]; then
+        DEST=$MD_RENEWED_DIR/installed/$MD_RENEWED_HOST_DIR
+        mkdir -p $DEST
+      fi
+      mkdir -p $DEST
+      echo $(date) $(hostname) > $DEST/$DOMAIN
       ;;
     expiring)
-      hostname > $MD_RENEWED_DIR/expiring/$DOMAIN
+      if [[ ! -d $MD_RENEWED_DIR/expiring ]]; then
+        mkdir -p $MD_RENEWED_DIR/expiring
+      fi
+      echo $(date) $(hostname) > $MD_RENEWED_DIR/expiring/$DOMAIN
       ;;
     errored)
+      if [[ ! -d $MD_RENEWED_DIR/errored ]]; then
+        mkdir -p $MD_RENEWED_DIR/errored
+      fi
       rm -f $MD_RENEWED_DIR/renewing/$DOMAIN
-      hostname > $MD_RENEWED_DIR/errored/$DOMAIN
+      echo $(date) $(hostname) > $MD_RENEWED_DIR/errored/$DOMAIN
       ;;
     ocsp-renewed)
-      hostname > $MD_RENEWED_DIR/ocsp-renewed/$DOMAIN
+      if [[ ! -d $MD_RENEWED_DIR/ocsp-renewed ]]; then
+        mkdir -p $MD_RENEWED_DIR/ocsp-renewed
+      fi
+      echo $(date) $(hostname) > $MD_RENEWED_DIR/ocsp-renewed/$DOMAIN
       ;;
     ocsp-errored)
-      hostname > $MD_RENEWED_DIR/ocsp-errored/$DOMAIN
+      if [[ ! -d $MD_RENEWED_DIR/ocsp-errored ]]; then
+        mkdir -p $MD_RENEWED_DIR/ocsp-errored
+      fi
+      echo $(date) $(hostname) > $MD_RENEWED_DIR/ocsp-errored/$DOMAIN
       ;;
 esac