Merge branch 'dev' of github.com:mapswipe/python-mapswipe-workers into dev

Author: Matthias-Schaub

.gitignore

@@ -123,4 +123,12 @@ data/
 # don't upload app config for project managers dashboard
 app.js
 
+# don't upload nginx conf
+nginx.conf
+*/nginx.conf
+
+# don't upload firebase conf
+.firebaserc
+*/.firebaserc
+
 .DS_Store

deploy.sh

@@ -1,6 +1,88 @@
 git pull
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
 python3 test_config.py
-sudo docker-compose build --no-cache
-sudo docker-compose up -d --force-recreate
-sudo docker logs firebase_deploy
-sudo docker ps -a
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
+docker-compose build --no-cache postgres
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
+docker-compose build --no-cache firebase_deploy
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
+docker-compose build --no-cache mapswipe_workers
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
+docker-compose build --no-cache manager_dashboard
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
+docker-compose build --no-cache nginx
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
+docker-compose build --no-cache api
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
+docker-compose up -d --force-recreate postgres firebase_deploy mapswipe_workers manager_dashboard nginx api
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
+docker logs firebase_deploy
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
+docker ps -a
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+

docs/source/configuration.md

@@ -33,10 +33,7 @@ Firebase is a central part of MapSwipe. In our setup we use *Firebase Database*,
 1. `your_project_id`: This is the name of your Firebase project (e.g. *dev-mapswipe*)
 2. `your_database_name`: This is the name of your Firebase database. It is very likely that this will be the same as your Firebase project name as well.)
 
-The `mapswipe_workers` module uses the [Firebase Python SDK](https://firebase.google.com/docs/reference/admin/python) to access *Firebase Database* services as administrator, you must generate a Firebase Service Account Key in JSON format. You can get it from Firebase.
-1. In the Firebase console, open Settings > Service Accounts.
-2. Click Generate New Private Key
-3. Store the JSON file under `mapswipe_workers/config/serviceAccountKey.json`
+The `mapswipe_workers` module uses the [Firebase Python SDK](https://firebase.google.com/docs/reference/admin/python) to access *Firebase Database* services as administrator, you must generate a Service Account Key file in JSON format. For this we use the previously generated Service Account Key. (Check the *Google APIs and Services Credentials* section again if you don't have it.) Copy the file to `mapswipe_workers/config/serviceAccountKey.json`.
 
 The `mapswipe_workers` module further uses the [Firebase Database REST API](https://firebase.google.com/docs/reference/rest/database) to access *Firebase Database* either as a normal user or project manager.
 
@@ -98,10 +95,7 @@ First, create a new cloud storage bucket:
 3. Select storage location > `Multi-Region` > `eu`
 4. Select storage class > `Coldline`
 
-Then, generate a Google Cloud Service Account Key:
-1. Google Cloud Platform > IAM & Management > Service Accounts
-2. Create new Service Account > Select Name > e.g. `your_project_id_postgres_backup`
-3. Select Role > `Storage-Administrator`
+We need to access Google Cloud Storage. For this we use the previously generated Service Account Key. (Check the *Google APIs and Services Credentials* section again if you don't have it.) Copy the file to `postges/serviceAccountKey.json`.
 
 ```bash
 GCS_Link_URL=https://console.cloud.google.com/storage/browser/your_project_id_postgres_backup

docs/source/for_mapswipe_managers.md

@@ -32,5 +32,13 @@ Once you submit, the task should appear relatively quickly in the manager dashbo
 * If you encounter any error like *the % is not rising anymore in the app*, *the number of mappers is not rising anymore in the app* *firebase functions* might be the reason for this. Check firebase functions logs (Firebase > Functions > Logs) or reach out for help in Slack.
 
 
+## Becoming a project manager
 
+If you have access to the mapswipe backend server you can grant project manager rights like this:
+
+```bash
+docker run --name mapswipe_workers_local -it pythonmapswipeworkers_mapswipe_workers  bash`
+mapswipe_workers --verbose user-management [email protected] --manager=true
+exit
+docker rm mapswipe_workers_local