From 2222565941bdf2516d1e3e5ae0f97f35dc023b0d Mon Sep 17 00:00:00 2001
From: Determinant <tederminant@gmail.com>
Date: Sun, 30 Aug 2020 01:10:06 -0400
Subject: get deployment scripts to work

---
 scripts/deploy/app/build.yml | 2 +-
 scripts/deploy/app/reset.yml | 1 +
 scripts/deploy/app/run.yml   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'scripts/deploy/app')

diff --git a/scripts/deploy/app/build.yml b/scripts/deploy/app/build.yml
index 2a0c24c..af6774e 100644
--- a/scripts/deploy/app/build.yml
+++ b/scripts/deploy/app/build.yml
@@ -10,7 +10,7 @@
     - file:
         path: "{{ (hs_repo_dir, 'build') | path_join }}"
         state: absent
-    - command: cmake -DCMAKE_BUID_TYPE=Release -DHOTSTUFF_PROTO_LOG=OFF -DCMAKE_CXX_FLAGS={{ hs_flags | default('') }}
+    - command: cmake -DCMAKE_BUID_TYPE=Release -DHOTSTUFF_PROTO_LOG=OFF "-DCMAKE_CXX_FLAGS='{{ hs_flags | default('') }}'"
       args:
         chdir: "{{ hs_repo_dir }}"
       environment:
diff --git a/scripts/deploy/app/reset.yml b/scripts/deploy/app/reset.yml
index 1b80b27..f1c2873 100644
--- a/scripts/deploy/app/reset.yml
+++ b/scripts/deploy/app/reset.yml
@@ -7,6 +7,7 @@
 
 - name: reset hotstuff
   vars:
+    conf_dir: "{{ (testbed, hs_conf_dir) | path_join }}"
     log_dir: "{{ (testbed, hs_log_dir) | path_join }}"
   block:
     - name: remove confs
diff --git a/scripts/deploy/app/run.yml b/scripts/deploy/app/run.yml
index 260d611..14a2eb1 100644
--- a/scripts/deploy/app/run.yml
+++ b/scripts/deploy/app/run.yml
@@ -34,7 +34,7 @@
         log_dir: "{{ log_dir }}"
         cwd: "{{ conf_dir }}"
         conf: "{{ extra_conf | basename }}"
-        tls: false
+        tls: "{{ hs_tls | default(false) }}"
       environment:
         PATH: /sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/snap/bin
       register: spawn_results
-- 
cgit v1.2.3