|
@@ -540,6 +540,9 @@ RSS_READER_PATH=/etc/share/tt-rss
|
540
|
540
|
RSS_READER_GNUSOCIAL_REPO="https://github.com/bashrc/ttrss-gnusocial"
|
541
|
541
|
RSS_READER_GNUSOCIAL_COMMIT='8b92b8f5db7b0d12459c7bd86a50f48815efe642'
|
542
|
542
|
|
|
543
|
+# refresh gpg keys every few hours
|
|
544
|
+REFRESH_GPG_KEYS_HOURS=2
|
|
545
|
+
|
543
|
546
|
function show_help {
|
544
|
547
|
echo ''
|
545
|
548
|
echo $"${PROJECT_NAME} -c [configuration file]"
|
|
@@ -1076,6 +1079,9 @@ function read_configuration {
|
1076
|
1079
|
if [[ $CONFIGURATION_FILE != "/root/${PROJECT_NAME}.cfg" ]]; then
|
1077
|
1080
|
cp $CONFIGURATION_FILE /root/${PROJECT_NAME}.cfg
|
1078
|
1081
|
fi
|
|
1082
|
+ if grep -q "REFRESH_GPG_KEYS_HOURS" $CONFIGURATION_FILE; then
|
|
1083
|
+ REFRESH_GPG_KEYS_HOURS=$(grep "REFRESH_GPG_KEYS_HOURS" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
|
1084
|
+ fi
|
1079
|
1085
|
if grep -q "WEBMAIL_REPO" $CONFIGURATION_FILE; then
|
1080
|
1086
|
WEBMAIL_REPO=$(grep "WEBMAIL_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
1081
|
1087
|
fi
|
|
@@ -5307,6 +5313,13 @@ function configure_gpg {
|
5307
|
5313
|
echo 'configure_gpg' >> $COMPLETION_FILE
|
5308
|
5314
|
}
|
5309
|
5315
|
|
|
5316
|
+function refresh_gpg_keys {
|
|
5317
|
+ if ! grep -q "gpg --refresh-keys" /etc/crontab; then
|
|
5318
|
+ echo "0 */$REFRESH_GPG_KEYS_HOURS * * * $MY_USERNAME /usr/bin/gpg --refresh-keys > /dev/null" >> /etc/crontab
|
|
5319
|
+ systemctl restart cron
|
|
5320
|
+ fi
|
|
5321
|
+}
|
|
5322
|
+
|
5310
|
5323
|
function configure_backup_key {
|
5311
|
5324
|
if grep -Fxq "configure_backup_key" $COMPLETION_FILE; then
|
5312
|
5325
|
return
|
|
@@ -10741,6 +10754,7 @@ spam_filtering
|
10741
|
10754
|
configure_imap
|
10742
|
10755
|
#configure_imap_client_certs
|
10743
|
10756
|
configure_gpg
|
|
10757
|
+refresh_gpg_keys
|
10744
|
10758
|
configure_backup_key
|
10745
|
10759
|
install_monkeysphere
|
10746
|
10760
|
encrypt_incoming_email
|