Bob Mottram 9 years ago
parent
commit
2ec7815e9e

+ 1
- 1
src/freedombone-backup-local View File

345
         "none,                               none,       /var/lib/dokuwiki,                               wiki"
345
         "none,                               none,       /var/lib/dokuwiki,                               wiki"
346
         "none,                               none,       /etc/dokuwiki,                                   wiki2"
346
         "none,                               none,       /etc/dokuwiki,                                   wiki2"
347
         "none,                               none,       /etc/ssl,                                        ssl"
347
         "none,                               none,       /etc/ssl,                                        ssl"
348
-        "/etc/share/ttrss,                   ttrss,      /root/tempttrssdata,                             ttrss"
348
+        "/etc/share/tt-rss,                  ttrss,      /root/tempttrssdata,                             ttrss"
349
         "none,                               none,       /var/spool/mlmmj,                                mailinglist"
349
         "none,                               none,       /var/spool/mlmmj,                                mailinglist"
350
         "none,                               none,       /var/lib/prosody,                                xmpp"
350
         "none,                               none,       /var/lib/prosody,                                xmpp"
351
         "none,                               none,       /etc/nginx/sites-available,                      web"
351
         "none,                               none,       /etc/nginx/sites-available,                      web"

+ 2
- 2
src/freedombone-backup-remote View File

264
 function backup_rss_reader {
264
 function backup_rss_reader {
265
     if grep -q "RSS reader domain" $COMPLETION_FILE; then
265
     if grep -q "RSS reader domain" $COMPLETION_FILE; then
266
         RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
266
         RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
267
-        if [ -d /etc/share/ttrss ]; then
267
+        if [ -d /etc/share/tt-rss ]; then
268
             suspend_site ${RSS_READER_DOMAIN_NAME}
268
             suspend_site ${RSS_READER_DOMAIN_NAME}
269
             backup_database_to_friend ttrss
269
             backup_database_to_friend ttrss
270
             backup_directory_to_friend /root/tempttrssdata ttrssdata
270
             backup_directory_to_friend /root/tempttrssdata ttrssdata
271
             echo $"Backing up RSS reader installation"
271
             echo $"Backing up RSS reader installation"
272
-            backup_directory_to_friend /etc/share/ttrss ttrss
272
+            backup_directory_to_friend /etc/share/tt-rss ttrss
273
             restart_site
273
             restart_site
274
         else
274
         else
275
             echo $"RSS reader domain specified but not found in /etc/share/ttrss}"
275
             echo $"RSS reader domain specified but not found in /etc/share/ttrss}"

+ 5
- 5
src/freedombone-restore-local View File

188
         if [ ${2} ]; then
188
         if [ ${2} ]; then
189
             # special handline of ttrss
189
             # special handline of ttrss
190
             if [[ ${2} == "ttrss" ]]; then
190
             if [[ ${2} == "ttrss" ]]; then
191
-                if [ -d /etc/share/${2} ]; then
192
-                    if [ -d /root/temp${1}/etc/share/${2} ]; then
193
-                        rm -rf /etc/share/${2}
194
-                        mv /root/temp${1}/etc/share/${2} /etc/share/
191
+                if [ -d /etc/share/tt-rss ]; then
192
+                    if [ -d /root/temp${1}/etc/share/tt-rss ]; then
193
+                        rm -rf /etc/share/tt-rss
194
+                        mv /root/temp${1}/etc/share/tt-rss /etc/share/
195
                         if [ ! "$?" = "0" ]; then
195
                         if [ ! "$?" = "0" ]; then
196
                             unmount_drive
196
                             unmount_drive
197
                             exit 528
197
                             exit 528
731
     if [ $RSS_READER_DOMAIN_NAME ]; then
731
     if [ $RSS_READER_DOMAIN_NAME ]; then
732
         restore_database ttrss ${RSS_READER_DOMAIN_NAME}
732
         restore_database ttrss ${RSS_READER_DOMAIN_NAME}
733
         if [ -d $USB_MOUNT/backup/ttrss ]; then
733
         if [ -d $USB_MOUNT/backup/ttrss ]; then
734
-            chown -R www-data:www-data /etc/share/ttrss
734
+            chown -R www-data:www-data /etc/share/tt-rss
735
             if [ -d /root/tempttrss ]; then
735
             if [ -d /root/tempttrss ]; then
736
                 rm -rf /root/tempttrss
736
                 rm -rf /root/tempttrss
737
             fi
737
             fi

+ 4
- 4
src/freedombone-restore-remote View File

128
 
128
 
129
             # special handling of ttrss
129
             # special handling of ttrss
130
             if [[ ${2} == "ttrss" ]]; then
130
             if [[ ${2} == "ttrss" ]]; then
131
-                if [ -d /etc/share/${2} ]; then
132
-                    rm -rf /etc/share/${2}
133
-                    mv /root/temp${1}/etc/share/${2} /etc/share/
131
+                if [ -d /etc/share/tt-rss ]; then
132
+                    rm -rf /etc/share/tt-rss
133
+                    mv /root/temp${1}/etc/share/tt-rss /etc/share/
134
                     if [ ! "$?" = "0" ]; then
134
                     if [ ! "$?" = "0" ]; then
135
                         exit 639
135
                         exit 639
136
                     fi
136
                     fi
606
         RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
606
         RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
607
         restore_database_from_friend ttrss ${RSS_READER_DOMAIN_NAME}
607
         restore_database_from_friend ttrss ${RSS_READER_DOMAIN_NAME}
608
         if [ -d $SERVER_DIRECTORY/backup/ttrss ]; then
608
         if [ -d $SERVER_DIRECTORY/backup/ttrss ]; then
609
-            chown -R www-data:www-data /etc/share/ttrss
609
+            chown -R www-data:www-data /etc/share/tt-rss
610
         fi
610
         fi
611
         if [ -d /root/tempttrss ]; then
611
         if [ -d /root/tempttrss ]; then
612
             rm -rf /root/tempttrss
612
             rm -rf /root/tempttrss