tt-rss

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"

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}"

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

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