From 59c1ac44e9cac9c35b4b1aecaa453f9aae3ce39e Mon Sep 17 00:00:00 2001
From: G Balraj <g.balraj@agriya.in>
Date: Wed, 24 Apr 2019 18:06:39 +0530
Subject: [PATCH 1/5] changes #2555:  About restyaboard release date changed

---
 client/js/templates/about_us.jst.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/js/templates/about_us.jst.ejs b/client/js/templates/about_us.jst.ejs
index c9aaf403d..641c512b2 100644
--- a/client/js/templates/about_us.jst.ejs
+++ b/client/js/templates/about_us.jst.ejs
@@ -1,6 +1,6 @@
 <div class="about-block col-xs-pull-0 col-xs-push-0">
 	<h1><a title="<%- SITE_NAME %>" href="javascript:void(0);"><img src="img/logo.png" alt="[Image: <%- SITE_NAME %> ]" title="<%- SITE_NAME %>" class="img-responsive center-block"/></a> </h1>
-	<small class="show text-center">v 0.6.7 (2019-04-22)</small>
+	<small class="show text-center">v 0.6.7 (2019-04-24)</small>
 	<h3><%- i18next.t("Technologies and Components") %></h3>
 		<ul class="list-unstyled">
 			<li>Restya platform <a class="text-primary" target="_blank" title="http://restya.com/?utm_source=Restyaboard - <%- SITE_NAME %>&utm_medium=web&utm_campaign=about_us" href="http://restya.com/">http://restya.com/ </a></li>

From 7231f9646dd13f8d948491736279e9a739617ab0 Mon Sep 17 00:00:00 2001
From: G Balraj <g.balraj@agriya.in>
Date: Wed, 24 Apr 2019 18:57:18 +0530
Subject: [PATCH 2/5] Fixes #2555: crontab changes are added in the shell
 script

---
 restyaboard.sh | 41 +++++++++++------------------------------
 1 file changed, 11 insertions(+), 30 deletions(-)

diff --git a/restyaboard.sh b/restyaboard.sh
index 7e9f97c5e..41764be7c 100755
--- a/restyaboard.sh
+++ b/restyaboard.sh
@@ -166,8 +166,13 @@
             find "$dir/client/apps" -type d -exec chmod 755 {} \;
             find "$dir/client/apps" -type f -exec chmod 644 {} \;
             chmod 0777 $dir/client/apps/**/*.json
-			: > /var/spool/cron/crontabs/root
-			sed -i "s/*\/5 * * * * $dir\/server\/php\/shell\/main.sh//" /var/spool/cron/crontabs/root
+
+			if ([ "$OS_REQUIREMENT" = "Ubuntu" ] || [ "$OS_REQUIREMENT" = "Debian" ] || [ "$OS_REQUIREMENT" = "Raspbian" ])
+			then
+				echo "*/5 * * * * $dir/server/php/shell/main.sh > /dev/null 2> /dev/null" >> /var/spool/cron/crontabs/root
+			else
+				echo "*/5 * * * * $dir/server/php/shell/main.sh > /dev/null 2> /dev/null" >> /var/spool/cron/root
+			fi
 		}
 
 		update_version()
@@ -742,20 +747,8 @@
 				sed -i "s/^.*'R_DB_HOST'.*$/define('R_DB_HOST', '${POSTGRES_DBHOST}');/g" "$dir/server/php/config.inc.php"
 				sed -i "s/^.*'R_DB_PORT'.*$/define('R_DB_PORT', '${POSTGRES_DBPORT}');/g" "$dir/server/php/config.inc.php"
 				
