return rsync shared folder back

rollback generate_base.go after openark#445 (comment)
Hornswoggles · Mar 29, 2018 · 989017b · 989017b
1 parent fe728b3
commit 989017b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -16,8 +16,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = BOX
   config.vm.box_download_insecure = true
   config.vm.box_check_update = false
-  config.vm.synced_folder '.', '/orchestrator'
-  #, type: 'rsync', rsync__auto: true
+  config.vm.synced_folder '.', '/orchestrator', type: 'rsync', rsync__auto: true
 
   (0..4).each do |n|
     name = (n > 0 ? ("db" + n.to_s) : "admin")

diff --git a/build.sh b/build.sh
@@ -134,7 +134,7 @@ function package() {
   esac
 
   echo "---"
-  if [[ -e /etc/centos-release ]]; then
+  if [[ -f /etc/centos-release ]]; then
       if cat /etc/centos-release | grep 'CentOS release 6' ; then
         rm ${TOPDIR:-?}/orchestrator*.deb
         rm ${TOPDIR:-?}/orchestrator*.tar.gz

diff --git a/go/db/generate_base.go b/go/db/generate_base.go
@@ -138,7 +138,7 @@ var generateSQLBase = []string{
 		  last_checked timestamp NULL DEFAULT NULL,
 		  last_seen timestamp NULL DEFAULT NULL,
 		  mysql_port smallint(5) unsigned DEFAULT NULL,
-		  count_mysql_snapshots smallint(5) unsigned NOT NULL DEFAULT 0,
+		  count_mysql_snapshots smallint(5) unsigned NOT NULL,
 		  PRIMARY KEY (hostname)
 		) ENGINE=InnoDB DEFAULT CHARSET=ascii
 	`,