adding new CLI Command (--cleanupdelete / -gcd) to cleanup+delete (instead of just moving to /archive) (closes #587)

dehydrated

@@ -1855,10 +1855,12 @@ command_cleanup() {
     load_config
   fi
 
+  if [[ ! "${PARAM_CLEANUPDELETE:-}" = "yes" ]]; then
     # Create global archive directory if not existent
     if [[ ! -e "${BASEDIR}/archive" ]]; then
       mkdir "${BASEDIR}/archive"
     fi
+  fi
 
   # Allow globbing
   [[ -n "${ZSH_VERSION:-}" ]] && set +o noglob || set +f
@@ -1872,10 +1874,12 @@ command_cleanup() {
     certname="$(basename "${certdir}")"
 
     # Create certificates archive directory if not existent
+    if [[ ! "${PARAM_CLEANUPDELETE:-}" = "yes" ]]; then
       archivedir="${BASEDIR}/archive/${certname}"
       if [[ ! -e "${archivedir}" ]]; then
         mkdir "${archivedir}"
       fi
+    fi
 
     # Loop over file-types (certificates, keys, signing-requests, ...)
     for filetype in cert.csr cert.pem chain.pem fullchain.pem privkey.pem ocsp.der; do
@@ -1899,10 +1903,16 @@ command_cleanup() {
       for file in "${certdir}/${filebase}-"*".${fileext}" "${certdir}/${filebase}-"*".${fileext}-revoked"; do
         # Check if current file is in use, if unused move to archive directory
         filename="$(basename "${file}")"
-        if [[ ! "${filename}" = "${current}" ]]; then
+        if [[ ! "${filename}" = "${current}" ]] && [[ -f "${certdir}/${filename}" ]]; then
+          echo "${filename}"
+          if [[ "${PARAM_CLEANUPDELETE:-}" = "yes" ]]; then
+            echo "Deleting unused file: ${certname}/${filename}"
+            rm "${certdir}/${filename}"
+          else
             echo "Moving unused file to archive directory: ${certname}/${filename}"
             mv "${certdir}/${filename}" "${archivedir}/${filename}"
           fi
+        fi
       done
     done
   done
@@ -1910,6 +1920,13 @@ command_cleanup() {
   exit "${exit_with_errorcode}"
 }
 
+# Usage: --cleanup-delete (-gcd)
+# Description: Deletes (!) unused certificate files
+command_cleanupdelete() {
+  command_cleanup
+}
+
+
 # Usage: --help (-h)
 # Description: Show help text
 command_help() {
@@ -2022,6 +2039,11 @@ main() {
         set_command cleanup
         ;;
 
+      --cleanup-delete|-gcd)
+        set_command cleanupdelete
+        PARAM_CLEANUPDELETE="yes"
+        ;;
+
       # PARAM_Usage: --full-chain (-fc)
       # PARAM_Description: Print full chain when using --signcsr
       --full-chain|-fc)
@@ -2186,6 +2208,7 @@ main() {
     deactivate) command_deactivate;;
     cleanup) command_cleanup;;
     terms) command_terms;;
+    cleanupdelete) command_cleanupdelete;;
     version) command_version;;
     *) command_help; exit 1;;
   esac