-				echo "Setting up cron for every 5 minutes to send email notification to user, if the user chosen notification type as instant..."
-				echo "*/5 * * * * $dir/server/php/shell/instant_email_notification.sh > /dev/null 2> /dev/null" >> /var/spool/cron/crontabs/root
-				
-				echo "Setting up cron for every 1 hour to send email notification to user, if the user chosen notification type as periodic..."
-				echo "0 * * * * $dir/server/php/shell/periodic_email_notification.sh > /dev/null 2> /dev/null" >> /var/spool/cron/crontabs/root
-				
-				echo "Setting up cron for every 30 minutes to fetch IMAP email..."
-				echo "*/30 * * * * $dir/server/php/shell/imap.sh > /dev/null 2> /dev/null" >> /var/spool/cron/crontabs/root
-				
-				echo "Setting up cron for every 5 minutes to send activities to webhook..."
-				echo "*/5 * * * * $dir/server/php/shell/webhook.sh > /dev/null 2> /dev/null" >> /var/spool/cron/crontabs/root
-				
-				echo "Setting up cron for every 5 minutes to send email notification to past due..."
-				echo "*/5 * * * * $dir/server/php/shell/card_due_notification.sh > /dev/null 2> /dev/null" >> /var/spool/cron/crontabs/root
+				echo "Setting up cron for every 5 minutes.."
+				echo "*/5 * * * * $dir/server/php/shell/main.sh > /dev/null 2> /dev/null" >> /var/spool/cron/crontabs/root
 
 				set +x
 				echo "Do you want to install Restyaboard apps (y/n)?"
@@ -1192,20 +1185,8 @@
 				sed -i "s/^.*'R_DB_HOST'.*$/define('R_DB_HOST', '${POSTGRES_DBHOST}');/g" "$dir/server/php/config.inc.php"
 				sed -i "s/^.*'R_DB_PORT'.*$/define('R_DB_PORT', '${POSTGRES_DBPORT}');/g" "$dir/server/php/config.inc.php"
 				
-				echo "Setting up cron for every 5 minutes to send email notification to user, if the user chosen notification type as instant..."
-				echo "*/5 * * * * $dir/server/php/shell/instant_email_notification.sh > /dev/null 2> /dev/null" >> /var/spool/cron/root
-				
-				echo "Setting up cron for every 1 hour to send email notification to user, if the user chosen notification type as periodic..."
-				echo "0 * * * * $dir/server/php/shell/periodic_email_notification.sh > /dev/null 2> /dev/null" >> /var/spool/cron/root
-				
-				echo "Setting up cron for every 30 minutes to fetch IMAP email..."
-				echo "*/30 * * * * $dir/server/php/shell/imap.sh > /dev/null 2> /dev/null" >> /var/spool/cron/root
-				
-				echo "Setting up cron for every 5 minutes to send activities to webhook..."
-				echo "*/5 * * * * $dir/server/php/shell/webhook.sh > /dev/null 2> /dev/null" >> /var/spool/cron/root
-				
-				echo "Setting up cron for every 5 minutes to send email notification to past due..."
-				echo "*/5 * * * * $dir/server/php/shell/card_due_notification.sh > /dev/null 2> /dev/null" >> /var/spool/cron/root
+				echo "Setting up cron for every 5 minutes..."
+				echo "*/5 * * * * $dir/server/php/shell/main.sh > /dev/null 2> /dev/null" >> /var/spool/cron/root
 				
 				echo "Reset php-fpm (use unix socket mode)..."
 				if [ -f "/run/php/php7.2-fpm.sock" ]; then

From ba568d7e7a1a6a5c8b43a556bf38ad49fb9823ee Mon Sep 17 00:00:00 2001
From: G Balraj <g.balraj@agriya.in>
Date: Wed, 24 Apr 2019 19:38:37 +0530
Subject: [PATCH 3/5] changes #2555: restyaboard uninstall script changed

---
 restyaboard_uninstall.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
 mode change 100755 => 100644 restyaboard_uninstall.sh

diff --git a/restyaboard_uninstall.sh b/restyaboard_uninstall.sh
old mode 100755
new mode 100644
index 9702bfea0..3400f10f7
--- a/restyaboard_uninstall.sh
+++ b/restyaboard_uninstall.sh
@@ -15,9 +15,9 @@
 	fi
 
 	POSTGRES_DBHOST=localhost
