Merge remote-tracking branch 'inasafe/master'

inasafe · Nov 15, 2017 · f88b741 · f88b741
2 parents 3eff436 + 343bc96
commit f88b741
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,5 @@ sftp_backup/target/db/*
 !sftp_backup/target/db/.gitkeep
 backups/*
 !backups/*.sh
+sftp_backup/.sync/
+btsync.env
diff --git a/Makefile b/Makefile
@@ -28,6 +28,7 @@ web:
 	@echo "Running "
 	@echo "------------------------------------------------------------------"
 	@DB_PASS=$(PASSWORD) MYSQL_PASS=$(PASSWORD) docker-compose -p $(PROJECT_ID) up -d wordpress
+	@docker-compose -p $(PROJECT_ID) up -d btsync
 	dps
 
 

diff --git a/btsync.env.template b/btsync.env.template
@@ -0,0 +1,4 @@
+# This is InaSAFE WebSite data BitSync key
+SECRET=
+# Change it to easily identify your instance of btsync
+DEVICE=InaSAFE-Website
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -83,3 +83,13 @@ db:
     # This will not work on OSX/Win - comment out for those oses
     # See https://github.com/tutumcloud/tutum-docker-mariadb/issues/5
     - db:/var/lib/mysql
+
+btsync:                                                                                                                                                        
+  image: kartoza/btsync
+  hostname: inasafe.org-btsync
+  volumes:
+    - ./sftp_backup:/web
+  env_file:
+    - ./btsync.env
+
+
diff --git a/recover-after-space-full.sh b/recover-after-space-full.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+docker rm inasafeorg_wordpress_1
+make web