From 8cfa9c3a1883ba4162a68cd05a749eb8242133ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= Date: Wed, 18 May 2016 10:52:07 +0200 Subject: [PATCH] [fix] Ensure that index.txt CA database exists at SSL regen-conf --- data/hooks/conf_regen/02-ssl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/data/hooks/conf_regen/02-ssl b/data/hooks/conf_regen/02-ssl index 60acdbbbb..9f45f1554 100755 --- a/data/hooks/conf_regen/02-ssl +++ b/data/hooks/conf_regen/02-ssl @@ -68,6 +68,21 @@ do_pre_regen() { do_post_regen() { regen_conf_files=$1 + # Ensure that index.txt exists + index_txt=/usr/share/yunohost/yunohost-config/ssl/yunoCA/index.txt + [[ -f "${index_txt}" ]] || { + if [[ -f "${index_txt}.saved" ]]; then + # use saved database from 2.2 + sudo cp "${index_txt}.saved" "${index_txt}" + elif [[ -f "${index_txt}.old" ]]; then + # ... or use the state-1 database + sudo cp "${index_txt}.old" "${index_txt}" + else + # ... or create an empty one + sudo touch "${index_txt}" + fi + } + # TODO: regenerate certificates if conf changed? }