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 @@
-
v 0.6.7 (2019-04-22)
+
v 0.6.7 (2019-04-24)
<%- i18next.t("Technologies and Components") %>
- Restya platform http://restya.com/
diff --git a/restyaboard.sh b/restyaboard.sh
index 7e9f97c5e..1b77f3d1c 100755
--- a/restyaboard.sh
+++ b/restyaboard.sh
@@ -166,8 +166,15 @@
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
+ : > /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/root
+ echo "*/5 * * * * $dir/server/php/shell/main.sh > /dev/null 2> /dev/null" >> /var/spool/cron/root
+ fi
}
update_version()
@@ -742,20 +749,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 +1187,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
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