Cleanup

nems-push-db.sh

@@ -3,6 +3,12 @@
 # Built for creating new sample hosts and services, and pushing to all other NEMS servers
 # NEMS 1.4+ only
 
+# Remove nconf history, should it exist
+mysql -u nconf -pnagiosadmin nconf -e "TRUNCATE History"
+
+systemctl stop nagios
+systemctl stop mysql
+
 cd /root/nems/nems-migrator/data/1.4/
 if [[ -d mysql ]]; then
   rm -rf mysql
@@ -19,6 +25,9 @@ fi
 cp -R /etc/nems/conf/Default_collector .
 cp -R /etc/nems/conf/global .
 
+systemctl start mysql
+systemctl start nagios
+
 git add *
 git commit -m "Push new default config"
 git push origin master

nems-push.sh

@@ -25,4 +25,5 @@ git push origin master
 cd /var/www/nconf/
 git add *
 git commit -am "$comment"
-git push origin master
+git push origin develop
+