Fix a few strings and configurations, and add a fl_restoreDump script

4 files changed, 33 insertions, 5 deletions

diff --git a/roles/contexts/fretlink/files/scripts/fl_restoreDump b/roles/contexts/fretlink/files/scripts/fl_restoreDump
new file mode 100644
index 0000000..c76406b
--- /dev/null
+++ b/roles/contexts/fretlink/files/scripts/fl_restoreDump
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+if [ -z "$1" ]; then
+  echo "$(basename $0) zip-file-to-restore.zip"
+  exit 1
+fi
+
+file=$(pwd)/$1
+
+cd $HOME/workdir/app
+
+unzip "$file"
+
+source ../environment
+mongorestore --drop --uri $FRETLINK_MONGO_URI $(pwd)/.dump/
+
+if [ -e "../fixtures" ]; then
+  source ../fixtures
+fi
diff --git a/roles/contexts/fretlink/files/scripts/fl_tmux_dev b/roles/contexts/fretlink/files/scripts/fl_tmux_dev
index ca89e27..174c4a7 100644
--- a/roles/contexts/fretlink/files/scripts/fl_tmux_dev
+++ b/roles/contexts/fretlink/files/scripts/fl_tmux_dev
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+tmux_conf() {
+  tmux -f $XDG_CONFIG_HOME/tmux/tmux.conf "$@"
+}
+
 type="${1:-bash}"
 if [ -n "$TMUX" ]; then
   m=switch-client
@@ -17,14 +21,14 @@ if tmux has-session -t "$type" 2>/dev/null; then
   tmux $m -t "$type"
 else
   if [ "$type" = "remote" ]; then
-    tmux new-session -d -c $start_dir -s "$type" mosh immae.eu \; \
+    tmux_conf new-session -d -c $start_dir -s "$type" mosh immae.eu \; \
         $m -t "$type"
   elif [ -n "$start_dir" ]; then
-    tmux new-session -d -c $start_dir -s "$type" \; \
+    tmux_conf new-session -d -c $start_dir -s "$type" \; \
         $m -t "$type" \; \
         new-window -c $start_dir
   elif [ -d "$HOME/workdir/$type" ]; then
-    tmux new-session -d -c "$HOME/workdir/$type" -s "$type" \; \
+    tmux_conf new-session -d -c "$HOME/workdir/$type" -s "$type" \; \
         $m -t "$type" \; \
         send-keys "../start" C-m \; \
         rename-window "running" \; \
diff --git a/roles/contexts/fretlink/tasks/main.yml b/roles/contexts/fretlink/tasks/main.yml
index 0908eca..5b75f9b 100644
--- a/roles/contexts/fretlink/tasks/main.yml
+++ b/roles/contexts/fretlink/tasks/main.yml
@@ -100,6 +100,7 @@
         - fl_tmux_dev
         - fl_vpn
         - fl_getDump
+        - fl_restoreDump
     - name: completion scripts
       copy:
         src: "scripts/_{{ item }}"
diff --git a/roles/contexts/fretlink/templates/environment.j2 b/roles/contexts/fretlink/templates/environment.j2
index 36e4bfd..91a6f6a 100644
--- a/roles/contexts/fretlink/templates/environment.j2
+++ b/roles/contexts/fretlink/templates/environment.j2
@@ -58,7 +58,7 @@ FL_APP_URL="$FL_APPS_SCHEME://$FL_APPS_HOST:$FL_APP_PORT"
 FL_CARRIER_DIRECTORY_PORT=8082
 FL_CARRIER_DIRECTORY_SECRET="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/CarrierDirectory subkey=Secret') }}"
 FL_CARRIER_DIRECTORY_PRIVATE_KEY="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/CarrierDirectory subkey=PrivateKey') }}"
-FL_CARRIER_DIRECTORY_URL="$FL_APPS_SCHEME://$FL_APPS_HOST:$FL_CARRIER_DIRECTORY_PORT/api/"
+FL_CARRIER_DIRECTORY_URL="$FL_APPS_SCHEME://$FL_APPS_HOST:$FL_CARRIER_DIRECTORY_PORT/api"
 
 FL_NOTIFIER_PORT=8081
 FL_NOTIFIER_SECRET="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/Notifier subkey=Secret') }}"
@@ -149,14 +149,16 @@ if [ "$APP" = "app" ]; then
   export FRETLINK_AMAZON_PUBLIC_KEY="password"
   export FRETLINK_AMAZON_PRIVATE_KEY="password"
   export FRETLINK_GMAPS_API_KEY="password"
+  export FRETLINK_PASSWORD_REQUEST_SECRET="password"
 
   # secret
   export FRETLINK_MACAROON_SECRET=$FL_APP_SECRET
 
   # carrier directory
-  export CARRIER_DIRECTORY_URI="$FL_CARRIER_DIRECTORY_URL"
+  export CARRIER_DIRECTORY_URI="$FL_CARRIER_DIRECTORY_URL/"
   export FRETLINK_CARDIR_URL="$FL_CARRIER_DIRECTORY_URL"
   export FRETLINK_CARDIR_ENABLED="true"
+  export FRETLINK_CARDIRV3_ACCESS_KEY="$(build_macaroon $FL_CARRIER_DIRECTORY_SECRET carrier-directory carrier-directory carrier-directory::read)"
 
   # notifier
   export FRETLINK_NOTIFIER_API=$FL_NOTIFIER_URL
@@ -183,6 +185,7 @@ if [ "$APP" = "app" ]; then
   # geodata
   export FRETLINK_GEODATA_API="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/GeodataDev subkey=Url') }}"
   export FRETLINK_GEODATA_ACCESS_KEY="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/GeodataDev') }}"
+  export GEODATA_URI="$FRETLINK_GEODATA_API"
 fi
 
 if [ "$APP" = "admin-root" ]; then
@@ -199,6 +202,7 @@ fi
 
 if [ "$APP" = "carrier-directory" ]; then
   export ADMIN_BASE_URL=$FL_APP_URL
+  export ACCESS_KEY="$(build_macaroon $FL_CARRIER_DIRECTORY_SECRET carrier-directory carrier-directory carrier-directory::read)"
 fi
 
 if [ "$APP" = "notifier" ]; then