diff --git a/monitor/setup/serverlite.sh b/monitor/setup/serverlite.sh index df84d28..c5c5692 100644 --- a/monitor/setup/serverlite.sh +++ b/monitor/setup/serverlite.sh @@ -45,13 +45,8 @@ if [ ! -d /var/run/sshd ]; then systemctl restart ssh fi time_begin=$(date) - echo "Begin rc.local. Time restart: $time_begin" >> /root/monitor/log/rc_local.log - echo "nameserver 8.8.8.8" > /etc/resolv.conf - -# tmux new -d -s server_js 'node /root/BiFace_Server_Config_API/server.js' - exit 0' > /etc/rc.local # echo "================================ update serverlite ===============================" @@ -61,7 +56,7 @@ cd /var/www sudo chmod -R 0777 html cd html if [ "$1" = pro ] -then git clone -b dev http://gitea.beetai.com/dongpd/BiFace_Server_Lite +then git clone -b dev_DTD http://gitea.beetai.com/dongpd/BiFace_Server_Lite else git clone -b cloud http://gitea.beetai.com/dongpd/BiFace_Server_Lite fi sudo chmod -R 0777 BiFace_Server_Lite @@ -106,7 +101,7 @@ echo " " > /etc/apache2/sites-available/000-default.conf sudo a2enmod rewrite sudo service apache2 restart -sudo echo "* * * * * php /var/www/html/BiFace_Server_Lite/yii sync" >> /var/spool/cron/crontabs/root +# sudo echo "* * * * * php /var/www/html/BiFace_Server_Lite/yii sync" >> /var/spool/cron/crontabs/root # cd /root git clone http://gitea.beetai.com/dongpd/BiFace_Server_Config_API.git diff --git a/monitor/setup/setup.sh b/monitor/setup/setup.sh index b6fea01..65828d8 100644 --- a/monitor/setup/setup.sh +++ b/monitor/setup/setup.sh @@ -66,9 +66,7 @@ fi time_begin=$(date) echo "Begin rc.local. Time restart: $time_begin" >> /root/monitor/log/rc_local.log -#sudo /root/monitor/setup/datetime & echo "nameserver 8.8.8.8" > /etc/resolv.conf - exit 0' > /etc/rc.local # echo "network" @@ -102,7 +100,6 @@ rm /root/monitor/setup/key.sh echo "setup schedule crontab" echo "55 5 * * * sudo /root/monitor/cache/clearcache.sh" > /var/spool/cron/crontabs/root echo "50 5 * * * sudo /root/monitor/cache/restart_service.sh" >> /var/spool/cron/crontabs/root -echo "* * * * * sudo /root/monitor/setup/run_crontab.sh" >> /var/spool/cron/crontabs/root # #*************setup autologin*************** echo "setup autologin"