-	POSTGRES_DBNAME=restyaboardtest
-	POSTGRES_DBUSER=restyat
-	POSTGRES_DBPASS=hjVl2!rGdt
+	POSTGRES_DBNAME=restyaboard
+	POSTGRES_DBUSER=restya
+	POSTGRES_DBPASS=hjVl2!rGd
 	POSTGRES_DBPORT=5432
 	DOWNLOAD_DIR=/opt/restyaboard
 	version=$(cat ${DOWNLOAD_DIR}/release)
@@ -68,8 +68,8 @@
 		rm -rf /etc/nginx/conf.d/restyaboard.conf
 
 		echo "Removing Restyaboard temporary files..."
-		rm /tmp/restya_site_url_for_shell.php
-		rm /tmp/restya_client_information.php
+		rm -rf "$dir/tmp/cache/restya_site_url_for_shell.php"
+		rm -rf "$dir/tmp/cache/restya_client_information.php"
 
 		echo "Clearing the Restyaboard crons"
 		sed -i '/\*\/5 \* \* \* \* $dir\/server\/php\/shell\/instant_email_notification.sh > \/dev\/null 2> \/dev\/null/d' /var/spool/cron/crontabs/root
@@ -135,5 +135,6 @@
 				yum remove nginx
 			esac
 		fi
+		rm -rf ${DOWNLOAD_DIR}/release
 	esac
 } 2>&1 | tee -a restyaboard_uninstall.log

From 2e30faadcc8da253172c4ba8094d1ace0a6305b5 Mon Sep 17 00:00:00 2001
From: G Balraj <g.balraj@agriya.in>
Date: Wed, 24 Apr 2019 19:46:16 +0530
Subject: [PATCH 4/5] changes #2555: crontab reset changes added in the shell
 script

---
 restyaboard.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/restyaboard.sh b/restyaboard.sh
index 41764be7c..27c134c47 100755
--- a/restyaboard.sh
+++ b/restyaboard.sh
@@ -169,9 +169,11 @@
 
 			if ([ "$OS_REQUIREMENT" = "Ubuntu" ] || [ "$OS_REQUIREMENT" = "Debian" ] || [ "$OS_REQUIREMENT" = "Raspbian" ])
 			then
+				: > /var/spool/cron/crontabs/root
 				echo "*/5 * * * * $dir/server/php/shell/main.sh > /dev/null 2> /dev/null" >> /var/spool/cron/crontabs/root
 			else
-				echo "*/5 * * * * $dir/server/php/shell/main.sh > /dev/null 2> /dev/null" >> /var/spool/cron/root
+				: > /var/spool/cron/crontabs/root
+				echo "*/5 * * * * $dir/server/php/shell/main.sh > /dev/null 2> /dev/null" >> /var/spool/cron/crontabs/root
 			fi
 		}
 

From bea5ea0b3612c6c1f0e86d7116604ce3952e36be Mon Sep 17 00:00:00 2001
From: G Balraj <g.balraj@agriya.in>
Date: Wed, 24 Apr 2019 19:47:42 +0530
Subject: [PATCH 5/5] changes #2555: crontab reset changes added in the shell
 script

---
 restyaboard.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/restyaboard.sh b/restyaboard.sh
index 27c134c47..1b77f3d1c 100755
--- a/restyaboard.sh
+++ b/restyaboard.sh
@@ -172,8 +172,8 @@
 				: > /var/spool/cron/crontabs/root
 				echo "*/5 * * * * $dir/server/php/shell/main.sh > /dev/null 2> /dev/null" >> /var/spool/cron/crontabs/root
 			else
-				: > /var/spool/cron/crontabs/root
-				echo "*/5 * * * * $dir/server/php/shell/main.sh > /dev/null 2> /dev/null" >> /var/spool/cron/crontabs/root
+				: > /var/spool/cron/root
+				echo "*/5 * * * * $dir/server/php/shell/main.sh > /dev/null 2> /dev/null" >> /var/spool/cron/root
 			fi
 		}