gpg agent for root
This commit is contained in:
parent
c2e0f68541
commit
a34b251cb9
|
@ -373,6 +373,7 @@ if [[ $1 == "remove" ]]; then
|
||||||
remove_option=$1
|
remove_option=$1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
gpg_agent_setup root
|
||||||
backup_mount_drive $1 $2
|
backup_mount_drive $1 $2
|
||||||
remove_backup_directory $remove_option
|
remove_backup_directory $remove_option
|
||||||
make_backup_directory
|
make_backup_directory
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
# License
|
# License
|
||||||
# =======
|
# =======
|
||||||
#
|
#
|
||||||
# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
|
# Copyright (C) 2015-2018 Bob Mottram <bob@freedombone.net>
|
||||||
#
|
#
|
||||||
# This program is free software: you can redistribute it and/or modify
|
# This program is free software: you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU Affero General Public License as published by
|
# it under the terms of the GNU Affero General Public License as published by
|
||||||
|
@ -430,6 +430,7 @@ if [[ "$1" == "test" ]]; then
|
||||||
TEST_MODE="yes"
|
TEST_MODE="yes"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
gpg_agent_setup root
|
||||||
backup_configfiles
|
backup_configfiles
|
||||||
if [[ $TEST_MODE == "no" ]]; then
|
if [[ $TEST_MODE == "no" ]]; then
|
||||||
backup_blocklist
|
backup_blocklist
|
||||||
|
|
|
@ -956,6 +956,7 @@ backup_mount_drive ${1} ${ADMIN_USERNAME} ${2}
|
||||||
check_backup_exists
|
check_backup_exists
|
||||||
check_admin_user
|
check_admin_user
|
||||||
copy_gpg_keys
|
copy_gpg_keys
|
||||||
|
gpg_agent_setup root
|
||||||
restore_blocklist
|
restore_blocklist
|
||||||
restore_configfiles
|
restore_configfiles
|
||||||
same_admin_user
|
same_admin_user
|
||||||
|
|
|
@ -857,6 +857,7 @@ function restore_email {
|
||||||
${PROJECT_NAME}-recoverkey -u ${ADMIN_USERNAME} -l $BACKUP_LIST
|
${PROJECT_NAME}-recoverkey -u ${ADMIN_USERNAME} -l $BACKUP_LIST
|
||||||
|
|
||||||
copy_gpg_keys
|
copy_gpg_keys
|
||||||
|
gpg_agent_setup root
|
||||||
restore_blocklist
|
restore_blocklist
|
||||||
restore_configfiles
|
restore_configfiles
|
||||||
restore_passwordstore
|
restore_passwordstore
|
||||||
|
|
Loading…
Reference in New Issue