From 90f424f5d0c37bbbb27b2990c4875540c7c2d9a6 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Mon, 8 Jun 2020 18:03:01 -0400
Subject: [PATCH] add missing vars, algo tweaks

---
 .../resources/packer/roles/algo/defaults/main.yml   |  4 ++++
 .../packer/roles/algo/tasks/algo_packer.yml         | 13 -------------
 .../main/resources/packer/roles/algo/tasks/main.yml |  2 +-
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/bubble-server/src/main/resources/packer/roles/algo/defaults/main.yml b/bubble-server/src/main/resources/packer/roles/algo/defaults/main.yml
index c84046ca..99336cb2 100644
--- a/bubble-server/src/main/resources/packer/roles/algo/defaults/main.yml
+++ b/bubble-server/src/main/resources/packer/roles/algo/defaults/main.yml
@@ -36,3 +36,7 @@ BetweenClients_DROP: true
 adblock_lists:
   - "https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts"
   - "https://hosts-file.net/ad_servers.txt"
+
+strongswan_additional_plugins: []
+strongswan_shell: /usr/sbin/nologin
+strongswan_home: /var/lib/strongswan
diff --git a/bubble-server/src/main/resources/packer/roles/algo/tasks/algo_packer.yml b/bubble-server/src/main/resources/packer/roles/algo/tasks/algo_packer.yml
index 61918868..4115ad34 100644
--- a/bubble-server/src/main/resources/packer/roles/algo/tasks/algo_packer.yml
+++ b/bubble-server/src/main/resources/packer/roles/algo/tasks/algo_packer.yml
@@ -152,19 +152,6 @@
 #    - restart dnscrypt-proxy
 
 # From algo/roles/wireguard/tasks/main.yml
-- name: Ensure the required directories exist
-  file:
-    dest: "{{ item }}"
-    state: directory
-    recurse: true
-  with_items:
-    - "{{ wireguard_pki_path }}/preshared"
-    - "{{ wireguard_pki_path }}/private"
-    - "{{ wireguard_pki_path }}/public"
-    - "{{ wireguard_config_path }}"
-  delegate_to: localhost
-  become: false
-
 - name: WireGuard repository configured
   apt_repository:
     repo: ppa:wireguard/wireguard
diff --git a/bubble-server/src/main/resources/packer/roles/algo/tasks/main.yml b/bubble-server/src/main/resources/packer/roles/algo/tasks/main.yml
index 041de542..b80de39b 100644
--- a/bubble-server/src/main/resources/packer/roles/algo/tasks/main.yml
+++ b/bubble-server/src/main/resources/packer/roles/algo/tasks/main.yml
@@ -13,7 +13,7 @@
   get_url:
     url: https://github.com/getbubblenow/bubble-dist/raw/master/algo/master.zip
     dest: /tmp/algo.zip
-    checksum: sha256:d6a6c462a916fa2fd64ebb094f304187672ea6a2ec6999a975e228c7a5b67d0a
+    checksum: sha256:26d4e220e4527a6e7efd997be93c2c7764f7d8b09ea826268dad0371f802cdbb
 
 - name: Unzip algo master.zip
   unarchive: