From 52a3b47e054ee6effe3edfb079ac933ccb520328 Mon Sep 17 00:00:00 2001
From: Jeremy Dormitzer <jeremydormitzer@lola.com>
Date: Thu, 31 Dec 2020 14:19:27 -0500
Subject: [PATCH] Fix bindfs binding

---
 .../packer/packer-manifest.json               | 29 ++++++++++++++++++-
 .../packer/syncthing-config.xml.template      |  2 +-
 prod/syncthing-packer/packer/syncthing.json   |  6 ++--
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/prod/syncthing-packer/packer/packer-manifest.json b/prod/syncthing-packer/packer/packer-manifest.json
index e5176a8..c736c94 100644
--- a/prod/syncthing-packer/packer/packer-manifest.json
+++ b/prod/syncthing-packer/packer/packer-manifest.json
@@ -35,7 +35,34 @@
       "artifact_id": "nyc1:76123201",
       "packer_run_uuid": "e61d396f-483d-ad37-8f9f-ba0b436e2c53",
       "custom_data": null
+    },
+    {
+      "name": "digitalocean",
+      "builder_type": "digitalocean",
+      "build_time": 1609434928,
+      "files": null,
+      "artifact_id": "nyc1:76125071",
+      "packer_run_uuid": "6bcf474c-c7a7-9af5-7417-d9c49e4b1e60",
+      "custom_data": null
+    },
+    {
+      "name": "digitalocean",
+      "builder_type": "digitalocean",
+      "build_time": 1609440708,
+      "files": null,
+      "artifact_id": "nyc1:76126717",
+      "packer_run_uuid": "cb8cb390-b790-bd63-e653-39e44dd16cc8",
+      "custom_data": null
+    },
+    {
+      "name": "digitalocean",
+      "builder_type": "digitalocean",
+      "build_time": 1609441735,
+      "files": null,
+      "artifact_id": "nyc1:76127226",
+      "packer_run_uuid": "f4072db9-bac8-d881-9897-a34fa9007df6",
+      "custom_data": null
     }
   ],
-  "last_run_uuid": "e61d396f-483d-ad37-8f9f-ba0b436e2c53"
+  "last_run_uuid": "f4072db9-bac8-d881-9897-a34fa9007df6"
 }
\ No newline at end of file
diff --git a/prod/syncthing-packer/packer/syncthing-config.xml.template b/prod/syncthing-packer/packer/syncthing-config.xml.template
index 6802c8d..69c4c63 100644
--- a/prod/syncthing-packer/packer/syncthing-config.xml.template
+++ b/prod/syncthing-packer/packer/syncthing-config.xml.template
@@ -1,5 +1,5 @@
 <configuration version="30">
-    <folder id="default" label="Default Folder" path="/home/syncthing/syncthing-volume/Sync" type="sendreceive" rescanIntervalS="3600" fsWatcherEnabled="true" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true">
+    <folder id="default" label="Default Folder" path="/mnt/syncthing/Sync" type="sendreceive" rescanIntervalS="3600" fsWatcherEnabled="true" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true">
         <filesystemType>basic</filesystemType>
         <device id="UW7FOJM-POJIOL5-JRHZ3BP-BOWBHKY-VY3B5UH-MO2QNKB-4HBSNR6-DD6RIQL" introducedBy=""></device>
         <device id="U7CQRH7-7CG4M2R-QOGYHBJ-ZJZ35GA-KZR2JE5-7OLJZ7R-FRKT2RG-UMYUHQM" introducedBy=""></device>
diff --git a/prod/syncthing-packer/packer/syncthing.json b/prod/syncthing-packer/packer/syncthing.json
index 8ac9e3e..3e67177 100644
--- a/prod/syncthing-packer/packer/syncthing.json
+++ b/prod/syncthing-packer/packer/syncthing.json
@@ -13,11 +13,13 @@
     {
       "type": "shell",
       "inline": [
+        "sudo apt-get update",
+        "sudo apt-get install -y bindfs",
         "sudo useradd -m syncthing",
         "sudo mkdir -p /mnt/syncthing-volume",
-        "sudo chown syncthing:syncthing /mnt/syncthing-volume",
+        "sudo mkdir -p /mnt/syncthing",
         "sudo echo \"/dev/disk/by-label/syncthing-volume /mnt/syncthing-volume ext4 defaults,nofail,discard,noatime 0 2\" >> /etc/fstab",
-        "sudo echo \"/mnt/syncthing-volume /home/syncthing/syncthing-volume fuse.bindfs force-user=syncthing,force-group=syncthing 0 0\"",
+        "sudo echo \"/mnt/syncthing-volume /mnt/syncthing fuse.bindfs force-user=syncthing,force-group=syncthing 0 0\" >> /etc/fstab",
         "sudo findmnt --verify --verbose"
       ]
     },