From 9e2932248868312b161cda3e1fb8f64a41f7ae61 Mon Sep 17 00:00:00 2001
From: Asone <nelson@herbin.info>
Date: Sat, 15 Sep 2018 00:36:43 +0200
Subject: [PATCH 1/3] fix: create subfolders for each service

---
 .gitignore         |  2 +-
 docker-compose.yml | 40 ++++------------------------------------
 2 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/.gitignore b/.gitignore
index 32b7613..fc2b339 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 .env
 .DS_Store
 _dumps/*
-_data/*
+_data/*.*
diff --git a/docker-compose.yml b/docker-compose.yml
index 4886c55..46c3a0a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,39 +16,6 @@ services:
     working_dir: /usr/src/app 
     ports:
       - 5432:5432
-  
-  daemon:
-    build: 
-      context: ./_provisioning/daemon
-    command :  bash  
-    tty: true
-    depends_on:
-      - db
-    volumes: 
-      - ./_data:/tricoteuses-daemon/data
-      - ./_dumps:/_dumps
-
-  api:
-    build:
-      context: ./_provisioning/api
-    command: bash
-    volumes: 
-      - ./_data:/tricoteuses-api/data
-    depends_on:
-      - db
-      - daemon
-
-  ui:
-    build: 
-      context: ./_provisioning/ui
-    command: bash
-    depends_on:
-      - db
-      - api
-    ports:
-      - 3000:3000
-    volumes: 
-      - ./_data/:/data
 
   assemblee: 
     build:
@@ -57,7 +24,7 @@ services:
       - ROCKET_ENV=staging
     command: cargo run -p tricoteuses_api_assemblee -- -c Config.toml -v  
     volumes:  
-      - ./_data:/assemblee-data/
+      - ./_data/assemblee-data/:/assemblee-data/
     depends_on:
       - db
     ports: 
@@ -70,9 +37,10 @@ services:
       - ROCKET_ENV=staging
     command: cargo run -p tricoteuses_api_hatvp -- -c Config.toml -v 
     volumes:  
-      - ./_data:/hatvp-data/
+      - ./_data/hatvp-data/:/hatvp-data/
     ports: 
       - 8002:8002
+
   wikidata: 
     build:
       context: ./_provisioning/wikidata-api
@@ -80,7 +48,7 @@ services:
       - ROCKET_ENV=staging
     command: cargo run -p tricoteuses_api_wikidata -- -c Config.toml -v
     volumes:  
-      - ./_data:/wikidata-data/
+      - ./_data/wikidata-data:/wikidata-data/
     ports: 
       - 8003:8003
 

From 5d7fade754cb24b488efb2cdad1b36c06626fe4f Mon Sep 17 00:00:00 2001
From: Asone <nelson@herbin.info>
Date: Sat, 15 Sep 2018 10:36:32 +0200
Subject: [PATCH 2/3] fix: smallfix on gitignore

---
 .gitignore | 10 +++++++++-
 Makefile   |  5 +++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index fc2b339..78eb1e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,12 @@
 .env
 .DS_Store
 _dumps/*
-_data/*.*
+!_data/**/*
+_data/**/*.*
+_data/**/*.jpg
+_data/**/*.json
+_data/**/*.zip
+
+
+
+
diff --git a/Makefile b/Makefile
index a8958cb..6dc2eea 100644
--- a/Makefile
+++ b/Makefile
@@ -6,3 +6,8 @@ hatvp-data-fetcher:
 	docker-compose run hatvp cargo run -p tricoteuses_api_hatvp_fetcher -- -c Config.toml -v
 wikidata-data-fetcher:
 	docker-compose run wikidata cargo run -p tricoteuses_api_wikidata_fetcher -- -c Config.toml -v
+all-data-fetch:
+	docker-compose run assemblee cargo run -p tricoteuses_api_assemblee_open_data_fetcher -- -c Config.toml
+	docker-compose run assemblee cargo run -p tricoteuses_api_assemblee_photos_fetcher -- -c Config.toml -v
+	docker-compose run hatvp cargo run -p tricoteuses_api_hatvp_fetcher -- -c Config.toml -v
+	docker-compose run wikidata cargo run -p tricoteuses_api_wikidata_fetcher -- -c Config.toml -v
\ No newline at end of file

From 0e36729b7aeb8f4f21c3bba287e8e8f3a9922994 Mon Sep 17 00:00:00 2001
From: Asone <nelson@herbin.info>
Date: Sat, 15 Sep 2018 10:44:43 +0200
Subject: [PATCH 3/3] fix: do not ignore data folders but ignore their contents

---
 .gitignore                      | 7 ++-----
 _data/assemblee-data/.gitignore | 4 ++++
 _data/hatvp-data/.gitignore     | 4 ++++
 _data/senat-data/.gitignore     | 4 ++++
 _data/wikidata-data/.gitignore  | 4 ++++
 5 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 _data/assemblee-data/.gitignore
 create mode 100644 _data/hatvp-data/.gitignore
 create mode 100644 _data/senat-data/.gitignore
 create mode 100644 _data/wikidata-data/.gitignore

diff --git a/.gitignore b/.gitignore
index 78eb1e3..818285b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,8 @@
 .env
 .DS_Store
 _dumps/*
-!_data/**/*
-_data/**/*.*
-_data/**/*.jpg
-_data/**/*.json
-_data/**/*.zip
+!_data/*-data/
+_data/*-data/**/*
 
 
 
diff --git a/_data/assemblee-data/.gitignore b/_data/assemblee-data/.gitignore
new file mode 100644
index 0000000..86d0cb2
--- /dev/null
+++ b/_data/assemblee-data/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/_data/hatvp-data/.gitignore b/_data/hatvp-data/.gitignore
new file mode 100644
index 0000000..86d0cb2
--- /dev/null
+++ b/_data/hatvp-data/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/_data/senat-data/.gitignore b/_data/senat-data/.gitignore
new file mode 100644
index 0000000..86d0cb2
--- /dev/null
+++ b/_data/senat-data/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/_data/wikidata-data/.gitignore b/_data/wikidata-data/.gitignore
new file mode 100644
index 0000000..86d0cb2
--- /dev/null
+++ b/_data/wikidata-data/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file