diff --git a/src/freedombone-backup-local b/src/freedombone-backup-local index 4d0974da..f8b67cd6 100755 --- a/src/freedombone-backup-local +++ b/src/freedombone-backup-local @@ -345,7 +345,7 @@ function backup_directories { "none, none, /var/lib/dokuwiki, wiki" "none, none, /etc/dokuwiki, wiki2" "none, none, /etc/ssl, ssl" - "/etc/share/ttrss, ttrss, /root/tempttrssdata, ttrss" + "/etc/share/tt-rss, ttrss, /root/tempttrssdata, ttrss" "none, none, /var/spool/mlmmj, mailinglist" "none, none, /var/lib/prosody, xmpp" "none, none, /etc/nginx/sites-available, web" diff --git a/src/freedombone-backup-remote b/src/freedombone-backup-remote index e2c9a5b1..24ab2954 100755 --- a/src/freedombone-backup-remote +++ b/src/freedombone-backup-remote @@ -264,12 +264,12 @@ function backup_tor { function backup_rss_reader { if grep -q "RSS reader domain" $COMPLETION_FILE; then RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}') - if [ -d /etc/share/ttrss ]; then + if [ -d /etc/share/tt-rss ]; then suspend_site ${RSS_READER_DOMAIN_NAME} backup_database_to_friend ttrss backup_directory_to_friend /root/tempttrssdata ttrssdata echo $"Backing up RSS reader installation" - backup_directory_to_friend /etc/share/ttrss ttrss + backup_directory_to_friend /etc/share/tt-rss ttrss restart_site else echo $"RSS reader domain specified but not found in /etc/share/ttrss}" diff --git a/src/freedombone-restore-local b/src/freedombone-restore-local index 58fe6825..0636b22c 100755 --- a/src/freedombone-restore-local +++ b/src/freedombone-restore-local @@ -188,10 +188,10 @@ function restore_database { if [ ${2} ]; then # special handline of ttrss if [[ ${2} == "ttrss" ]]; then - if [ -d /etc/share/${2} ]; then - if [ -d /root/temp${1}/etc/share/${2} ]; then - rm -rf /etc/share/${2} - mv /root/temp${1}/etc/share/${2} /etc/share/ + if [ -d /etc/share/tt-rss ]; then + if [ -d /root/temp${1}/etc/share/tt-rss ]; then + rm -rf /etc/share/tt-rss + mv /root/temp${1}/etc/share/tt-rss /etc/share/ if [ ! "$?" = "0" ]; then unmount_drive exit 528 @@ -731,7 +731,7 @@ function restore_rss_reader { if [ $RSS_READER_DOMAIN_NAME ]; then restore_database ttrss ${RSS_READER_DOMAIN_NAME} if [ -d $USB_MOUNT/backup/ttrss ]; then - chown -R www-data:www-data /etc/share/ttrss + chown -R www-data:www-data /etc/share/tt-rss if [ -d /root/tempttrss ]; then rm -rf /root/tempttrss fi diff --git a/src/freedombone-restore-remote b/src/freedombone-restore-remote index 405f6ae6..3450ab04 100755 --- a/src/freedombone-restore-remote +++ b/src/freedombone-restore-remote @@ -128,9 +128,9 @@ function restore_database_from_friend { # special handling of ttrss if [[ ${2} == "ttrss" ]]; then - if [ -d /etc/share/${2} ]; then - rm -rf /etc/share/${2} - mv /root/temp${1}/etc/share/${2} /etc/share/ + if [ -d /etc/share/tt-rss ]; then + rm -rf /etc/share/tt-rss + mv /root/temp${1}/etc/share/tt-rss /etc/share/ if [ ! "$?" = "0" ]; then exit 639 fi @@ -606,7 +606,7 @@ function restore_rss_reader { RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}') restore_database_from_friend ttrss ${RSS_READER_DOMAIN_NAME} if [ -d $SERVER_DIRECTORY/backup/ttrss ]; then - chown -R www-data:www-data /etc/share/ttrss + chown -R www-data:www-data /etc/share/tt-rss fi if [ -d /root/tempttrss ]; then rm -rf /root/tempttrss