From 387ae1d2cd375db387b39c3b475727cbef6f627b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 3 Sep 2017 11:20:52 +0100
Subject: [PATCH 01/15] Tidying

---
 src/freedombone-app-syncthing | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing
index 3a2e053a..37538e62 100755
--- a/src/freedombone-app-syncthing
+++ b/src/freedombone-app-syncthing
@@ -251,9 +251,9 @@ function upgrade_syncthing {
 }
 
 function backup_local_syncthing {
-    if [ -d /var/lib/syncthing/SyncShared ]; then
+    if [ -d $SYNCTHING_SHARED_DATA ]; then
         function_check backup_directory_to_usb
-        backup_directory_to_usb /var/lib/syncthing/SyncShared syncthingshared
+        backup_directory_to_usb $SYNCTHING_SHARED_DATA syncthingshared
         backup_directory_to_usb /root/.config/syncthing syncthingconfig
     fi
 
@@ -314,10 +314,10 @@ function restore_local_syncthing {
         restore_directory_from_usb ${temp_restore_dir}shared syncthingshared
         #cp -r ${temp_restore_dir}shared/* /
 
-        if [ ! -d /var/lib/syncthing/SyncShared ]; then
-            mkdir -p /var/lib/syncthing/SyncShared
+        if [ ! -d $SYNCTHING_SHARED_DATA ]; then
+            mkdir -p $SYNCTHING_SHARED_DATA
         fi
-        cp -r ${temp_restore_dir}shared/* /var/lib/syncthing/SyncShared/
+        cp -r ${temp_restore_dir}shared/* $SYNCTHING_SHARED_DATA/
 
         if [ ! "$?" = "0" ]; then
             set_user_permissions
@@ -379,10 +379,10 @@ function backup_remote_syncthing {
         backup_directory_to_friend /root/.config/syncthing syncthingconfig
         echo $"Backup of syncthing configuration complete"
     fi
-    if [ -d /var/lib/syncthing/SyncShared ]; then
+    if [ -d $SYNCTHING_SHARED_DATA ]; then
         echo $"Backing up syncthing shared files"
         function_check backup_directory_to_friend
-        backup_directory_to_friend /var/lib/syncthing/SyncShared syncthingshared
+        backup_directory_to_friend $SYNCTHING_SHARED_DATA syncthingshared
         echo $"Backup of syncthing shared files complete"
     fi
 
@@ -440,10 +440,10 @@ function restore_remote_syncthing {
         function_check restore_directory_from_friend
         restore_directory_from_friend $temp_restore_dir syncthingshared
         #cp -r $temp_restore_dir/* /
-        if [ ! -d /var/lib/syncthing/SyncShared ]; then
-            mkdir -p /var/lib/syncthing/SyncShared
+        if [ ! -d $SYNCTHING_SHARED_DATA ]; then
+            mkdir -p $SYNCTHING_SHARED_DATA
         fi
-        cp -r ${temp_restore_dir}shared/* /var/lib/syncthing/SyncShared/
+        cp -r ${temp_restore_dir}shared/* $SYNCTHING_SHARED_DATA/
         if [ ! "$?" = "0" ]; then
             systemctl start syncthing
             systemctl start cron

From 8adf27e743ad6ed506cf680d6ec649e95a093e42 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 3 Sep 2017 11:22:41 +0100
Subject: [PATCH 02/15] Tidying

---
 src/freedombone-app-syncthing | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing
index 37538e62..9fe808a5 100755
--- a/src/freedombone-app-syncthing
+++ b/src/freedombone-app-syncthing
@@ -254,7 +254,7 @@ function backup_local_syncthing {
     if [ -d $SYNCTHING_SHARED_DATA ]; then
         function_check backup_directory_to_usb
         backup_directory_to_usb $SYNCTHING_SHARED_DATA syncthingshared
-        backup_directory_to_usb /root/.config/syncthing syncthingconfig
+        backup_directory_to_usb $SYNCTHING_CONFIG_PATH syncthingconfig
     fi
 
     for d in /home/*/ ; do
@@ -294,10 +294,10 @@ function restore_local_syncthing {
         restore_directory_from_usb ${temp_restore_dir}config syncthingconfig
         #cp -r ${temp_restore_dir}config/* /
 
-        if [ ! -d /root/.config/syncthing ]; then
-            mkdir -p /root/.config/syncthing
+        if [ ! -d $SYNCTHING_CONFIG_PATH ]; then
+            mkdir -p $SYNCTHING_CONFIG_PATH
         fi
-        cp -r ${temp_restore_dir}config/* /root/.config/syncthing/
+        cp -r ${temp_restore_dir}config/* $SYNCTHING_CONFIG_PATH/
 
         if [ ! "$?" = "0" ]; then
             set_user_permissions
@@ -373,10 +373,10 @@ function restore_local_syncthing {
 }
 
 function backup_remote_syncthing {
-    if [ -d /root/.config/syncthing ]; then
+    if [ -d $SYNCTHING_CONFIG_PATH ]; then
         echo $"Backing up syncthing configuration"
         function_check backup_directory_to_friend
-        backup_directory_to_friend /root/.config/syncthing syncthingconfig
+        backup_directory_to_friend $SYNCTHING_CONFIG_PATH syncthingconfig
         echo $"Backup of syncthing configuration complete"
     fi
     if [ -d $SYNCTHING_SHARED_DATA ]; then
@@ -422,10 +422,10 @@ function restore_remote_syncthing {
         function_check restore_directory_from_friend
         restore_directory_from_friend $temp_restore_dir syncthingconfig
         #cp -r $temp_restore_dir/* /
-        if [ ! -d /root/.config/syncthing ]; then
-            mkdir -p /root/.config/syncthing
+        if [ ! -d $SYNCTHING_CONFIG_PATH ]; then
+            mkdir -p $SYNCTHING_CONFIG_PATH
         fi
-        cp -r ${temp_restore_dir}config/* /root/.config/syncthing/
+        cp -r ${temp_restore_dir}config/* $SYNCTHING_CONFIG_PATH/
         if [ ! "$?" = "0" ]; then
             systemctl start syncthing
             systemctl start cron

From 3fcdc6f2f126d4de3d2a6b782c9cb90bc4f6e899 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 3 Sep 2017 16:22:09 +0100
Subject: [PATCH 03/15] Remove @ replies for blocked users

---
 src/freedombone-utils-gnusocialtools | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/freedombone-utils-gnusocialtools b/src/freedombone-utils-gnusocialtools
index 7885ff08..2b4ef795 100755
--- a/src/freedombone-utils-gnusocialtools
+++ b/src/freedombone-utils-gnusocialtools
@@ -611,6 +611,9 @@ function gnusocial_block_user_script {
     echo '' >> /usr/bin/gnusocial-delete-user
     echo '      database_query="delete from qvitternotification where to_profile_id=${id} or from_profile_id=${id};"' >> /usr/bin/gnusocial-delete-user
     echo '      mysql -u root --password="$MARIADB_PASSWORD" -e "$database_query" $database_name' >> /usr/bin/gnusocial-delete-user
+    echo '' >> /usr/bin/gnusocial-delete-user
+    echo "      database_query=\"delete from notice where content REGEXP '\@${remove_user}';\"" >> /usr/bin/gnusocial-delete-user
+    echo '      mysql -u root --password="$MARIADB_PASSWORD" -e "$database_query" $database_name' >> /usr/bin/gnusocial-delete-user
     echo '  fi' >> /usr/bin/gnusocial-delete-user
     echo '  ctr=$((ctr + 1))' >> /usr/bin/gnusocial-delete-user
     echo 'done' >> /usr/bin/gnusocial-delete-user

From 27708b31359b93f61a5f53fa2f574aeb4780d48c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 3 Sep 2017 16:59:29 +0100
Subject: [PATCH 04/15] Extra backslash

---
 src/freedombone-utils-gnusocialtools | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedombone-utils-gnusocialtools b/src/freedombone-utils-gnusocialtools
index 2b4ef795..661d5fe4 100755
--- a/src/freedombone-utils-gnusocialtools
+++ b/src/freedombone-utils-gnusocialtools
@@ -612,7 +612,7 @@ function gnusocial_block_user_script {
     echo '      database_query="delete from qvitternotification where to_profile_id=${id} or from_profile_id=${id};"' >> /usr/bin/gnusocial-delete-user
     echo '      mysql -u root --password="$MARIADB_PASSWORD" -e "$database_query" $database_name' >> /usr/bin/gnusocial-delete-user
     echo '' >> /usr/bin/gnusocial-delete-user
-    echo "      database_query=\"delete from notice where content REGEXP '\@${remove_user}';\"" >> /usr/bin/gnusocial-delete-user
+    echo "      database_query=\"delete from notice where content REGEXP '\@\${remove_user}';\"" >> /usr/bin/gnusocial-delete-user
     echo '      mysql -u root --password="$MARIADB_PASSWORD" -e "$database_query" $database_name' >> /usr/bin/gnusocial-delete-user
     echo '  fi' >> /usr/bin/gnusocial-delete-user
     echo '  ctr=$((ctr + 1))' >> /usr/bin/gnusocial-delete-user

From aee80c4fb9eacdac6ef145daeb1070ee1b9ae290 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 3 Sep 2017 17:46:03 +0100
Subject: [PATCH 05/15] Switch query sequence

---
 src/freedombone-utils-gnusocialtools | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/freedombone-utils-gnusocialtools b/src/freedombone-utils-gnusocialtools
index 661d5fe4..ede2d653 100755
--- a/src/freedombone-utils-gnusocialtools
+++ b/src/freedombone-utils-gnusocialtools
@@ -563,6 +563,9 @@ function gnusocial_block_user_script {
     echo "nickname=\$(echo \"\$remove_user\" | awk -F '@' '{print \$1}')" >> /usr/bin/gnusocial-delete-user
     echo "remove_domain=\$(echo \"\$remove_user\" | awk -F '@' '{print \$2}')" >> /usr/bin/gnusocial-delete-user
     echo '' >> /usr/bin/gnusocial-delete-user
+    echo "database_query=\"delete from notice where content REGEXP '\@\${remove_user}';\"" >> /usr/bin/gnusocial-delete-user
+    echo 'mysql -u root --password="$MARIADB_PASSWORD" -e "$database_query" $database_name' >> /usr/bin/gnusocial-delete-user
+    echo '' >> /usr/bin/gnusocial-delete-user
     echo 'database_query="select profile.id from profile where nickname = '"'"'${nickname}'"'"' and profileurl like '"'"'%${remove_domain}%'"'"';"' >> /usr/bin/gnusocial-delete-user
     echo 'declare -a ids=$(mysql -u root --password="$MARIADB_PASSWORD" << EOF' >> /usr/bin/gnusocial-delete-user
     echo 'use $database_name;' >> /usr/bin/gnusocial-delete-user
@@ -611,9 +614,6 @@ function gnusocial_block_user_script {
     echo '' >> /usr/bin/gnusocial-delete-user
     echo '      database_query="delete from qvitternotification where to_profile_id=${id} or from_profile_id=${id};"' >> /usr/bin/gnusocial-delete-user
     echo '      mysql -u root --password="$MARIADB_PASSWORD" -e "$database_query" $database_name' >> /usr/bin/gnusocial-delete-user
-    echo '' >> /usr/bin/gnusocial-delete-user
-    echo "      database_query=\"delete from notice where content REGEXP '\@\${remove_user}';\"" >> /usr/bin/gnusocial-delete-user
-    echo '      mysql -u root --password="$MARIADB_PASSWORD" -e "$database_query" $database_name' >> /usr/bin/gnusocial-delete-user
     echo '  fi' >> /usr/bin/gnusocial-delete-user
     echo '  ctr=$((ctr + 1))' >> /usr/bin/gnusocial-delete-user
     echo 'done' >> /usr/bin/gnusocial-delete-user

From 43276c058beb7791ad2d87fb8a4307873c1af051 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 3 Sep 2017 18:01:35 +0100
Subject: [PATCH 06/15] Bump gnusocial commit

---
 src/freedombone-app-gnusocial | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index 89f63c91..2d51c5ed 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -37,7 +37,7 @@ GNUSOCIAL_DOMAIN_NAME=
 GNUSOCIAL_CODE=
 GNUSOCIAL_ONION_PORT=8087
 GNUSOCIAL_REPO="https://git.gnu.io/gnu/gnu-social.git"
-GNUSOCIAL_COMMIT='d61375cb7fd9e3ac2dbba2b22d0d6461fb753892'
+GNUSOCIAL_COMMIT='d9fbc17f7745edb3e3eeddf6485f70b187df762f'
 GNUSOCIAL_ADMIN_PASSWORD=
 
 GNUSOCIAL_BACKGROUND_IMAGE_URL=

From 4ad9f086838fee61e19f647653977317e4441d9d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 3 Sep 2017 18:22:59 +0100
Subject: [PATCH 07/15] Tripwire final install

---
 src/freedombone-base-tripwire | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/freedombone-base-tripwire b/src/freedombone-base-tripwire
index af2cd6d6..65940edd 100755
--- a/src/freedombone-base-tripwire
+++ b/src/freedombone-base-tripwire
@@ -146,21 +146,6 @@ function install_tripwire {
 
        ' | twadmin --create-polfile -S /etc/tripwire/${HOSTNAME}-site.key /etc/tripwire/twpol.txt
 
-    # create the database
-    echo '
-
-' | tripwire --init --cfgfile /etc/tripwire/tw.cfg --polfile /etc/tripwire/tw.pol --dbfile /var/lib/tripwire/${HOSTNAME}.twd
-    if [ ! -f /var/lib/tripwire/${HOSTNAME}.twd ]; then
-        echo $'tripwire database was not created'
-        exit 72925
-    fi
-    # recreate the configuration
-    echo '
-
-
-
-       ' | reset-tripwire
-
     mark_completed $FUNCNAME
 }
 

From ceaceb4c3d37aa0ea91c1a9ce8d1cc6026848249 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 7 Sep 2017 10:13:34 +0100
Subject: [PATCH 08/15] Bump gogs version

---
 src/freedombone-app-gogs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index 5c24e80a..4c102ced 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -34,7 +34,7 @@ IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=1
 
 GOGS_USERNAME='gogs'
-GOGS_VERSION='0.11.4'
+GOGS_VERSION='0.11.29'
 
 GIT_DOMAIN_NAME=
 GIT_CODE=

From 70f7e73974fbb777edf6c9a2568f9218a8784c70 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 7 Sep 2017 10:24:31 +0100
Subject: [PATCH 09/15] Check that gogs ini file gets copied on upgrade

---
 src/freedombone-app-gogs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index 4c102ced..1efe954b 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -158,7 +158,8 @@ function upgrade_gogs {
         return
     fi
 
-    GOGS_CONFIG_FILE=/home/${GOGS_USERNAME}/custom/conf/app.ini
+    GOGS_CONFIG_PATH=/home/${GOGS_USERNAME}/custom/conf
+    GOGS_CONFIG_FILE=$GOGS_CONFIG_PATH/app.ini
     cp $GOGS_CONFIG_FILE $INSTALL_DIR/gogs_config.ini
 
     gogs_parameters
@@ -199,7 +200,15 @@ function upgrade_gogs {
         rm ${GOGS_FILE}
     fi
 
+    if [ ! -d ${GOGS_CONFIG_PATH} ]; then
+        mkdir -p ${GOGS_CONFIG_PATH}
+    fi
+
     cp $INSTALL_DIR/gogs_config.ini $GOGS_CONFIG_FILE
+    if [ ! -f $GOGS_CONFIG_FILE ]; then
+        echo $'Gogs ini file not upgraded'
+        exit 873535
+    fi
     rm $INSTALL_DIR/gogs_config.ini
 
     sed -i "s|gogs version.*|gogs version:$GOGS_VERSION|g" ${COMPLETION_FILE}

From 69e56f4443a54a105d63d66cfc700ed17515f8f7 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 7 Sep 2017 10:37:38 +0100
Subject: [PATCH 10/15] Set gogs permissions after upgrade

---
 src/freedombone-app-gogs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index 1efe954b..6fa052ac 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -210,6 +210,7 @@ function upgrade_gogs {
         exit 873535
     fi
     rm $INSTALL_DIR/gogs_config.ini
+    chown -R ${GOGS_USERNAME}:${GOGS_USERNAME} /home/${GOGS_USERNAME}
 
     sed -i "s|gogs version.*|gogs version:$GOGS_VERSION|g" ${COMPLETION_FILE}
     systemctl restart mariadb

From 11e6257545ffc749fec1cc415651466bb6e6f819 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 7 Sep 2017 10:50:18 +0100
Subject: [PATCH 11/15] Move gogs repos back after upgrade

---
 src/freedombone-app-gogs | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index 6fa052ac..febe330b 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -162,6 +162,13 @@ function upgrade_gogs {
     GOGS_CONFIG_FILE=$GOGS_CONFIG_PATH/app.ini
     cp $GOGS_CONFIG_FILE $INSTALL_DIR/gogs_config.ini
 
+    if [ -d $INSTALL_DIR/gogs-repositories ]; then
+        rm -rf $INSTALL_DIR/gogs-repositories
+    fi
+    if [ -d /home/${GOGS_USERNAME}/gogs-repositories ]; then
+        mv /home/${GOGS_USERNAME}/gogs-repositories $INSTALL_DIR
+    fi
+
     gogs_parameters
     echo "gogs binary upgrade: ${GOGS_BIN}"
 
@@ -210,6 +217,12 @@ function upgrade_gogs {
         exit 873535
     fi
     rm $INSTALL_DIR/gogs_config.ini
+    if [ -d /home/${GOGS_USERNAME}/gogs-repositories ]; then
+        rm -rf /home/${GOGS_USERNAME}/gogs-repositories
+    fi
+    if [ -d $INSTALL_DIR/gogs-repositories ]; then
+        mv $INSTALL_DIR/gogs-repositories /home/${GOGS_USERNAME}/gogs-repositories
+    fi
     chown -R ${GOGS_USERNAME}:${GOGS_USERNAME} /home/${GOGS_USERNAME}
 
     sed -i "s|gogs version.*|gogs version:$GOGS_VERSION|g" ${COMPLETION_FILE}
@@ -243,9 +256,6 @@ function restore_local_gogs {
     if ! grep -q "gogs domain" ${COMPLETION_FILE}; then
         return
     fi
-    if [ ! -d /home/${GOGS_USERNAME}/gogs-repositories ]; then
-        return
-    fi
 
     if [ ${#GIT_DOMAIN_NAME} -gt 2 ]; then
         function_check gogs_create_database
@@ -274,6 +284,9 @@ function restore_local_gogs {
             echo $"Restoring Gogs repos"
             function_check restore_directory_from_usb
             restore_directory_from_usb ${temp_restore_dir}repos gogsrepos
+            if [ ! -d /home/${GOGS_USERNAME}/gogs-repositories ]; then
+                mkdir /home/${GOGS_USERNAME}/gogs-repositories
+            fi
             if [ ! -d ${temp_restore_dir}repos/home/${GOGS_USERNAME}/gogs-repositories ]; then
                 cp -r ${temp_restore_dir}repos/home/${GOGS_USERNAME}/gogs-repositories/* /home/${GOGS_USERNAME}/gogs-repositories/
             else
@@ -370,6 +383,9 @@ function restore_remote_gogs {
             fi
             echo $"Restoring Gogs repos"
             restore_directory_from_friend /root/tempgogsrepos gogsrepos
+            if [ ! -d /home/${GOGS_USERNAME}/gogs-repositories ]; then
+                mkdir /home/${GOGS_USERNAME}/gogs-repositories
+            fi
             if [ -d /root/tempgogsrepos/home/${GOGS_USERNAME}/gogs-repositories ]; then
                 cp -r /root/tempgogsrepos/home/${GOGS_USERNAME}/gogs-repositories/* /home/${GOGS_USERNAME}/gogs-repositories/
             else

From 908523921866ece88d994e1fec8aaf38e59b2f43 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 7 Sep 2017 10:58:09 +0100
Subject: [PATCH 12/15] Restore gogs config

---
 src/freedombone-app-gogs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index febe330b..848e7dba 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -266,14 +266,10 @@ function restore_local_gogs {
         temp_restore_dir=/root/tempgogs
         if [ -d ${USB_MOUNT}/backup/gogs ]; then
             echo $"Restoring Gogs settings"
-            if [ ! -d /home/${GOGS_USERNAME}/custom ]; then
-                mkdir -p /home/${GOGS_USERNAME}/custom
-            fi
-            if [ ! -d ${temp_restore_dir}/home/${GOGS_USERNAME}/custom ]; then
-                cp -r ${temp_restore_dir}/home/${GOGS_USERNAME}/custom/* /home/${GOGS_USERNAME}/custom
-            else
-                cp -r ${temp_restore_dir}/* /home/${GOGS_USERNAME}/custom/
+            if [ ! -d /home/${GOGS_USERNAME}/custom/conf ]; then
+                mkdir -p /home/${GOGS_USERNAME}/custom/conf
             fi
+            cp -r ${temp_restore_dir}/conf/* /home/${GOGS_USERNAME}/custom/conf/
             if [ ! "$?" = "0" ]; then
                 function_check set_user_permissions
                 set_user_permissions

From 282d45cd640a127f59ce1b00db92443ca9c85df0 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 7 Sep 2017 11:01:42 +0100
Subject: [PATCH 13/15] Reverse logic

---
 src/freedombone-app-gogs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index 848e7dba..65e120ee 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -283,7 +283,7 @@ function restore_local_gogs {
             if [ ! -d /home/${GOGS_USERNAME}/gogs-repositories ]; then
                 mkdir /home/${GOGS_USERNAME}/gogs-repositories
             fi
-            if [ ! -d ${temp_restore_dir}repos/home/${GOGS_USERNAME}/gogs-repositories ]; then
+            if [ -d ${temp_restore_dir}repos/home/${GOGS_USERNAME}/gogs-repositories ]; then
                 cp -r ${temp_restore_dir}repos/home/${GOGS_USERNAME}/gogs-repositories/* /home/${GOGS_USERNAME}/gogs-repositories/
             else
                 cp -r ${temp_restore_dir}/* /home/${GOGS_USERNAME}/gogs-repositories/

From 3f5a1bfdd8d7a0db2745d80d884b09102f8f863d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 7 Sep 2017 11:11:39 +0100
Subject: [PATCH 14/15] Restart gogs after restore

---
 src/freedombone-app-gogs | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index 65e120ee..33691065 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -261,15 +261,22 @@ function restore_local_gogs {
         function_check gogs_create_database
         gogs_create_database
 
+        GOGS_CONFIG_PATH=/home/${GOGS_USERNAME}/custom/conf
+        GOGS_CONFIG_FILE=${GOGS_CONFIG_PATH}/app.ini
+
         function_check restore_database
         restore_database gogs ${GIT_DOMAIN_NAME}
         temp_restore_dir=/root/tempgogs
         if [ -d ${USB_MOUNT}/backup/gogs ]; then
             echo $"Restoring Gogs settings"
-            if [ ! -d /home/${GOGS_USERNAME}/custom/conf ]; then
-                mkdir -p /home/${GOGS_USERNAME}/custom/conf
+            if [ ! -d $GOGS_CONFIG_PATH ]; then
+                mkdir -p $GOGS_CONFIG_PATH
+            fi
+            if [ -d /root/tempgogs/home/${GOGS_USERNAME}/custom ]; then
+                cp -r /root/tempgogs/home/${GOGS_USERNAME}/custom/* /home/${GOGS_USERNAME}/custom/
+            else
+                cp -r /root/tempgogs/* /home/${GOGS_USERNAME}/custom/
             fi
-            cp -r ${temp_restore_dir}/conf/* /home/${GOGS_USERNAME}/custom/conf/
             if [ ! "$?" = "0" ]; then
                 function_check set_user_permissions
                 set_user_permissions
@@ -319,11 +326,10 @@ function restore_local_gogs {
             chown -R ${GOGS_USERNAME}:${GOGS_USERNAME} /home/${GOGS_USERNAME}
         fi
 
-        GOGS_CONFIG_PATH=/home/${GOGS_USERNAME}/custom/conf
-        GOGS_CONFIG_FILE=${GOGS_CONFIG_PATH}/app.ini
         MARIADB_PASSWORD=$(${PROJECT_NAME}-pass -u root -a mariadb)
         sed -i "s|PASSWD =.*|PASSWD = $MARIADB_PASSWORD|g" ${GOGS_CONFIG_FILE}
         MARIADB_PASSWORD=
+        systemctl restart gogs
     fi
 }
 
@@ -363,11 +369,14 @@ function restore_remote_gogs {
         function_check gogs_create_database
         gogs_create_database
 
+        GOGS_CONFIG_PATH=/home/${GOGS_USERNAME}/custom/conf
+        GOGS_CONFIG_FILE=${GOGS_CONFIG_PATH}/app.ini
+
         function_check restore_database_from_friend
         restore_database_from_friend gogs ${GIT_DOMAIN_NAME}
         if [ -d ${SERVER_DIRECTORY}/backup/gogs ]; then
-            if [ ! -d /home/${GOGS_USERNAME}/custom ]; then
-                mkdir -p /home/${GOGS_USERNAME}/custom
+            if [ ! -d $GOGS_CONFIG_PATH ]; then
+                mkdir -p $GOGS_CONFIG_PATH
             fi
             if [ -d /root/tempgogs/home/${GOGS_USERNAME}/custom ]; then
                 cp -r /root/tempgogs/home/${GOGS_USERNAME}/custom/* /home/${GOGS_USERNAME}/custom/
@@ -410,11 +419,10 @@ function restore_remote_gogs {
             echo $"Restore of Gogs complete"
         fi
 
-        GOGS_CONFIG_PATH=/home/${GOGS_USERNAME}/custom/conf
-        GOGS_CONFIG_FILE=${GOGS_CONFIG_PATH}/app.ini
         MARIADB_PASSWORD=$(${PROJECT_NAME}-pass -u root -a mariadb)
         sed -i "s|PASSWD =.*|PASSWD = $MARIADB_PASSWORD|g" ${GOGS_CONFIG_FILE}
         MARIADB_PASSWORD=
+        systemctl restart gogs
     fi
 }
 

From d8c4860f90d6e14fb9e1500b0b267bcfb1ca2fe5 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 7 Sep 2017 11:23:38 +0100
Subject: [PATCH 15/15] Restore from repos

---
 src/freedombone-app-gogs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index 33691065..bbfd65b2 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -293,7 +293,7 @@ function restore_local_gogs {
             if [ -d ${temp_restore_dir}repos/home/${GOGS_USERNAME}/gogs-repositories ]; then
                 cp -r ${temp_restore_dir}repos/home/${GOGS_USERNAME}/gogs-repositories/* /home/${GOGS_USERNAME}/gogs-repositories/
             else
-                cp -r ${temp_restore_dir}/* /home/${GOGS_USERNAME}/gogs-repositories/
+                cp -r ${temp_restore_dir}repos/* /home/${GOGS_USERNAME}/gogs-repositories/
             fi
             if [ ! "$?" = "0" ]; then
                 function_check set_user_permissions