diff options
author | Adrian Likins <alikins@grimlock.devel.redhat.com> | 2007-12-18 14:22:44 -0500 |
---|---|---|
committer | Adrian Likins <alikins@grimlock.devel.redhat.com> | 2007-12-18 14:22:44 -0500 |
commit | 7edb958265ec80fef5ab212dde58dc2d03507870 (patch) | |
tree | 04739ea67359021ea504ea35fc535248f425101d /test/test-it.sh | |
parent | caf1eb0a4f77a81556a2d8c54fd5b7984a2817cd (diff) | |
download | third_party-func-7edb958265ec80fef5ab212dde58dc2d03507870.tar.gz third_party-func-7edb958265ec80fef5ab212dde58dc2d03507870.tar.xz third_party-func-7edb958265ec80fef5ab212dde58dc2d03507870.zip |
clean up /var/lib/func/certmaster as well
sleep a bit after starting up funcd so the certs show up in certmaster-ca -l
Diffstat (limited to 'test/test-it.sh')
-rwxr-xr-x | test/test-it.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/test/test-it.sh b/test/test-it.sh index fd2051b..e90b1f1 100755 --- a/test/test-it.sh +++ b/test/test-it.sh @@ -125,8 +125,8 @@ backup_the_secret_of_the_func() # whatever, this should probably be some standard date format # but I just wanted something sans spaces DATE=`date "+%F_%R"` - tar -c /etc/pki/func/* > func-pki-backup-$DATE.tar - + tar -c /etc/pki/func/* /var/lib/func/* > func-pki-backup-$DATE.tar + } #yes, I'm in a funny variable naming mood, I'll change them @@ -134,6 +134,7 @@ backup_the_secret_of_the_func() no_more_secrets() { rm -rf /etc/pki/func/* + rm -rf /var/lib/func/certmaster/* } find_certmaster_certs() @@ -142,6 +143,9 @@ find_certmaster_certs() STATUS=$? echo "certmaster found the following certs:" echo $MINION_CERTS + if [ "$MINION_CERTS" == "No certificates to sign" ] ; then + MINION_CERTS="" + fi } sign_the_certmaster_certs() @@ -183,11 +187,13 @@ if [ "$BACKUP_FUNC_PKI" == "Y" ] ; then fi # remove any existing keys -#no_more_secrets +no_more_secrets # test start up of init scripts start_the_func +sleep 5 + find_certmaster_certs sign_the_certmaster_certs |