diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial index 01dcdd90cfcb84d34a1fdb1b921367b9a925638a..af3c5ab70f4acfd9e97c21a2e5502ca8c0b663ef 100755 --- a/src/freedombone-app-gnusocial +++ b/src/freedombone-app-gnusocial @@ -490,6 +490,7 @@ function remove_gnusocial { rm /etc/cron.hourly/gnusocial-daemons fi sed -i '/Gnusocial/d' /home/$MY_USERNAME/README + remove_backup_database_local gnusocial } function install_gnusocial_main { diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs index 72a7a07350e3a872c33b1ec8c0a0638df9b37c65..3e05306ddcbf4a6bf81fb0219cc30a3f04191d7d 100755 --- a/src/freedombone-app-gogs +++ b/src/freedombone-app-gogs @@ -351,6 +351,7 @@ function remove_gogs { remove_onion_service gogs ${GIT_ONION_PORT} 9418 remove_completion_param "install_gogs" sed -i '/gogs /d' $COMPLETION_FILE + remove_backup_database_local gogs } function install_gogs { diff --git a/src/freedombone-app-postactiv b/src/freedombone-app-postactiv index f75aaa634cd076ad46f1e86f37444381b52adb0b..77d297c3e3d061ca99ece2d173d0f9a3d7d7a479 100755 --- a/src/freedombone-app-postactiv +++ b/src/freedombone-app-postactiv @@ -334,6 +334,7 @@ function remove_postactiv { rm /etc/cron.hourly/postactiv-daemons fi sed -i '/Postactiv/d' /home/$MY_USERNAME/README + remove_backup_database_local postactiv } function install_postactiv_main { diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss index 13243ababe864c0ab20d6a0d49ee89149970c57e..dd0ccd2517627c661a114b7db0a842373f23247d 100755 --- a/src/freedombone-app-rss +++ b/src/freedombone-app-rss @@ -268,6 +268,7 @@ function remove_rss { sed -i '/RSS /d' $COMPLETION_FILE sed -i '/rss /d' $COMPLETION_FILE sed -i '/RSS reader/d' /home/$MY_USERNAME/README + remove_backup_database_local ttrss } function rss_modifications { diff --git a/src/freedombone-utils-database b/src/freedombone-utils-database index c4688319b877406d02652849d4b133da038d94c8..13a7e3fd572d1efafa08d508ed2303beb1812579 100755 --- a/src/freedombone-utils-database +++ b/src/freedombone-utils-database @@ -38,6 +38,15 @@ BACKUP_INCLUDES_DATABASES="no" # is used for backups and repair DATABASE_PASSWORD_FILE=/root/dbpass +function remove_backup_database_local { + database_name=$1 + + sed -i "/# Backup the ${database_name} database/,/# End of ${database_name} database backup/d" /usr/bin/backupdatabases + sed -i "/# Backup ${database_name}/,/# End of backup for ${database_name}/d" /etc/cron.weekly/backupdatabasesweekly + sed -i "/# Backup ${database_name}/,/# End of backup for ${database_name}/d" /etc/cron.monthly/backupdatabasesmonthly + sed -i "/${database_name}/d" /etc/cron.hourly/repair +} + function backup_database_local { # Makes local backups of databases which can then be automatically rolled # back if corruption is detected